Download as
Browse Code »

Commit cea915fb2900f0b1244ae7cbaf62768a3f0882bf

Authored by Perry Werneck
1 parent cd81abfd
Exists in master and in 3 other branches develop, macos, network_module

Updating build files.

Showing 2 changed files with 33 additions and 18 deletions   Show diff stats
@@ -2,22 +2,24 @@ @@ -2,22 +2,24 @@
2 2
3 <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py --> 3 <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py -->
4 <service name="tar_scm"> 4 <service name="tar_scm">
5 - <param name="changesgenerate">enable</param> 5 + <param name="changesgenerate">enable</param>
6 <param name="sslverify">disable</param> 6 <param name="sslverify">disable</param>
7 - <param name="versionformat">%ct</param>  
8 - <!-- param name="version">5.2</param --> 7 + <param name="versionformat">@PARENT_TAG@</param>
9 <param name="url">http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git</param> 8 <param name="url">http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git</param>
10 <param name="scm">git</param> 9 <param name="scm">git</param>
11 - <param name="filename">lib3270-5_2</param>  
12 </service> 10 </service>
13 11
14 <!-- https://github.com/openSUSE/obs-service-extract_file --> 12 <!-- https://github.com/openSUSE/obs-service-extract_file -->
15 <!-- service name="extract_file"> 13 <!-- service name="extract_file">
16 <param name="archive">*.tar</param> 14 <param name="archive">*.tar</param>
17 <param name="files">*/rpm/lib3270.spec</param> 15 <param name="files">*/rpm/lib3270.spec</param>
18 - <param name="outfilename">lib3270-5_2.spec</param>  
19 </service --> 16 </service -->
20 17
  18 + <service name="extract_file">
  19 + <param name="archive">*.tar</param>
  20 + <param name="files">*/arch/PKGBUILD</param>
  21 + </service>
  22 +
21 <service name="recompress"> 23 <service name="recompress">
22 <param name="file">*.tar</param> 24 <param name="file">*.tar</param>
23 <param name="compression">xz</param> 25 <param name="compression">xz</param>
rpm/lib3270.spec
  Diff comments   View file @cea915f
@@ -38,22 +38,21 @@ @@ -38,22 +38,21 @@
38 38
39 #---[ Main package ]-------------------------------------------------------------------------------------------------- 39 #---[ Main package ]--------------------------------------------------------------------------------------------------
40 40
41 -Summary: TN3270 Access library  
42 -Name: lib3270-%{_libvrs}  
43 -Version: 5.2  
44 -Release: 0  
45 -License: LGPL-3.0  
46 -Source: %{name}-%{version}.tar.xz 41 +Summary: TN3270 Access library
  42 +Name: lib3270-%{_libvrs}
  43 +Version: 5.2
  44 +Release: 0
  45 +License: LGPL-3.0
  46 +Source: lib3270-%{version}.tar.xz
47 47
48 -Url: https://portal.softwarepublico.gov.br/social/pw3270/ 48 +Url: https://portal.softwarepublico.gov.br/social/pw3270/
49 49
50 -Group: Development/Libraries/C and C++  
51 -BuildRoot: /var/tmp/%{name}-%{version} 50 +Group: Development/Libraries/C and C++
  51 +BuildRoot: /var/tmp/%{name}-%{version}
52 52
53 -Provides: lib3270_%{_libvrs}  
54 -Conflicts: otherproviders(lib3270_%{_libvrs}) 53 +Provides: lib3270_%{_libvrs}
  54 +Conflicts: otherproviders(lib3270_%{_libvrs})
55 55
56 -BuildRequires: pkgconfig(openssl)  
57 BuildRequires: autoconf >= 2.61 56 BuildRequires: autoconf >= 2.61
58 BuildRequires: automake 57 BuildRequires: automake
59 BuildRequires: binutils 58 BuildRequires: binutils
@@ -62,7 +61,21 @@ BuildRequires: gcc-c++ @@ -62,7 +61,21 @@ BuildRequires: gcc-c++
62 BuildRequires: gettext-devel 61 BuildRequires: gettext-devel
63 BuildRequires: m4 62 BuildRequires: m4
64 BuildRequires: pkgconfig 63 BuildRequires: pkgconfig
  64 +
  65 +%if 0%{?fedora} || 0%{?suse_version} > 1200
  66 +
  67 +BuildRequires: pkgconfig(openssl)
65 BuildRequires: pkgconfig(dbus-1) 68 BuildRequires: pkgconfig(dbus-1)
  69 +BuildRequires: pkgconfig(libssl)
  70 +BuildRequires: pkgconfig(libcrypto)
  71 +
  72 +%else
  73 +
  74 +BuildRequires: openssl-devel
  75 +BuildRequires: dbus-1-devel
  76 +BuildRequires: xz
  77 +
  78 +%endif
66 79
67 %description 80 %description
68 81
@@ -107,7 +120,7 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ @@ -107,7 +120,7 @@ See more details at https://softwarepublico.gov.br/social/pw3270/
107 #---[ Build & Install ]----------------------------------------------------------------------------------------------- 120 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
108 121
109 %prep 122 %prep
110 -%setup 123 +%setup -n lib3270-%{version}
111 124
112 NOCONFIGURE=1 ./autogen.sh 125 NOCONFIGURE=1 ./autogen.sh
113 126