diff --git a/rpm/libv3270.spec b/rpm/libv3270.spec index c00275c..e828e46 100644 --- a/rpm/libv3270.spec +++ b/rpm/libv3270.spec @@ -16,12 +16,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -#---[ Macros ]-------------------------------------------------------------------------------------------------------- - -%if ! %{defined _release} - %define _release suse%{suse_version} -%endif - #---[ Package header ]------------------------------------------------------------------------------------------------ Summary: 3270 Virtual Terminal for GTK @@ -31,7 +25,7 @@ Release: 0 License: LGPL-3.0 Source: libv3270-%{version}.tar.xz -Url: https://github.com/PerryWerneck/libv3270.git +URL: https://github.com/PerryWerneck/libv3270 Group: Development/Libraries/C and C++ BuildRequires: autoconf >= 2.61 @@ -54,11 +48,6 @@ BuildRequires: gtk3-devel %endif -# https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto -%if %{undefined fedora} && %{undefined rhel_version} && %{undefined centos_version} -BuildRequires: libgladeui-2-6 -%endif - %if 0%{?centos_version} # CENTOS Genmarshal doesn't depends on python! BuildRequires: python @@ -66,32 +55,32 @@ BuildRequires: python %description -Originally designed as part of the pw3270 application this library provides a TN3270 virtual terminal widget for GTK 3. +Originally designed as part of the pw3270 application, this library +provides a TN3270 virtual terminal widget for GTK 3. -See more details at https://softwarepublico.gov.br/social/pw3270/ +For more details, see https://softwarepublico.gov.br/social/pw3270/ . #---[ Library ]------------------------------------------------------------------------------------------------------- -%define _product %(pkg-config --variable=product_name lib3270) %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) %define MINOR_VERSION %(echo %{version} | cut -d. -f2) %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} %package -n %{name}-%{_libvrs} -Summary: TN3270 Access library -Group: Development/Libraries/C and C++ +Summary: TN3270 access library +Group: System/Libraries %description -n %{name}-%{_libvrs} +Originally designed as part of the pw3270 application, this library +provides a TN3270 virtual terminal widget for GTK 3. -Originally designed as part of the pw3270 application this library provides a TN3270 virtual terminal widget for GTK 3. - -See more details at https://softwarepublico.gov.br/social/pw3270/ +For more details, see https://softwarepublico.gov.br/social/pw3270/ . #---[ Development ]--------------------------------------------------------------------------------------------------- %package devel -Summary: 3270 Virtual Terminal for GTK development files +Summary: Header files for the 3270 Virtual Terminal library Group: Development/Libraries/C and C++ Requires: %{name}-%{_libvrs} = %{version} @@ -103,12 +92,7 @@ Requires: lib3270-devel %endif %description devel - -3270 Virtual Terminal for GTK development files. - -Originally designed as part of the pw3270 application. - -See more details at https://softwarepublico.gov.br/social/pw3270/ +GTK development files for the 3270 Virtual Terminal. %package -n glade-catalog-v3270 @@ -119,17 +103,9 @@ Requires: libv3270-devel = %{version} Requires: glade %description -n glade-catalog-v3270 - -3270 Virtual Terminal for GTK development files. - -Originally designed as part of the pw3270 application. - -This package provides a catalog for Glade, to allow the use of V3270 +This package provides a catalog for Glade to allow the use of V3270 widgets in Glade. -See more details at https://softwarepublico.gov.br/social/pw3270/ - - #---[ Build & Install ]----------------------------------------------------------------------------------------------- %prep @@ -138,14 +114,15 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ NOCONFIGURE=1 ./autogen.sh %configure \ - --disable-static \ --enable-pic %build -make all +make %{?_smp_mflags} %install -%makeinstall +%make_install +# configure --disable-static has no effect +rm -f %{buildroot}/%{_libdir}/*.a %files -n %{name}-%{_libvrs} %defattr(-,root,root) @@ -161,29 +138,20 @@ make all %{_libdir}/%{name}.so.%{MAJOR_VERSION} %{_libdir}/%{name}.so.%{MAJOR_VERSION}.%{MINOR_VERSION} -%{_datadir}/%{_product}/colors.conf - -%dir %{_datadir}/%{_product}/remap/ -%{_datadir}/%{_product}/remap/*.xml - %files devel %defattr(-,root,root) +%{_datadir}/pw3270/pot/*.pot + %{_libdir}/%{name}.so %{_libdir}/pkgconfig/*.pc %{_includedir}/v3270.h %{_includedir}/v3270 -%{_datadir}/%{_product}/pot/*.pot - %files -n glade-catalog-v3270 %defattr(-,root,root) -/usr/share/glade/catalogs/v3270.xml -/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-v3270-terminal.png -/usr/share/glade/pixmaps/hicolor/22x22/actions/widget-v3270-terminal.png - -%pre -n %{name}-%{_libvrs} -p /sbin/ldconfig +%{_datadir}/glade/ %post -n %{name}-%{_libvrs} -p /sbin/ldconfig -- libgit2 0.21.2