Commit ebb1aa16e5005589613e960e5b85d6f6091ab2c2

Authored by Perry Werneck
1 parent 4cab09f6
Exists in master and in 1 other branch develop

Updating package.

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
@@ -6,17 +6,17 @@ @@ -6,17 +6,17 @@
6 <param name="sslverify">disable</param> 6 <param name="sslverify">disable</param>
7 <param name="versionformat">%ct</param> 7 <param name="versionformat">%ct</param>
8 <!-- param name="version">5.2</param --> 8 <!-- param name="version">5.2</param -->
9 - <param name="url">http://softwarepublico.gov.br/gitlab/pw3270/libv3270.git</param> 9 + <param name="url">https://softwarepublico.gov.br/gitlab/pw3270/libv3270.git</param>
10 <param name="scm">git</param> 10 <param name="scm">git</param>
11 <param name="filename">libv3270-5_2</param> 11 <param name="filename">libv3270-5_2</param>
12 </service> 12 </service>
13 13
14 <!-- https://github.com/openSUSE/obs-service-extract_file --> 14 <!-- https://github.com/openSUSE/obs-service-extract_file -->
15 - <service name="extract_file"> 15 + <!-- service name="extract_file">
16 <param name="archive">*.tar</param> 16 <param name="archive">*.tar</param>
17 <param name="files">*/rpm/libv3270.spec</param> 17 <param name="files">*/rpm/libv3270.spec</param>
18 <param name="outfilename">libv3270-5_2.spec</param> 18 <param name="outfilename">libv3270-5_2.spec</param>
19 - </service> 19 + </service -->
20 20
21 <service name="recompress"> 21 <service name="recompress">
22 <param name="file">*.tar</param> 22 <param name="file">*.tar</param>
rpm/libv3270.spec
@@ -52,8 +52,8 @@ Provides: libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION} @@ -52,8 +52,8 @@ Provides: libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION}
52 Conflicts: otherproviders(libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION}) 52 Conflicts: otherproviders(libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION})
53 53
54 BuildRequires: pkgconfig(openssl) 54 BuildRequires: pkgconfig(openssl)
55 -BuildRequires: pkgconfig(lib3270) >= 5.2  
56 BuildRequires: pkgconfig(gtk+-3.0) 55 BuildRequires: pkgconfig(gtk+-3.0)
  56 +BuildRequires: lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}-devel
57 BuildRequires: autoconf >= 2.61 57 BuildRequires: autoconf >= 2.61
58 BuildRequires: automake 58 BuildRequires: automake
59 BuildRequires: binutils 59 BuildRequires: binutils
@@ -76,6 +76,7 @@ Summary: 3270 Virtual Terminal for GTK development files @@ -76,6 +76,7 @@ Summary: 3270 Virtual Terminal for GTK development files
76 Group: Development/Libraries/C and C++ 76 Group: Development/Libraries/C and C++
77 77
78 Requires: %{name} = %{version} 78 Requires: %{name} = %{version}
  79 +Requires: lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}-devel
79 80
80 Provides: libv3270-devel = %{version} 81 Provides: libv3270-devel = %{version}
81 Conflicts: otherproviders(libv3270-devel) 82 Conflicts: otherproviders(libv3270-devel)
@@ -118,10 +119,10 @@ rm -rf $RPM_BUILD_ROOT @@ -118,10 +119,10 @@ rm -rf $RPM_BUILD_ROOT
118 %defattr(-,root,root) 119 %defattr(-,root,root)
119 120
120 %{_libdir}/libv3270.so 121 %{_libdir}/libv3270.so
121 -%{_libdir}/pkgconfig/libv3270.pc 122 +%{_libdir}/pkgconfig/v3270.pc
122 123
123 -%{_includedir}/libv3270.h  
124 -%{_includedir}/libv3270 124 +%{_includedir}/v3270.h
  125 +%{_includedir}/v3270
125 126
126 %{_libdir}/libv3270.a 127 %{_libdir}/libv3270.a
127 128