Accepting request 130082 from home:pgajdos

- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536)

OBS-URL: https://build.opensuse.org/request/show/130082
OBS-URL: https://build.opensuse.org/package/show/Base:System/x3270?expand=0&rev=16
This commit is contained in:
Marcus Meissner 2012-08-06 12:29:59 +00:00 committed by Git OBS Bridge
parent 585a733e15
commit dcfb586da7
2 changed files with 12 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 6 11:30:49 UTC 2012 - pgajdos@suse.com
- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 21 10:52:31 UTC 2011 - coolo@suse.com Wed Dec 21 10:52:31 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package x3270 # spec file for package x3270
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,10 +18,10 @@
Name: x3270 Name: x3270
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: fontpackages-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: xorg-x11 BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
%define fontdir /usr/share/fonts/misc
%define appdefdir /usr/share/X11 %define appdefdir /usr/share/X11
%define xbindir /usr/bin %define xbindir /usr/bin
%define xmandir /usr/share/man %define xmandir /usr/share/man
@ -126,7 +126,7 @@ cd x3270-3.3
--x-libraries=%{xlibraries} \ --x-libraries=%{xlibraries} \
--mandir=%{xmandir} \ --mandir=%{xmandir} \
--with-all-xinstall \ --with-all-xinstall \
--with-fontdir=%{fontdir} \ --with-fontdir=%{_miscfontsdir} \
--enable-ssl --enable-ssl
xmkmf -a xmkmf -a
make depend make depend
@ -184,7 +184,7 @@ cd x3270-3.3
make DESTDIR=$RPM_BUILD_ROOT LIBX3270DIR=${LIBX3270DIR} install.man make DESTDIR=$RPM_BUILD_ROOT 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%{fontdir}/fonts.dir rm $RPM_BUILD_ROOT%{_miscfontsdir}/fonts.dir
install -d -m 755 \ install -d -m 755 \
$RPM_BUILD_ROOT%{appdefdir}/app-defaults $RPM_BUILD_ROOT%{appdefdir}/app-defaults
install -m 644 X3270.xad \ install -m 644 X3270.xad \
@ -227,11 +227,7 @@ rm -rf $RPM_BUILD_ROOT/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 $RPM_BUILD_ROOT/usr/share/man/man{1,5}/*
%post %reconfigure_fonts_scriptlets
%run_suseconfig_fonts
%postun
%run_suseconfig_fonts
%clean %clean
#${RPM_BUILD_ROOT:+rm -rf $RPM_BUILD_ROOT} #${RPM_BUILD_ROOT:+rm -rf $RPM_BUILD_ROOT}
@ -248,8 +244,8 @@ chmod ugo-x $RPM_BUILD_ROOT/usr/share/man/man{1,5}/*
# x3270 # x3270
%{xbindir}/x3270 %{xbindir}/x3270
%{appdefdir}/app-defaults/X3270 %{appdefdir}/app-defaults/X3270
%dir %{fontdir} %dir %{_miscfontsdir}
%{fontdir}/* %{_miscfontsdir}/*
%doc %{xmandir}/man1/x3270.1x.gz %doc %{xmandir}/man1/x3270.1x.gz
%doc --parents x3270-3.3/Examples %doc --parents x3270-3.3/Examples
%doc --parents x3270-3.3/html %doc --parents x3270-3.3/html