Download as
Browse Code »

Commit e280dcea0e30d4c9ecfc981e8ea77a397d08709c

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

Updating linux packages.

Showing 2 changed files with 41 additions and 26 deletions   Show diff stats
debian/rules
  Diff comments   View file @e280dce
... ... @@ -23,11 +23,18 @@ build-stamp:
23 23 dh_testdir
24 24  
25 25 # Add here commands to compile the package.
  26 +
26 27 aclocal
27 28 autoconf
  29 +
  30 + mkdir -p scripts
  31 + automake --add-missing 2> /dev/null | true
  32 +
28 33 ./configure --prefix=/usr
  34 +
29 35 rm -f debian/*.install
30 36 make Release
  37 +
31 38 # --- end custom part for compiling
32 39  
33 40 touch build-stamp
... ...
rpm/pw3270.spec
  Diff comments   View file @e280dce
... ... @@ -105,6 +105,7 @@ BuildRequires: pkgconfig(gtk+-3.0)
105 105 BuildRequires: pkgconfig(lib3270)
106 106 BuildRequires: pkgconfig(libv3270)
107 107 BuildRequires: librsvg2-tools
  108 +BuildRequires: autoconf-archive
108 109  
109 110 %endif
110 111  
... ... @@ -127,6 +128,11 @@ BuildRequires: pkgconfig(lib3270)
127 128 BuildRequires: pkgconfig(libv3270)
128 129 BuildRequires: rsvg-view
129 130  
  131 +# https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
  132 +%if 0%{suse_version} > 120100
  133 +BuildRequires: autoconf-archive
  134 +%endif
  135 +
130 136 %endif
131 137  
132 138 #---------------------------------------------------------------------------------------------------------------------
... ... @@ -145,7 +151,6 @@ BuildRequires: sed
145 151 BuildRequires: optipng
146 152 BuildRequires: fdupes
147 153 BuildRequires: ImageMagick
148   -BuildRequires: autoconf-archive
149 154  
150 155 %if 0%{?_help2man}
151 156 BuildRequires: help2man
... ... @@ -172,18 +177,21 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used
172 177  
173 178 This package contains the default configuration and branding for %{name}.
174 179  
175   -#--[ Plugins ]--------------------------------------------------------------------------------------------------------
  180 +#--[ Devel ]----------------------------------------------------------------------------------------------------------
176 181  
177   -%if 0%{?_dbus}
178   -%package plugin-dbus
179   -Summary: D-Bus object for %{name}
180   -Group: System/X11/Terminals
  182 +%package devel
  183 +Summary: Files required for development of %{name} plugins
  184 +Group: Development/Libraries/C and C++
  185 +
  186 +Requires: pkgconfig(lib3270)
  187 +Requires: pkgconfig(libv3270)
  188 +Requires: pkgconfig(gtk+-3.0)
181 189 Requires: %{name} = %{version}
182   -Requires: dbus-1
183 190  
184   -%description plugin-dbus
185   -Plugin exporting a DBUS object from every %{name} open session.
186   -%endif
  191 +%description -n %{name}-devel
  192 +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.
  193 +
  194 +This package contains the development files for %{name}.
187 195  
188 196 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
189 197  
... ... @@ -191,11 +199,7 @@ Plugin exporting a DBUS object from every %{name} open session.
191 199  
192 200 %setup -q -n pw3270-%{version}
193 201  
194   -mkdir -p scripts
195   -automake --add-missing 2> /dev/null | true
196   -
197   -aclocal
198   -autoconf
  202 +NOCONFIGURE=1 ./autogen.sh
199 203  
200 204 %configure \
201 205 --with-release=%{release}
... ... @@ -231,11 +235,6 @@ desktop-file-install --mode 644 \
231 235 --add-category TerminalEmulator \
232 236 pw3270.desktop
233 237  
234   -# Java now lives in another package
235   -rm %{buildroot}/%{_datadir}/pw3270/ui/*java*.xml
236   -
237   -# ooRexx now lives in another package
238   -rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
239 238 %fdupes %{buildroot}/%{_prefix}
240 239  
241 240 #---[ Files ]---------------------------------------------------------------------------------------------------------
... ... @@ -257,7 +256,6 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
257 256 %{_datadir}/pw3270/charsets/bracket.xml
258 257  
259 258 %{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
260   -%{_libdir}/libpw3270.so.%{MAJOR_VERSION}
261 259  
262 260 %files branding
263 261 %defattr(-,root,root)
... ... @@ -270,11 +268,21 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
270 268 %{_datadir}/pw3270/pw3270.png
271 269 %{_datadir}/pw3270/pw3270-logo.png
272 270  
273   -%if 0%{?_dbus}
274   -%files plugin-dbus
275   -%defattr(-,root,root)
276   -%{_libdir}/pw3270-plugins/dbus3270.so
277   -%endif
  271 +%files devel
  272 +
  273 +%{_includedir}/pw3270.h
  274 +%{_includedir}/pw3270cpp.h
  275 +%{_includedir}/pw3270
  276 +
  277 +%{_libdir}/libpw3270.so
  278 +%{_libdir}/libpw3270.so.%{MAJOR_VERSION}
  279 +
  280 +%{_libdir}/libpw3270cpp.a
  281 +%{_libdir}/pkgconfig/pw3270.pc
  282 +%{_datadir}/pw3270/locale
  283 +
  284 +%{_datadir}/pw3270/ui/98trace.xml
  285 +%{_datadir}/pw3270/ui/99debug.xml
278 286  
279 287 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
280 288  
... ...