Commit 5cf963d6cf6d009117aa01ab8193aa27f39d16e4
1 parent
ec68e9d3
Exists in
master
and in
1 other branch
From request 734231 at Suse build service:
- Drop unnecessary build requirements. Own all produced glade directories instead. - Enable parallel build. - Rectify descriptions.
Showing
1 changed file
with
19 additions
and
51 deletions
Show diff stats
rpm/libv3270.spec
@@ -16,12 +16,6 @@ | @@ -16,12 +16,6 @@ | ||
16 | # Please submit bugfixes or comments via http://bugs.opensuse.org/ | 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 | #---[ Package header ]------------------------------------------------------------------------------------------------ | 19 | #---[ Package header ]------------------------------------------------------------------------------------------------ |
26 | 20 | ||
27 | Summary: 3270 Virtual Terminal for GTK | 21 | Summary: 3270 Virtual Terminal for GTK |
@@ -31,7 +25,7 @@ Release: 0 | @@ -31,7 +25,7 @@ Release: 0 | ||
31 | License: LGPL-3.0 | 25 | License: LGPL-3.0 |
32 | Source: libv3270-%{version}.tar.xz | 26 | Source: libv3270-%{version}.tar.xz |
33 | 27 | ||
34 | -Url: https://github.com/PerryWerneck/libv3270.git | 28 | +URL: https://github.com/PerryWerneck/libv3270 |
35 | Group: Development/Libraries/C and C++ | 29 | Group: Development/Libraries/C and C++ |
36 | 30 | ||
37 | BuildRequires: autoconf >= 2.61 | 31 | BuildRequires: autoconf >= 2.61 |
@@ -54,11 +48,6 @@ BuildRequires: gtk3-devel | @@ -54,11 +48,6 @@ BuildRequires: gtk3-devel | ||
54 | 48 | ||
55 | %endif | 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 | %if 0%{?centos_version} | 51 | %if 0%{?centos_version} |
63 | # CENTOS Genmarshal doesn't depends on python! | 52 | # CENTOS Genmarshal doesn't depends on python! |
64 | BuildRequires: python | 53 | BuildRequires: python |
@@ -66,32 +55,32 @@ BuildRequires: python | @@ -66,32 +55,32 @@ BuildRequires: python | ||
66 | 55 | ||
67 | %description | 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 | #---[ Library ]------------------------------------------------------------------------------------------------------- | 63 | #---[ Library ]------------------------------------------------------------------------------------------------------- |
74 | 64 | ||
75 | -%define _product %(pkg-config --variable=product_name lib3270) | ||
76 | %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) | 65 | %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) |
77 | %define MINOR_VERSION %(echo %{version} | cut -d. -f2) | 66 | %define MINOR_VERSION %(echo %{version} | cut -d. -f2) |
78 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} | 67 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} |
79 | 68 | ||
80 | %package -n %{name}-%{_libvrs} | 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 | %description -n %{name}-%{_libvrs} | 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 | #---[ Development ]--------------------------------------------------------------------------------------------------- | 79 | #---[ Development ]--------------------------------------------------------------------------------------------------- |
91 | 80 | ||
92 | %package devel | 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 | Group: Development/Libraries/C and C++ | 84 | Group: Development/Libraries/C and C++ |
96 | 85 | ||
97 | Requires: %{name}-%{_libvrs} = %{version} | 86 | Requires: %{name}-%{_libvrs} = %{version} |
@@ -103,12 +92,7 @@ Requires: lib3270-devel | @@ -103,12 +92,7 @@ Requires: lib3270-devel | ||
103 | %endif | 92 | %endif |
104 | 93 | ||
105 | %description devel | 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 | %package -n glade-catalog-v3270 | 97 | %package -n glade-catalog-v3270 |
114 | 98 | ||
@@ -119,17 +103,9 @@ Requires: libv3270-devel = %{version} | @@ -119,17 +103,9 @@ Requires: libv3270-devel = %{version} | ||
119 | Requires: glade | 103 | Requires: glade |
120 | 104 | ||
121 | %description -n glade-catalog-v3270 | 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 | widgets in Glade. | 107 | widgets in Glade. |
129 | 108 | ||
130 | -See more details at https://softwarepublico.gov.br/social/pw3270/ | ||
131 | - | ||
132 | - | ||
133 | #---[ Build & Install ]----------------------------------------------------------------------------------------------- | 109 | #---[ Build & Install ]----------------------------------------------------------------------------------------------- |
134 | 110 | ||
135 | %prep | 111 | %prep |
@@ -138,14 +114,15 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ | @@ -138,14 +114,15 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ | ||
138 | NOCONFIGURE=1 ./autogen.sh | 114 | NOCONFIGURE=1 ./autogen.sh |
139 | 115 | ||
140 | %configure \ | 116 | %configure \ |
141 | - --disable-static \ | ||
142 | --enable-pic | 117 | --enable-pic |
143 | 118 | ||
144 | %build | 119 | %build |
145 | -make all | 120 | +make %{?_smp_mflags} |
146 | 121 | ||
147 | %install | 122 | %install |
148 | -%makeinstall | 123 | +%make_install |
124 | +# configure --disable-static has no effect | ||
125 | +rm -f %{buildroot}/%{_libdir}/*.a | ||
149 | 126 | ||
150 | %files -n %{name}-%{_libvrs} | 127 | %files -n %{name}-%{_libvrs} |
151 | %defattr(-,root,root) | 128 | %defattr(-,root,root) |
@@ -161,29 +138,20 @@ make all | @@ -161,29 +138,20 @@ make all | ||
161 | %{_libdir}/%{name}.so.%{MAJOR_VERSION} | 138 | %{_libdir}/%{name}.so.%{MAJOR_VERSION} |
162 | %{_libdir}/%{name}.so.%{MAJOR_VERSION}.%{MINOR_VERSION} | 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 | %files devel | 141 | %files devel |
170 | %defattr(-,root,root) | 142 | %defattr(-,root,root) |
171 | 143 | ||
144 | +%{_datadir}/pw3270/pot/*.pot | ||
145 | + | ||
172 | %{_libdir}/%{name}.so | 146 | %{_libdir}/%{name}.so |
173 | %{_libdir}/pkgconfig/*.pc | 147 | %{_libdir}/pkgconfig/*.pc |
174 | 148 | ||
175 | %{_includedir}/v3270.h | 149 | %{_includedir}/v3270.h |
176 | %{_includedir}/v3270 | 150 | %{_includedir}/v3270 |
177 | 151 | ||
178 | -%{_datadir}/%{_product}/pot/*.pot | ||
179 | - | ||
180 | %files -n glade-catalog-v3270 | 152 | %files -n glade-catalog-v3270 |
181 | %defattr(-,root,root) | 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 | %post -n %{name}-%{_libvrs} -p /sbin/ldconfig | 156 | %post -n %{name}-%{_libvrs} -p /sbin/ldconfig |
189 | 157 |