Download as
Browse Code »

Commit 815c4338f1fc5194e910d90e63d6f7622eb86141

Authored by Perry Werneck
1 parent 7b6df931
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes para empacotamento.

Showing 2 changed files with 117 additions and 353 deletions   Show diff stats
@@ -61,6 +61,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -61,6 +61,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
61 MKDIR=@MKDIR_P@ 61 MKDIR=@MKDIR_P@
62 MSGCAT=@MSGCAT@ 62 MSGCAT=@MSGCAT@
63 AMTAR=@AMTAR@ 63 AMTAR=@AMTAR@
  64 +RPMBUILD=@RPMBUILD@
64 65
65 #---[ Rules ]------------------------------------------------------------------ 66 #---[ Rules ]------------------------------------------------------------------
66 67
@@ -190,6 +191,22 @@ bz2: \ @@ -190,6 +191,22 @@ bz2: \
190 tar: \ 191 tar: \
191 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar 192 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar
192 193
  194 +rpm: \
  195 + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
  196 +
  197 + @$(MKDIR) $(BASEDIR)/rpm
  198 + @$(MKDIR) $(BASEDIR)/rpm/SPECS
  199 + @$(MKDIR) $(BASEDIR)/rpm/SOURCES
  200 + @$(MKDIR) $(BASEDIR)/rpm/SRPMS
  201 + @$(MKDIR) $(BASEDIR)/rpm/RPMS
  202 + @$(MKDIR) $(BASEDIR)/rpm/BUILD
  203 + @$(MKDIR) $(BASEDIR)/rpm/BUILDROOT
  204 + @umask 002 ; $(RPMBUILD) \
  205 + --define="_topdir $(BASEDIR)/rpm" \
  206 + --define="_packager $(USER)@$(HOSTNAME)" \
  207 + --clean \
  208 + -ta $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
  209 +
193 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: \ 210 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: \
194 $(SRCDIR) 211 $(SRCDIR)
195 212
@@ -235,6 +252,16 @@ $(SRCDIR): \ @@ -235,6 +252,16 @@ $(SRCDIR): \
235 debian/* \ 252 debian/* \
236 $(SRCDIR)/debian 253 $(SRCDIR)/debian
237 254
  255 + @$(MKDIR) $(SRCDIR)/scripts
  256 + @$(INSTALL_DATA) \
  257 + scripts/* \
  258 + $(SRCDIR)/scripts
  259 +
  260 + @$(MKDIR) $(SRCDIR)/sdk
  261 + @$(INSTALL_DATA) \
  262 + sdk/*.in \
  263 + $(SRCDIR)/sdk
  264 +
238 @$(INSTALL_DATA) \ 265 @$(INSTALL_DATA) \
239 rpm/*.spec \ 266 rpm/*.spec \
240 $(SRCDIR) 267 $(SRCDIR)
rpm/pw3270.spec
  Diff comments   View file @815c433
1 # 1 #
2 -# spec file for package @PACKAGE@ 2 +# spec file for package pw3270
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.>
@@ -16,42 +16,46 @@ @@ -16,42 +16,46 @@
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 -%define LIBVERSION @MAJOR_VERSION@_@MINOR_VERSION@ 19 +#---[ Versions ]------------------------------------------------------------------------------------------------------
20 20
21 -#  
22 -# References:  
23 -#  
24 -# https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto#Detect_a_distribution_flavor_for_special_code  
25 -# 21 +%define MAJOR_VERSION 5
  22 +%define MINOR_VERSION 1
26 23
27 -%define _dbus 1  
28 -%define _office 0  
29 -%define _php 0  
30 -%define _ooRexx 1  
31 -%define _java 0  
32 -%define _python 1 24 +#---[ Selected modules ]----------------------------------------------------------------------------------------------
33 25
34 -%define _distro linux 26 +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  27 +%define _dbus 1
35 28
36 #---[ Packaging ]----------------------------------------------------------------------------------------------------- 29 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
37 30
38 -Name: @PACKAGE@  
39 -Version: @PACKAGE_VERSION@  
40 -Release: @PACKAGE_LEVEL@ 31 +Name: pw3270
  32 +Version: 5.1
  33 +Release: 0
41 Summary: IBM 3270 Terminal emulator for GTK 34 Summary: IBM 3270 Terminal emulator for GTK
42 License: GPL-2.0 35 License: GPL-2.0
43 Group: System/X11/Terminals 36 Group: System/X11/Terminals
44 Url: https://portal.softwarepublico.gov.br/social/pw3270/ 37 Url: https://portal.softwarepublico.gov.br/social/pw3270/
45 38
46 -Source: %{name}-%{version}.tar.bz2 39 +Source: pw3270-%{version}.tar.bz2
  40 +#Source1: %{name}.rpmlintrc
47 41
48 BuildRoot: %{_tmppath}/%{name}-%{version}-build 42 BuildRoot: %{_tmppath}/%{name}-%{version}-build
49 43
50 -Requires: lib3270 = %{version} 44 +Requires: lib3270-%{_libvrs} = %{version}
51 Requires: shared-mime-info 45 Requires: shared-mime-info
52 46
53 -Provides: lib@PACKAGE@ = %{version}  
54 -Provides: lib@PACKAGE@.so = %{version} 47 +Provides: libpw3270 = %{version}
  48 +Provides: libpw3270.so = %{version}
  49 +
  50 +#--[ Setup by distribution ]------------------------------------------------------------------------------------------
  51 +#
  52 +# References:
  53 +#
  54 +# https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto#Detect_a_distribution_flavor_for_special_code
  55 +#
  56 +
  57 +%define _distro linux
  58 +
55 59
56 #--[ Red HAT ]-------------------------------------------------------------------------------------------------------- 60 #--[ Red HAT ]--------------------------------------------------------------------------------------------------------
57 61
@@ -62,26 +66,8 @@ Provides: lib@PACKAGE@.so = %{version} @@ -62,26 +66,8 @@ Provides: lib@PACKAGE@.so = %{version}
62 BuildRequires: dbus-devel 66 BuildRequires: dbus-devel
63 BuildRequires: dbus-glib-devel 67 BuildRequires: dbus-glib-devel
64 BuildRequires: openssl-devel 68 BuildRequires: openssl-devel
65 -  
66 -%define _office 0  
67 -%define _php 0  
68 -  
69 -%if 0%{?rhel_version} >= 0700  
70 -  
71 -# RHEL 7.0  
72 -  
73 BuildRequires: gtk3-devel 69 BuildRequires: gtk3-devel
74 70
75 -%else  
76 -  
77 -# RHEL 6.0  
78 -%define _python 0  
79 -  
80 -BuildRequires: gtk2-devel  
81 -BuildRequires: java-1.6.0-devel  
82 -  
83 -%endif  
84 -  
85 %endif 71 %endif
86 72
87 #--[ CentOS ]--------------------------------------------------------------------------------------------------------- 73 #--[ CentOS ]---------------------------------------------------------------------------------------------------------
@@ -93,30 +79,8 @@ BuildRequires: java-1.6.0-devel @@ -93,30 +79,8 @@ BuildRequires: java-1.6.0-devel
93 BuildRequires: pkgconfig(dbus-1) 79 BuildRequires: pkgconfig(dbus-1)
94 BuildRequires: pkgconfig(dbus-glib-1) 80 BuildRequires: pkgconfig(dbus-glib-1)
95 BuildRequires: pkgconfig(openssl) 81 BuildRequires: pkgconfig(openssl)
96 -  
97 -%if 0%{?centos_version} >= 0700  
98 -  
99 -# CentOS 7  
100 -  
101 -%define _php 5  
102 -BuildRequires: php-devel  
103 -  
104 -%define _office 0  
105 -  
106 BuildRequires: pkgconfig(gtk+-3.0) 82 BuildRequires: pkgconfig(gtk+-3.0)
107 83
108 -%else  
109 -  
110 -# CentOS 6  
111 -  
112 -%define _office 0  
113 -%define _python 0  
114 -  
115 -BuildRequires: gtk2-devel  
116 -BuildRequires: java-1.8.0-devel  
117 -  
118 -%endif  
119 -  
120 %endif 84 %endif
121 85
122 #--[ Fedora ]--------------------------------------------------------------------------------------------------------- 86 #--[ Fedora ]---------------------------------------------------------------------------------------------------------
@@ -127,25 +91,8 @@ BuildRequires: java-1.8.0-devel @@ -127,25 +91,8 @@ BuildRequires: java-1.8.0-devel
127 91
128 BuildRequires: pkgconfig(dbus-1) 92 BuildRequires: pkgconfig(dbus-1)
129 BuildRequires: pkgconfig(dbus-glib-1) 93 BuildRequires: pkgconfig(dbus-glib-1)
130 -BuildRequires: pkgconfig(gtk+-3.0)  
131 BuildRequires: pkgconfig(openssl) 94 BuildRequires: pkgconfig(openssl)
132 -  
133 -%define _php 5  
134 -BuildRequires: php-devel  
135 -  
136 -%if 0%{?fedora} >= 21  
137 -  
138 -# Fedora 21 fails on libreoffice sdk  
139 -%define _office 0  
140 -  
141 -%else  
142 -  
143 -#%define _office 0  
144 -#BuildRequires: libreoffice-sdk  
145 -#BuildRequires: libreoffice-ure  
146 -#BuildRequires: librsvg2-tools  
147 -  
148 -%endif 95 +BuildRequires: pkgconfig(gtk+-3.0)
149 96
150 %endif 97 %endif
151 98
@@ -154,43 +101,19 @@ BuildRequires: php-devel @@ -154,43 +101,19 @@ BuildRequires: php-devel
154 %if 0%{?suse_version} 101 %if 0%{?suse_version}
155 102
156 # https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25sles_version 103 # https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25sles_version
157 -%if 0%{?sles_version}  
158 - %define _distro sles%{sles_version}  
159 - %define _office 0  
160 -%else  
161 -%if 0%{?sled_version}  
162 - %define _distro sled%{sled_version}  
163 - %define _office 0 104 +%if 0%{?is_opensuse}
  105 + %define _distro opensuse%{suse_version}
164 %else 106 %else
165 %define _distro suse%{suse_version} 107 %define _distro suse%{suse_version}
166 %endif 108 %endif
167 109
168 -%endif  
169 -  
170 BuildRequires: libopenssl-devel 110 BuildRequires: libopenssl-devel
171 BuildRequires: rsvg-view 111 BuildRequires: rsvg-view
172 112
173 -# OpenSUSE >= 12.2 enable GTK3 & D-Bus  
174 -%if 0%{?suse_version} >= 1220  
175 -  
176 BuildRequires: pkgconfig(dbus-1) 113 BuildRequires: pkgconfig(dbus-1)
177 BuildRequires: pkgconfig(dbus-glib-1) 114 BuildRequires: pkgconfig(dbus-glib-1)
178 BuildRequires: pkgconfig(gtk+-3.0) 115 BuildRequires: pkgconfig(gtk+-3.0)
179 116
180 -%else  
181 -  
182 -%define _dbus 0  
183 -%define _python 0  
184 -BuildRequires: gtk2-devel  
185 -  
186 -%endif  
187 -  
188 -# OpenSUSE >= 13.1 uses PHP5  
189 -%if 0%{?suse_version} >= 1310  
190 -%define _php 5  
191 -BuildRequires: php%{_php}-devel  
192 -%endif  
193 -  
194 %endif 117 %endif
195 118
196 #--------------------------------------------------------------------------------------------------------------------- 119 #---------------------------------------------------------------------------------------------------------------------
@@ -199,28 +122,6 @@ BuildRequires: autoconf &gt;= 2.61 @@ -199,28 +122,6 @@ BuildRequires: autoconf &gt;= 2.61
199 BuildRequires: automake 122 BuildRequires: automake
200 BuildRequires: binutils 123 BuildRequires: binutils
201 BuildRequires: coreutils 124 BuildRequires: coreutils
202 -  
203 -%if 0%{?_ooRexx}  
204 -BuildRequires: ooRexx-devel >= 4.2.0  
205 -%endif  
206 -  
207 -%if 0%{?_python}  
208 -BuildRequires: python  
209 -BuildRequires: python-devel  
210 -  
211 -%define pythonextpath %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")  
212 -%endif  
213 -  
214 -%if 0%{?_php}  
215 -%define _phpextdir %(php-config --extension-dir)  
216 -%define _phpconf %(php-config | sed 's@ @\\n@g' | grep "^--with-config-file-scan-dir=" | cut -d= -f2)  
217 -%endif  
218 -  
219 -%if 0%{?_java}  
220 -BuildRequires: java-devel  
221 -BuildRequires: javapackages-tools  
222 -%endif  
223 -  
224 BuildRequires: desktop-file-utils 125 BuildRequires: desktop-file-utils
225 BuildRequires: findutils 126 BuildRequires: findutils
226 BuildRequires: gcc-c++ 127 BuildRequires: gcc-c++
@@ -236,13 +137,13 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra @@ -236,13 +137,13 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra
236 137
237 #--[ lib3270 ]-------------------------------------------------------------------------------------------------------- 138 #--[ lib3270 ]--------------------------------------------------------------------------------------------------------
238 139
239 -%package -n lib3270-%LIBVERSION 140 +%package -n lib3270-%{_libvrs}
240 Summary: 3270 Communication library for %{name} 141 Summary: 3270 Communication library for %{name}
241 Group: Development/Libraries/C and C++ 142 Group: Development/Libraries/C and C++
242 Requires: openssl 143 Requires: openssl
243 -Provides: lib3270 144 +Provides: lib3270 = %{version}
244 145
245 -%description -n lib3270-%LIBVERSION 146 +%description -n lib3270-%{_libvrs}
246 Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. 147 Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
247 148
248 This package contains the tn3270 protocol library for %{name} 149 This package contains the tn3270 protocol library for %{name}
@@ -252,19 +153,22 @@ This package contains the tn3270 protocol library for %{name} @@ -252,19 +153,22 @@ This package contains the tn3270 protocol library for %{name}
252 %package -n lib3270-devel 153 %package -n lib3270-devel
253 Summary: Devel for 3270 Communication library for %{name} 154 Summary: Devel for 3270 Communication library for %{name}
254 Group: Development/Libraries/C and C++ 155 Group: Development/Libraries/C and C++
255 -Requires: lib3270-%LIBVERSION = %{version} 156 +Requires: lib3270 = %{version}
256 157
257 %description -n lib3270-devel 158 %description -n lib3270-devel
258 Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. 159 Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
259 This package contains the development files for tn3270 protocol library for %{name} 160 This package contains the development files for tn3270 protocol library for %{name}
260 161
261 -%package -n @PACKAGE@-devel 162 +%package -n %{name}-devel
262 Summary: Files required for development of %{name} plugins 163 Summary: Files required for development of %{name} plugins
263 Group: Development/Libraries/C and C++ 164 Group: Development/Libraries/C and C++
  165 +
264 Requires: lib3270-devel = %{version} 166 Requires: lib3270-devel = %{version}
265 -Requires: @PACKAGE@ = %{version} 167 +Requires: %{name} = %{version}
  168 +
  169 +Provides: pw3270-devel = %{MAJOR_VERSION}.%{MINOR_VERSION}
266 170
267 -%description -n @PACKAGE@-devel 171 +%description -n %{name}-devel
268 Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. 172 Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
269 173
270 This package contains the development files for %{name} 174 This package contains the development files for %{name}
@@ -282,97 +186,16 @@ Requires: dbus-1 @@ -282,97 +186,16 @@ Requires: dbus-1
282 Plugin exporting a DBUS object from every %{name} open session. 186 Plugin exporting a DBUS object from every %{name} open session.
283 %endif 187 %endif
284 188
285 -%if 0%{?_ooRexx}  
286 -%package -n %{name}-plugin-rexx  
287 -Summary: Rexx class for 3270 access  
288 -Group: Development/Languages/Other  
289 -Requires: lib3270 = %{version}  
290 -Requires: ooRexx >= 4.1  
291 -  
292 -%description -n %{name}-plugin-rexx  
293 -This package provides Rexx class and associated libraries  
294 -allowing rexx scripts to access tn3270e hosts.  
295 -%endif  
296 -  
297 -#--[ Extensions ]-----------------------------------------------------------------------------------------------------  
298 -  
299 -%if 0%{?_office}  
300 -%package -n %{name}-libreoffice  
301 -Summary: 3270 host access extension for libreoffice  
302 -Group: Productivity/Office/Suite  
303 -Requires: lib3270 = %{version}  
304 -Requires: libreoffice  
305 -  
306 -%description -n %{name}-libreoffice  
307 -This package provides 3270 access object to StarBasic.  
308 -%endif  
309 -  
310 -%if 0%{?_php}  
311 -%package -n php%{_php}-tn3270  
312 -Summary: PHP%{_php} Extension Module implementing tn3270 protocol  
313 -Group: Development/Libraries/PHP  
314 -Requires: lib3270 = %{version}  
315 -  
316 -%description -n php%{_php}-tn3270  
317 -This is an extension for acessing 3270 hosts directly  
318 -from PHP apps.  
319 -%endif  
320 -  
321 -%if 0%{?_python}  
322 -%package -n python-tn3270  
323 -Summary: Python Extension Module implementing tn3270 protocol  
324 -Group: Development/Libraries/Python  
325 -Requires: lib3270 = %{version}  
326 -  
327 -%description -n python-tn3270  
328 -This is an extension for acessing 3270 hosts directly  
329 -from python apps.  
330 -%endif  
331 -  
332 -%if 0%{?_java}  
333 -%package java  
334 -Summary: Java class to interact with @PACKAGE@  
335 -Group: Development/Libraries/Java  
336 -Requires: javapackages-tools  
337 -Requires: lib3270 = %{version}  
338 -  
339 -%description java  
340 -Java class for lib3270/@PACKAGE@ interaction.  
341 -  
342 -%package plugin-java  
343 -Summary: Java plugin for %{name}  
344 -Group: Development/Libraries/Java  
345 -Requires: %{name} = %{version}  
346 -Requires: %{name}-java = %{version}  
347 -  
348 -%description plugin-java  
349 -This package provides a plugin allowing calling of java classes  
350 -from @PACKAGE@ application.  
351 -  
352 -%package javadoc  
353 -Summary: Javadoc for %{name}  
354 -Group: Documentation  
355 -Requires: jpackage-utils  
356 -  
357 -%description javadoc  
358 -API documentation for %{name}.  
359 -%endif  
360 -  
361 #---[ Build & Install ]----------------------------------------------------------------------------------------------- 189 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
362 190
363 %prep 191 %prep
364 192
365 -echo "Distribution: %{_distro}" 193 +%setup -q -n pw3270-%{version}
366 194
367 -%if 0%{?_php}  
368 - echo " * PHP%{_php} is enabled"  
369 -%endif  
370 -%if 0%{?_dbus}  
371 - echo " * DBUS is enabled"  
372 -%endif 195 +echo "m4_define([SVN_REVISION], %{release})" > revision.m4
  196 +echo "m4_define([SVN_URL], http://softwarepublico.gov.br/gitlab/pw3270/principal.git)" >> revision.m4
  197 +echo "m4_define([APP_LEVEL], 0)" >> revision.m4
373 198
374 -%setup -q -n %{name}-%{version}  
375 -find . -exec touch {} \;  
376 aclocal 199 aclocal
377 autoconf 200 autoconf
378 201
@@ -380,62 +203,42 @@ export CFLAGS=&quot;$RPM_OPT_FLAGS&quot; @@ -380,62 +203,42 @@ export CFLAGS=&quot;$RPM_OPT_FLAGS&quot;
380 export CXXFLAGS="$RPM_OPT_FLAGS" 203 export CXXFLAGS="$RPM_OPT_FLAGS"
381 export FFLAGS="$RPM_OPT_FLAGS" 204 export FFLAGS="$RPM_OPT_FLAGS"
382 205
383 -%if 0%{?_java}  
384 -export JAVA_HOME=%{java_home}  
385 -echo "JAVA_HOME=$JAVA_HOME"  
386 -echo "javadocdir=%{_javadocdir}"  
387 -%endif  
388 -  
389 -%configure --disable-strip \  
390 - --enable-pic \  
391 - --with-jnidir="%{_jnidir}" \  
392 - --with-jvmjardir="%{_jvmjardir}" \  
393 - --with-javadocdir="%{_javadocdir}" 206 +%configure
394 207
395 %build 208 %build
396 make clean 209 make clean
397 make all 210 make all
398 211
399 %install 212 %install
400 -export NO_BRP_CHECK_BYTECODE_VERSION=true  
401 -  
402 -make DESTDIR=$RPM_BUILD_ROOT install 213 +%makeinstall
403 214
404 -find $RPM_BUILD_ROOT 215 +%find_lang pw3270 langfiles
405 216
406 -%find_lang %{name} langfiles  
407 -  
408 -cat > @PACKAGE@.desktop << EOF 217 +cat > pw3270.desktop << EOF
409 [Desktop Entry] 218 [Desktop Entry]
410 X-SuSE-translate=true 219 X-SuSE-translate=true
411 -GenericName=@PACKAGE@ 220 +GenericName=pw3270
412 Name=3270 Terminal 221 Name=3270 Terminal
413 Comment=IBM 3270 Terminal emulator 222 Comment=IBM 3270 Terminal emulator
414 -Exec=@PACKAGE@  
415 -Icon=%{_datadir}/@PACKAGE@/@PACKAGE@.png 223 +Exec=pw3270
  224 +Icon=%{_datadir}/pw3270/pw3270.png
416 Terminal=false 225 Terminal=false
417 Type=Application 226 Type=Application
418 StartupNotify=true 227 StartupNotify=true
419 EOF 228 EOF
420 -chmod 644 @PACKAGE@.desktop 229 +chmod 644 pw3270.desktop
421 230
422 desktop-file-install --mode 644 \ 231 desktop-file-install --mode 644 \
423 --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ 232 --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
424 --add-category System \ 233 --add-category System \
425 --add-category TerminalEmulator \ 234 --add-category TerminalEmulator \
426 - @PACKAGE@.desktop  
427 -  
428 -%if 0%{?_ooRexx} == 0  
429 -# remove rexx-files from builddir if it's disabled  
430 -rm -f ${RPM_BUILD_ROOT}/%{_datadir}/@PACKAGE@/ui/80rexx.xml  
431 -%endif 235 + pw3270.desktop
432 236
433 -%if 0%{?_java} == 0  
434 -# remove java-files from builddir if it's disabled  
435 -rm ${RPM_BUILD_ROOT}/%{_datadir}/@PACKAGE@/ui/*java*.xml  
436 -%endif 237 +# Java now lives in another package
  238 +rm ${RPM_BUILD_ROOT}/%{_datadir}/pw3270/ui/*java*.xml
437 239
438 -find ${RPM_BUILD_ROOT} 240 +# ooRexx now lives in another package
  241 +rm ${RPM_BUILD_ROOT}/%{_datadir}/pw3270/ui/*rexx*.xml
439 242
440 %clean 243 %clean
441 rm -rf %{buildroot} 244 rm -rf %{buildroot}
@@ -445,30 +248,30 @@ rm -rf %{buildroot} @@ -445,30 +248,30 @@ rm -rf %{buildroot}
445 %files -f langfiles 248 %files -f langfiles
446 %defattr(-,root,root) 249 %defattr(-,root,root)
447 %doc AUTHORS LICENSE 250 %doc AUTHORS LICENSE
448 -%{_mandir}/*/* 251 +# %{_mandir}/*/*
449 252
450 # Main application 253 # Main application
451 -%dir %{_datadir}/@PACKAGE@  
452 -%dir %{_datadir}/@PACKAGE@/ui  
453 -%{_bindir}/@PACKAGE@  
454 -%{_libdir}/lib@PACKAGE@.so.5  
455 -%{_libdir}/lib@PACKAGE@.so.%version  
456 -  
457 -%{_datadir}/applications/@PACKAGE@.desktop  
458 -  
459 -%{_datadir}/@PACKAGE@/ui/00default.xml  
460 -%{_datadir}/@PACKAGE@/ui/10functions.xml  
461 -%{_datadir}/@PACKAGE@/ui/10keypad.xml  
462 -%{_datadir}/@PACKAGE@/colors.conf  
463 -%{_datadir}/@PACKAGE@/@PACKAGE@.png  
464 -%{_datadir}/@PACKAGE@/@PACKAGE@-logo.png  
465 -%{_datadir}/locale/pt_BR/LC_MESSAGES/@PACKAGE@.mo  
466 -%dir %{_libdir}/@PACKAGE@-plugins  
467 -  
468 -%files -n lib3270-%LIBVERSION 254 +%dir %{_datadir}/pw3270
  255 +%dir %{_datadir}/pw3270/ui
  256 +%{_bindir}/pw3270
  257 +%{_libdir}/libpw3270.so.%{MAJOR_VERSION}
  258 +%{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
  259 +
  260 +%{_datadir}/applications/pw3270.desktop
  261 +
  262 +%{_datadir}/pw3270/ui/00default.xml
  263 +%{_datadir}/pw3270/ui/10functions.xml
  264 +%{_datadir}/pw3270/ui/10keypad.xml
  265 +%{_datadir}/pw3270/colors.conf
  266 +%{_datadir}/pw3270/pw3270.png
  267 +%{_datadir}/pw3270/pw3270-logo.png
  268 +%{_datadir}/locale/pt_BR/LC_MESSAGES/pw3270.mo
  269 +%dir %{_libdir}/pw3270-plugins
  270 +
  271 +%files -n lib3270-%{_libvrs}
469 %defattr(-,root,root) 272 %defattr(-,root,root)
470 -%{_libdir}/lib3270.so.%version  
471 -%{_libdir}/lib3270.so.5 273 +%{_libdir}/lib3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
  274 +%{_libdir}/lib3270.so.%{MAJOR_VERSION}
472 275
473 %files -n lib3270-devel 276 %files -n lib3270-devel
474 %defattr(-,root,root) 277 %defattr(-,root,root)
@@ -477,81 +280,25 @@ rm -rf %{buildroot} @@ -477,81 +280,25 @@ rm -rf %{buildroot}
477 %{_libdir}/pkgconfig/lib3270.pc 280 %{_libdir}/pkgconfig/lib3270.pc
478 %{_libdir}/lib3270.so 281 %{_libdir}/lib3270.so
479 282
480 -%files -n @PACKAGE@-devel 283 +%files -n %{name}-devel
481 %defattr(-,root,root) 284 %defattr(-,root,root)
482 -%{_includedir}/@PACKAGE@  
483 -%{_includedir}/@PACKAGE@.h  
484 -%{_datadir}/@PACKAGE@/ui/98trace.xml  
485 -%{_datadir}/@PACKAGE@/ui/99debug.xml  
486 -%{_libdir}/lib@PACKAGE@.so  
487 -%{_libdir}/pkgconfig/@PACKAGE@.pc 285 +%{_includedir}/pw3270
  286 +%{_includedir}/pw3270.h
  287 +%{_datadir}/pw3270/ui/98trace.xml
  288 +%{_datadir}/pw3270/ui/99debug.xml
  289 +%{_libdir}/libpw3270.so
  290 +%{_libdir}/pkgconfig/pw3270.pc
488 291
489 -%{_libdir}/lib@PACKAGE@cpp.a  
490 -%{_includedir}/@PACKAGE@cpp.h 292 +%{_libdir}/libpw3270cpp.a
  293 +%{_includedir}/pw3270cpp.h
491 294
492 -%dir %{_datadir}/@PACKAGE@/sample  
493 -%{_datadir}/@PACKAGE@/sample/* 295 +%dir %{_datadir}/pw3270/sample
  296 +%{_datadir}/pw3270/sample/*
494 297
495 %if 0%{?_dbus} 298 %if 0%{?_dbus}
496 %files plugin-dbus 299 %files plugin-dbus
497 %defattr(-,root,root) 300 %defattr(-,root,root)
498 -%{_libdir}/@PACKAGE@-plugins/dbus3270.so  
499 -%endif  
500 -  
501 -%if 0%{?_office}  
502 -%files -n %{name}-libreoffice  
503 -%defattr(-,root,root)  
504 -%dir %{_libdir}/libreoffice/share/extensions/%{name}  
505 -%dir %{_libdir}/libreoffice/share/extensions/%{name}/META-INF  
506 -%{_libdir}/libreoffice/share/extensions/%{name}/META-INF/manifest.xml  
507 -%{_libdir}/libreoffice/share/extensions/%{name}/description.txt  
508 -%{_libdir}/libreoffice/share/extensions/%{name}/description.xml  
509 -%{_libdir}/libreoffice/share/extensions/%{name}/@PACKAGE@.png  
510 -%{_libdir}/libreoffice/share/extensions/%{name}/@PACKAGE@.rdb  
511 -%{_libdir}/libreoffice/share/extensions/%{name}/@PACKAGE@.uno.so  
512 -%endif  
513 -  
514 -%if 0%{?_ooRexx}  
515 -%files -n %{name}-plugin-rexx  
516 -%defattr(-,root,root)  
517 -%{_rexxlibdir}/librx3270.so.%version  
518 -%{_rexxlibdir}/librx3270.so  
519 -%{_rexxclassdir}/rx3270.cls  
520 -%{_libdir}/@PACKAGE@-plugins/rx3270.so  
521 -%{_datadir}/@PACKAGE@/ui/80rexx.xml  
522 -%endif  
523 -  
524 -%if 0%{?_php}  
525 -%files -n php%{_php}-tn3270  
526 -%defattr(-,root,root)  
527 -%config %{_phpconf}/tn3270.ini  
528 -%{_phpextdir}/*.so  
529 -%endif  
530 -  
531 -%if 0%{?_python}  
532 -%files -n python-tn3270  
533 -%defattr(-,root,root)  
534 -%{pythonextpath}/py3270.so  
535 -%endif  
536 -  
537 -%if 0%{?_java}  
538 -%files java  
539 -%defattr(-,root,root)  
540 -%dir %{_jnidir}  
541 -%dir %{_jvmjardir}  
542 -  
543 -%{_jnidir}/libjni3270.so  
544 -%{_jvmjardir}/@PACKAGE@.jar  
545 -  
546 -%files plugin-java  
547 -%defattr(-,root,root)  
548 -%{_libdir}/@PACKAGE@-plugins/j3270.so  
549 -  
550 -%files javadoc  
551 -%defattr(-,root,root)  
552 -%dir %{_javadocdir}  
553 -%{_javadocdir}/%{name}  
554 -%{_datadir}/@PACKAGE@/ui/*java*.xml 301 +%{_libdir}/pw3270-plugins/dbus3270.so
555 %endif 302 %endif
556 303
557 #---[ Scripts ]------------------------------------------------------------------------------------------------------- 304 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
@@ -564,22 +311,12 @@ exit 0 @@ -564,22 +311,12 @@ exit 0
564 /sbin/ldconfig 311 /sbin/ldconfig
565 exit 0 312 exit 0
566 313
567 -%post -n lib3270-%LIBVERSION  
568 -/sbin/ldconfig  
569 -exit 0  
570 -  
571 -%postun -n lib3270-%LIBVERSION 314 +%post -n lib3270-%{_libvrs}
572 /sbin/ldconfig 315 /sbin/ldconfig
573 exit 0 316 exit 0
574 317
575 -%if 0%{?_ooRexx}  
576 -%post -n %{name}-plugin-rexx 318 +%postun -n lib3270-%{_libvrs}
577 /sbin/ldconfig 319 /sbin/ldconfig
578 exit 0 320 exit 0
579 321
580 -%postun -n %{name}-plugin-rexx  
581 -/sbin/ldconfig  
582 -exit 0  
583 -%endif  
584 -  
585 %changelog 322 %changelog