Download as
Browse Code »

Commit 15ced02e626a142faa21e9371eb0c223e833bc6f

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

Updating rpm package.

Showing 1 changed file with 19 additions and 22 deletions   Show diff stats
rpm/lib3270.spec
  Diff comments   View file @15ced02
1 # 1 #
2 -# spec file for packages lib3270 2 +# spec file for package lib3270
3 # 3 #
4 # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. 4 # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
5 # Copyright (C) <2008> <Banco do Brasil S.A.> 5 # Copyright (C) <2008> <Banco do Brasil S.A.>
@@ -23,8 +23,6 @@ @@ -23,8 +23,6 @@
23 23
24 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} 24 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
25 25
26 -%define documentroot /srv/www/htdocs/mentor  
27 -  
28 #Compat macro for new _fillupdir macro introduced in Nov 2017 26 #Compat macro for new _fillupdir macro introduced in Nov 2017
29 %if ! %{defined _fillupdir} 27 %if ! %{defined _fillupdir}
30 %define _fillupdir /var/adm/fillup-templates 28 %define _fillupdir /var/adm/fillup-templates
@@ -43,6 +41,7 @@ Name: lib3270-%{_libvrs} @@ -43,6 +41,7 @@ Name: lib3270-%{_libvrs}
43 Version: 5.2 41 Version: 5.2
44 Release: 0 42 Release: 0
45 License: LGPL-3.0 43 License: LGPL-3.0
  44 +
46 Source: lib3270-%{version}.tar.xz 45 Source: lib3270-%{version}.tar.xz
47 46
48 Url: https://github.com/PerryWerneck/lib3270.git 47 Url: https://github.com/PerryWerneck/lib3270.git
@@ -53,26 +52,26 @@ BuildRoot: /var/tmp/%{name}-%{version} @@ -53,26 +52,26 @@ BuildRoot: /var/tmp/%{name}-%{version}
53 Provides: lib3270_%{_libvrs} 52 Provides: lib3270_%{_libvrs}
54 Conflicts: otherproviders(lib3270_%{_libvrs}) 53 Conflicts: otherproviders(lib3270_%{_libvrs})
55 54
56 -BuildRequires: autoconf >= 2.61  
57 -BuildRequires: automake  
58 -BuildRequires: binutils  
59 -BuildRequires: coreutils  
60 -BuildRequires: gcc-c++  
61 -BuildRequires: gettext-devel  
62 -BuildRequires: m4  
63 -BuildRequires: pkgconfig 55 +BuildRequires: autoconf >= 2.61
  56 +BuildRequires: automake
  57 +BuildRequires: binutils
  58 +BuildRequires: coreutils
  59 +BuildRequires: gcc-c++
  60 +BuildRequires: gettext-devel
  61 +BuildRequires: m4
  62 +BuildRequires: pkgconfig
  63 +BuildRequires: fdupes
64 64
65 -%if 0%{?fedora} || 0%{?suse_version} > 1200 65 +%if 0%{?
  66 +fedora} || 0%{?suse_version} > 1200
66 67
67 -BuildRequires: pkgconfig(openssl)  
68 -BuildRequires: pkgconfig(dbus-1)  
69 -BuildRequires: pkgconfig(libssl)  
70 -BuildRequires: pkgconfig(libcrypto) 68 +BuildRequires: pkgconfig(openssl)
  69 +BuildRequires: pkgconfig(libssl)
  70 +BuildRequires: pkgconfig(libcrypto)
71 71
72 %else 72 %else
73 73
74 -BuildRequires: openssl-devel  
75 -BuildRequires: dbus-1-devel 74 +BuildRequires: openssl-devel
76 BuildRequires: xz 75 BuildRequires: xz
77 76
78 %endif 77 %endif
@@ -91,7 +90,6 @@ Summary: TN3270 Access library development files @@ -91,7 +90,6 @@ Summary: TN3270 Access library development files
91 Group: Development/Libraries/C and C++ 90 Group: Development/Libraries/C and C++
92 91
93 Requires: %{name} = %{version} 92 Requires: %{name} = %{version}
94 -Requires: lib3270++%{_libvrs} = %{version}  
95 93
96 %description -n lib3270-devel 94 %description -n lib3270-devel
97 95
@@ -110,16 +108,16 @@ NOCONFIGURE=1 ./autogen.sh @@ -110,16 +108,16 @@ NOCONFIGURE=1 ./autogen.sh
110 108
111 %configure \ 109 %configure \
112 --with-sdk-version=%{version} \ 110 --with-sdk-version=%{version} \
113 - --disable-static 111 + --disable-static
114 112
115 %build 113 %build
116 make clean 114 make clean
117 make all 115 make all
118 116
119 %install 117 %install
120 -rm -rf $RPM_BUILD_ROOT  
121 118
122 %makeinstall 119 %makeinstall
  120 +%fdupes %{buildroot}
123 121
124 %files 122 %files
125 %defattr(-,root,root) 123 %defattr(-,root,root)
@@ -146,7 +144,6 @@ rm -rf $RPM_BUILD_ROOT @@ -146,7 +144,6 @@ rm -rf $RPM_BUILD_ROOT
146 %{_includedir}/lib3270 144 %{_includedir}/lib3270
147 145
148 %{_libdir}/pkgconfig/*.pc 146 %{_libdir}/pkgconfig/*.pc
149 -%{_libdir}/*.so  
150 147
151 %dir %{_datadir}/pw3270/pot 148 %dir %{_datadir}/pw3270/pot
152 %{_datadir}/pw3270/pot/*.pot 149 %{_datadir}/pw3270/pot/*.pot