devel/x3270 x3270.spec,1.26,1.27

[Karsten Hopp (karsten)]

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8774

Modified Files:
	x3270.spec 
Log Message:
- drop chkfontpath dependency (#252274)


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- x3270.spec	8 Aug 2007 15:18:49 -0000	1.26
+++ x3270.spec	21 Aug 2007 09:37:07 -0000	1.27
@@ -1,11 +1,14 @@
 %define desktop_file 1
+%define fontdir %{_datadir}/x3270/fonts
+%define catalogue /etc/X11/fontpath.d
 %if %{desktop_file}
 %define desktop_file_utils_version 0.2.93
 %endif
+
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -36,8 +39,8 @@
 BuildRequires: libXt-devel
 Requires: %{name} = %{version}
 Requires: gtk2 >= 2.6
-Requires(post): /usr/bin/mkfontdir /usr/sbin/chkfontpath
-Requires(postun): /usr/bin/mkfontdir /usr/sbin/chkfontpath
+Requires(post): /usr/bin/mkfontdir
+Requires(postun): /usr/bin/mkfontdir
 
 %package text
 Summary: IBM 3278/3279 terminal emulator for text mode
@@ -83,7 +86,7 @@
 # Fix end of line encodings
 perl -pi -e "s/
//" html/Keymap.html html/Build.html
 libtoolize --copy --force
-%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/fonts/x3270 --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
+%configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
 # Work around broken imake:
 echo 'makedepend "$@"' > gccmakedep
 chmod +x gccmakedep
@@ -107,14 +110,15 @@
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/x3270
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/x3270/fonts
+mkdir -p ${RPM_BUILD_ROOT}%{fontdir}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+mkdir -p ${RPM_BUILD_ROOT}%{catalogue}
 
 # XXX Hack around mkfontdir madness on install.
 install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin
 install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
-install -m644 *pcf.gz $RPM_BUILD_ROOT%{_datadir}/x3270/fonts
+install -m644 *pcf.gz $RPM_BUILD_ROOT%{fontdir}
 install -m644 ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/
 install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
 install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
@@ -129,6 +133,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities
 install -m644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities
 install -m644 X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270
+ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/x3270
 
 %if %{desktop_file}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
@@ -138,7 +143,7 @@
         $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/x3270.desktop
 
 # remove x3270.desktop from the buildroot now that we're done with it
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk
 %endif
 
 
@@ -149,8 +154,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post x11
-cd %{_datadir}/x3270/fonts && %{_prefix}/bin/mkfontdir
-/usr/sbin/chkfontpath -a %{_datadir}/x3270/fonts 2>/dev/null
+cd %{fontdir} && %{_prefix}/bin/mkfontdir
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -158,8 +162,7 @@
 
 %postun x11
 if [ "$1" = "0" ]; then
-  cd %{_datadir}/x3270/fonts && %{_prefix}/bin/mkfontdir
-  /usr/sbin/chkfontpath -r %{_datadir}/x3270/fonts 2>/dev/null
+  cd %{fontdir} && %{_prefix}/bin/mkfontdir
 fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -179,8 +182,9 @@
 %files x11
 %defattr(-,root,root)
 %{_prefix}/bin/x3270
-%dir %{_datadir}/x3270/fonts
-%{_datadir}/x3270/fonts/*
+%dir %{fontdir}
+%{fontdir}/*
+%{catalogue}/x3270
 %{_datadir}/icons/hicolor/48x48/apps/x3270.png
 %{_datadir}/X11/app-defaults/X3270
 %if %{desktop_file}
@@ -195,6 +199,9 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Tue Aug 21 2007 Karsten Hopp <karsten at redhat.com> 3.3.6-2
+- drop chkfontpath dependency (#252274)
+
 * Wed Aug 08 2007 Karsten Hopp <karsten at redhat.com> 3.3.6-1
 - version 3.3.6
 - fix font resize issue