pool/x3270
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix building with new rpm and just use the macros availiable in

Browse Source 
place of current hardcoded stuff. Passing of arguments to cp in
  %doc macro seem not to be possible anymore.

OBS-URL: https://build.opensuse.org/package/show/Base:System/x3270?expand=0&rev=24
This commit is contained in:
Tomáš Chvátal 2013-07-24 09:01:25 +00:00 committed by Git OBS Bridge
parent 9d51591fdd
commit d62485013e
2 changed files with 74 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x3270.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 24 08:58:55 UTC 2013 - tchvatal@suse.com
- Fix building with new rpm and just use the macros availiable in
place of current hardcoded stuff. Passing of arguments to cp in
%doc macro seem not to be possible anymore.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 12 19:12:26 UTC 2013 - jjolly@suse.com Wed Jun 12 19:12:26 UTC 2013 - jjolly@suse.com

148
x3270.spec
View File

@ -16,21 +16,18 @@
# #
%define appdefdir %{_datadir}/X11
Name: x3270 Name: x3270
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: bdftopcf BuildRequires: bdftopcf
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
BuildRequires: ncurses-devel
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
%define appdefdir /usr/share/X11
%define xbindir /usr/bin
%define xmandir /usr/share/man
%define xincludes /usr/include
%define xlibraries /usr/%{_lib}
BuildRequires: freetype2 BuildRequires: freetype2
BuildRequires: ncurses-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: tcl-devel BuildRequires: tcl-devel
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
Version: 3.3.12 Version: 3.3.12
Release: 0 Release: 0
Summary: A Family of IBM 3270 Terminal Emulators Summary: A Family of IBM 3270 Terminal Emulators
@ -102,15 +99,12 @@ x026 is a fun toy which emulates an x026 puncher.
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
export LIBX3270DIR=/etc/x3270 export LIBX3270DIR=%{_sysconfdir}/x3270
# the tcl variant # the tcl variant
cd tcl3270-3.3 cd tcl3270-3.3
autoconf autoconf
./configure \ %configure \
--cache-file=../config.cache \ --cache-file=../config.cache \
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--with-tcl=%tcl_version \ --with-tcl=%tcl_version \
--enable-ssl --enable-ssl
make LIBX3270DIR=${LIBX3270DIR} make LIBX3270DIR=${LIBX3270DIR}
@ -118,14 +112,12 @@ cd ..
# the X variant # the X variant
cd x3270-3.3 cd x3270-3.3
# pr3287 is built from the separate source pr3287*.tgz above. # pr3287 is built from the separate source pr3287*.tgz above.
./configure \ %configure \
--cache-file=../config.cache \ --cache-file=../config.cache \
--prefix=%{_prefix} \
--enable-app-defaults \ --enable-app-defaults \
--without-pr3287 \ --without-pr3287 \
--x-includes=%{xincludes} \ --x-includes=%{_includedir} \
--x-libraries=%{xlibraries} \ --x-libraries=%{_libdir} \
--mandir=%{xmandir} \
--with-all-xinstall \ --with-all-xinstall \
--with-fontdir=%{_miscfontsdir} \ --with-fontdir=%{_miscfontsdir} \
--enable-ssl --enable-ssl
@ -135,32 +127,23 @@ cd x3270-3.3
cd .. cd ..
# the console variant # the console variant
cd c3270-3.3 cd c3270-3.3
./configure \ %configure \
--cache-file=../config.cache \ --cache-file=../config.cache \
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--without-pr3287 \ --without-pr3287 \
--enable-ssl --enable-ssl
make LIBX3270DIR=${LIBX3270DIR} make LIBX3270DIR=${LIBX3270DIR}
cd .. cd ..
# the scripting variant # the scripting variant
cd s3270-3.3 cd s3270-3.3
./configure \ %configure \
--cache-file=../config.cache \ --cache-file=../config.cache \
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--enable-ssl --enable-ssl
make LIBX3270DIR=${LIBX3270DIR} make LIBX3270DIR=${LIBX3270DIR}
cd .. cd ..
# the printer # the printer
cd pr3287-3.3 cd pr3287-3.3
./configure \ %configure \
--cache-file=../config.cache \ --cache-file=../config.cache \
--bindir=%{_bindir} \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--enable-ssl --enable-ssl
make LIBX3270DIR=${LIBX3270DIR} make LIBX3270DIR=${LIBX3270DIR}
cd .. cd ..
@ -171,106 +154,109 @@ cd x026-1.0
cd .. cd ..
%install %install
export LIBX3270DIR=/etc/x3270 export LIBX3270DIR=%{_sysconfdir}/x3270
# abort on error # abort on error
set -e set -e
# if RPM_BUILD_ROOT is set, clean it up
${RPM_BUILD_ROOT:+rm -rf $RPM_BUILD_ROOT}
# create the default directory structure in the build root # create the default directory structure in the build root
mkdir --parents $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/{man1,man5}} mkdir --parents %{buildroot}{%{_bindir},%{_mandir}/{man1,man5}}
# the X variant # the X variant
cd x3270-3.3 cd x3270-3.3
chmod -x html/Keymap.html chmod -x html/Keymap.html
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install.man make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
# make install does a mkfontdir, that creates a fonts.dir we don't # make install does a mkfontdir, that creates a fonts.dir we don't
# want in the package. remove that: # want in the package. remove that:
rm $RPM_BUILD_ROOT%{_miscfontsdir}/fonts.dir rm %{buildroot}%{_miscfontsdir}/fonts.dir
install -d -m 755 \ install -d -m 755 \
$RPM_BUILD_ROOT%{appdefdir}/app-defaults %{buildroot}%{appdefdir}/app-defaults
install -m 644 X3270.xad \ install -m 644 X3270.xad \
$RPM_BUILD_ROOT%{appdefdir}/app-defaults/X3270 %{buildroot}%{appdefdir}/app-defaults/X3270
# clean up: # clean up:
# remove remainders of patching the examples, if existing # remove remainders of patching the examples, if existing
rm -v Examples/*.orig || true rm -v Examples/*.orig || true
cd .. cd ..
# the console variant # the console variant
cd c3270-3.3 cd c3270-3.3
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install.man make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
cd .. cd ..
# the scripting variant # the scripting variant
cd s3270-3.3 cd s3270-3.3
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install.man make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
cd .. cd ..
# the tcl variant # the tcl variant
cd tcl3270-3.3 cd tcl3270-3.3
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install.man make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
cd .. cd ..
# the printer # the printer
cd pr3287-3.3 cd pr3287-3.3
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install.man make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
cd .. cd ..
# the IBM 026 keypunch emulator # the IBM 026 keypunch emulator
cd x026-1.0 cd x026-1.0
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=%{buildroot} install
cd .. cd ..
# move site config files to the standard locations # move site config files to the standard locations
mkdir -p $RPM_BUILD_ROOT/usr/lib/x3270 mkdir -p %{buildroot}/usr/lib/x3270
# this is a per-site, not a per-machine config file # this is a per-site, not a per-machine config file
chmod 644 $RPM_BUILD_ROOT/etc/x3270/ibm_hosts chmod 644 %{buildroot}%{_sysconfdir}/x3270/ibm_hosts
cp -a %{S:5} . cp -a %{S:5} .
# remove man-pages in /usr/man # remove man-pages in /usr/man
rm -rf $RPM_BUILD_ROOT/usr/man/man{1,5} rm -rf %{buildroot}/usr/man/man{1,5}
# set permissions correct # set permissions correct
chmod ugo-x $RPM_BUILD_ROOT/usr/share/man/man{1,5}/* chmod ugo-x %{buildroot}%{_mandir}/man{1,5}/*
# copy the docs
mkdir -p %{buildroot}%{_docdir}/%name
cp -pr --parents x3270-3.3/{Examples,html,Playback} %{buildroot}%{_docdir}/%name
cp -pr --parents c3270-3.3/html %{buildroot}%{_docdir}/%name
cp -pr --parents pr3287-3.3/html %{buildroot}%{_docdir}/%name
cp -pr --parents s3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name
cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name
%reconfigure_fonts_scriptlets %reconfigure_fonts_scriptlets
%clean
#${RPM_BUILD_ROOT:+rm -rf $RPM_BUILD_ROOT}
%files %files
%defattr(-,root,root,755) %defattr(-,root,root,755)
# common files # common files
%dir /etc/x3270 %dir %{_sysconfdir}/x3270
%config(noreplace) /etc/x3270/ibm_hosts %config(noreplace) %{_sysconfdir}/x3270/ibm_hosts
%doc /usr/share/man/man5/ibm_hosts.5.gz %doc %{_mandir}/man5/ibm_hosts.5.gz
%doc /usr/share/man/man1/x3270if.1.gz %doc %{_mandir}/man1/x3270if.1.gz
%doc /usr/share/man/man1/x3270-script.1.gz %doc %{_mandir}/man1/x3270-script.1.gz
/usr/bin/x3270if %{_bindir}/x3270if
# x3270 # x3270
%{xbindir}/x3270 %{_bindir}/x3270
%{appdefdir}/app-defaults/X3270 %{appdefdir}/app-defaults/X3270
%dir %{_miscfontsdir} %dir %{_miscfontsdir}
%{_miscfontsdir}/* %{_miscfontsdir}/*
%doc %{xmandir}/man1/x3270.1x.gz %doc %{_mandir}/man1/x3270.1x.gz
%doc --parents x3270-3.3/Examples %doc %{_docdir}/%name/x3270-3.3/Examples
%doc --parents x3270-3.3/html %doc %{_docdir}/%name/x3270-3.3/html
%doc --parents x3270-3.3/Playback %doc %{_docdir}/%name/x3270-3.3/Playback
# c3270 # c3270
/usr/bin/c3270 %{_bindir}/c3270
%doc /usr/share/man/man1/c3270.1.gz %doc %{_mandir}/man1/c3270.1.gz
%doc --parents c3270-3.3/html %doc %{_docdir}/%name/c3270-3.3/html
# pr3287 # pr3287
/usr/bin/pr3287 %{_bindir}/pr3287
%doc /usr/share/man/man1/pr3287.1.gz %doc %{_mandir}/man1/pr3287.1.gz
%doc --parents pr3287-3.3/html %doc %{_docdir}/%name/pr3287-3.3/html
# s3270 # s3270
/usr/bin/s3270 %{_bindir}/s3270
%doc /usr/share/man/man1/s3270.1.gz %doc %{_mandir}/man1/s3270.1.gz
%doc --parents s3270-3.3/Examples %doc %{_docdir}/%name/s3270-3.3/Examples
%doc --parents s3270-3.3/html %doc %{_docdir}/%name/s3270-3.3/html
# tcl3270 # tcl3270
/usr/bin/tcl3270 %{_bindir}/tcl3270
%doc /usr/share/man/man1/tcl3270.1.gz %doc %{_mandir}/man1/tcl3270.1.gz
%doc --parents tcl3270-3.3/Examples %doc %{_docdir}/%name/tcl3270-3.3/Examples
%doc --parents tcl3270-3.3/html %doc %{_docdir}/%name/tcl3270-3.3/html
# x026 # x026
%{xbindir}/x026 %{_bindir}/x026
%doc %attr(644,root,root) README.SuSE %doc %attr(644,root,root) README.SuSE
%changelog %changelog