From request 734231 at Suse build service:

- Drop unnecessary build requirements. Own all produced glade directories instead. - Enable parallel build. - Rectify descriptions.

From request 734231 at Suse build service:
- Drop unnecessary build requirements. Own all produced glade directories instead. - Enable parallel build. - Rectify descriptions.
Perry Werneck
1 parent ec68e9d3
Showing 1 changed file with 19 additions and 51 deletions Show diff stats
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
...	...	@@ -16,12 +16,6 @@
16	16	# Please submit bugfixes or comments via http://bugs.opensuse.org/
17	17	#
18	18
19		-#---[ Macros ]--------------------------------------------------------------------------------------------------------
20		-
21		-%if ! %{defined _release}
22		- %define _release suse%{suse_version}
23		-%endif
24		-
25	19	#---[ Package header ]------------------------------------------------------------------------------------------------
26	20
27	21	Summary: 3270 Virtual Terminal for GTK
...	...	@@ -31,7 +25,7 @@ Release: 0
31	25	License: LGPL-3.0
32	26	Source: libv3270-%{version}.tar.xz
33	27
34		-Url: https://github.com/PerryWerneck/libv3270.git
	28	+URL: https://github.com/PerryWerneck/libv3270
35	29	Group: Development/Libraries/C and C++
36	30
37	31	BuildRequires: autoconf >= 2.61
...	...	@@ -54,11 +48,6 @@ BuildRequires: gtk3-devel
54	48
55	49	%endif
56	50
57		-# https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
58		-%if %{undefined fedora} && %{undefined rhel_version} && %{undefined centos_version}
59		-BuildRequires: libgladeui-2-6
60		-%endif
61		-
62	51	%if 0%{?centos_version}
63	52	# CENTOS Genmarshal doesn't depends on python!
64	53	BuildRequires: python
...	...	@@ -66,32 +55,32 @@ BuildRequires: python
66	55
67	56	%description
68	57
69		-Originally designed as part of the pw3270 application this library provides a TN3270 virtual terminal widget for GTK 3.
	58	+Originally designed as part of the pw3270 application, this library
	59	+provides a TN3270 virtual terminal widget for GTK 3.
70	60
71		-See more details at https://softwarepublico.gov.br/social/pw3270/
	61	+For more details, see https://softwarepublico.gov.br/social/pw3270/ .
72	62
73	63	#---[ Library ]-------------------------------------------------------------------------------------------------------
74	64
75		-%define _product %(pkg-config --variable=product_name lib3270)
76	65	%define MAJOR_VERSION %(echo %{version} \| cut -d. -f1)
77	66	%define MINOR_VERSION %(echo %{version} \| cut -d. -f2)
78	67	%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
79	68
80	69	%package -n %{name}-%{_libvrs}
81		-Summary: TN3270 Access library
82		-Group: Development/Libraries/C and C++
	70	+Summary: TN3270 access library
	71	+Group: System/Libraries
83	72
84	73	%description -n %{name}-%{_libvrs}
	74	+Originally designed as part of the pw3270 application, this library
	75	+provides a TN3270 virtual terminal widget for GTK 3.
85	76
86		-Originally designed as part of the pw3270 application this library provides a TN3270 virtual terminal widget for GTK 3.
87		-
88		-See more details at https://softwarepublico.gov.br/social/pw3270/
	77	+For more details, see https://softwarepublico.gov.br/social/pw3270/ .
89	78
90	79	#---[ Development ]---------------------------------------------------------------------------------------------------
91	80
92	81	%package devel
93	82
94		-Summary: 3270 Virtual Terminal for GTK development files
	83	+Summary: Header files for the 3270 Virtual Terminal library
95	84	Group: Development/Libraries/C and C++
96	85
97	86	Requires: %{name}-%{_libvrs} = %{version}
...	...	@@ -103,12 +92,7 @@ Requires: lib3270-devel
103	92	%endif
104	93
105	94	%description devel
106		-
107		-3270 Virtual Terminal for GTK development files.
108		-
109		-Originally designed as part of the pw3270 application.
110		-
111		-See more details at https://softwarepublico.gov.br/social/pw3270/
	95	+GTK development files for the 3270 Virtual Terminal.
112	96
113	97	%package -n glade-catalog-v3270
114	98
...	...	@@ -119,17 +103,9 @@ Requires: libv3270-devel = %{version}
119	103	Requires: glade
120	104
121	105	%description -n glade-catalog-v3270
122		-
123		-3270 Virtual Terminal for GTK development files.
124		-
125		-Originally designed as part of the pw3270 application.
126		-
127		-This package provides a catalog for Glade, to allow the use of V3270
	106	+This package provides a catalog for Glade to allow the use of V3270
128	107	widgets in Glade.
129	108
130		-See more details at https://softwarepublico.gov.br/social/pw3270/
131		-
132		-
133	109	#---[ Build & Install ]-----------------------------------------------------------------------------------------------
134	110
135	111	%prep
...	...	@@ -138,14 +114,15 @@ See more details at https://softwarepublico.gov.br/social/pw3270/
138	114	NOCONFIGURE=1 ./autogen.sh
139	115
140	116	%configure \
141		- --disable-static \
142	117	--enable-pic
143	118
144	119	%build
145		-make all
	120	+make %{?_smp_mflags}
146	121
147	122	%install
148		-%makeinstall
	123	+%make_install
	124	+# configure --disable-static has no effect
	125	+rm -f %{buildroot}/%{_libdir}/*.a
149	126
150	127	%files -n %{name}-%{_libvrs}
151	128	%defattr(-,root,root)
...	...	@@ -161,29 +138,20 @@ make all
161	138	%{_libdir}/%{name}.so.%{MAJOR_VERSION}
162	139	%{_libdir}/%{name}.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
163	140
164		-%{_datadir}/%{_product}/colors.conf
165		-
166		-%dir %{_datadir}/%{_product}/remap/
167		-%{_datadir}/%{_product}/remap/*.xml
168		-
169	141	%files devel
170	142	%defattr(-,root,root)
171	143
	144	+%{_datadir}/pw3270/pot/*.pot
	145	+
172	146	%{_libdir}/%{name}.so
173	147	%{_libdir}/pkgconfig/*.pc
174	148
175	149	%{_includedir}/v3270.h
176	150	%{_includedir}/v3270
177	151
178		-%{_datadir}/%{_product}/pot/*.pot
179		-
180	152	%files -n glade-catalog-v3270
181	153	%defattr(-,root,root)
182		-/usr/share/glade/catalogs/v3270.xml
183		-/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-v3270-terminal.png
184		-/usr/share/glade/pixmaps/hicolor/22x22/actions/widget-v3270-terminal.png
185		-
186		-%pre -n %{name}-%{_libvrs} -p /sbin/ldconfig
	154	+%{_datadir}/glade/
187	155
188	156	%post -n %{name}-%{_libvrs} -p /sbin/ldconfig
189	157
...	...