Download as
Browse Code »

Commit 8b5c2af6961d6ed6e7eec458ba2d069e0ac25d2d

Authored by Perry Werneck
1 parent 2a5373ae
Exists in master and in 1 other branch develop

Fixing rpm package build.

Showing 1 changed file with 18 additions and 20 deletions   Show diff stats
rpm/libv3270.spec
  Diff comments   View file @8b5c2af
1 1 #
2   -# spec file for packages libv3270
  2 +# spec file for package libv3270
3 3 #
4 4 # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
5 5 # Copyright (C) <2008> <Banco do Brasil S.A.>
... ... @@ -24,11 +24,6 @@
24 24 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
25 25 %define _product %(pkg-config --variable=product_name lib3270)
26 26  
27   -#Compat macro for new _fillupdir macro introduced in Nov 2017
28   -%if ! %{defined _fillupdir}
29   - %define _fillupdir /var/adm/fillup-templates
30   -%endif
31   -
32 27 #---[ Macros ]--------------------------------------------------------------------------------------------------------
33 28  
34 29 %if ! %{defined _release}
... ... @@ -49,17 +44,17 @@ Url: https://github.com/PerryWerneck/libv3270.git
49 44 Group: Development/Libraries/C and C++
50 45 BuildRoot: /var/tmp/%{name}-%{version}
51 46  
52   -Provides: libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION}
53   -Conflicts: otherproviders(libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION})
  47 +Provides: libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION}
  48 +Conflicts: otherproviders(libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION})
54 49  
55 50 BuildRequires: lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}-devel
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
  51 +BuildRequires: autoconf >= 2.61
  52 +BuildRequires: automake
  53 +BuildRequires: binutils
  54 +BuildRequires: coreutils
  55 +BuildRequires: gcc-c++
  56 +BuildRequires: gettext-devel
  57 +BuildRequires: m4
63 58  
64 59 %if 0%{?fedora} || 0%{?suse_version} > 1200
65 60  
... ... @@ -76,7 +71,9 @@ BuildRequires: gtk3-devel
76 71 # https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
77 72 %if %{undefined fedora} && %{undefined rhel_version} && %{undefined centos_version}
78 73 BuildRequires: libgladeui-2-6
  74 +%endif
79 75  
  76 +%if 0%{?centos_version}
80 77 # CENTOS Genmarshal doesn't depends on python!
81 78 BuildRequires: python
82 79 %endif
... ... @@ -136,7 +133,9 @@ See more details at https://softwarepublico.gov.br/social/pw3270/
136 133 NOCONFIGURE=1 ./autogen.sh
137 134  
138 135 %configure \
139   - --with-sdk-version=%{version}
  136 + --with-sdk-version=%{version} \
  137 + --disable-static \
  138 + --enable-pic
140 139  
141 140 %build
142 141 make clean
... ... @@ -163,6 +162,9 @@ rm -rf $RPM_BUILD_ROOT
163 162  
164 163 %{_datadir}/%{_product}/colors.conf
165 164  
  165 +%dir %{_datadir}/%{_product}/remap/
  166 +%{_datadir}/%{_product}/remap/*.xml
  167 +
166 168 %files devel
167 169 %defattr(-,root,root)
168 170  
... ... @@ -172,12 +174,8 @@ rm -rf $RPM_BUILD_ROOT
172 174 %{_includedir}/v3270.h
173 175 %{_includedir}/v3270
174 176  
175   -%{_libdir}/*.a
176 177 %{_datadir}/%{_product}/pot/*.pot
177 178  
178   -%dir %{_datadir}/%{_product}/remap/
179   -%{_datadir}/%{_product}/remap/*.xml
180   -
181 179 %files -n glade-catalog-v3270
182 180 %defattr(-,root,root)
183 181 /usr/share/glade/catalogs/v3270.xml
... ...