rpms/libdockapp/devel libdockapp.spec,1.2,1.3

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/libdockapp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8342

Modified Files:
	libdockapp.spec 
Log Message:
* Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
- new fontpath.d configuraton mechanism, change by ajax, Adam Jackson



Index: libdockapp.spec
===================================================================
RCS file: /cvs/extras/rpms/libdockapp/devel/libdockapp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdockapp.spec	24 May 2007 08:13:29 -0000	1.2
+++ libdockapp.spec	30 Sep 2007 13:26:32 -0000	1.3
@@ -1,8 +1,9 @@
 %define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
 
 Name:           libdockapp
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DockApp Development Standard Library
 
 Group:          System Environment/Libraries
@@ -43,8 +44,6 @@
 %package        fonts
 Summary:        Fonts provided with %{name}
 Group:          User Interface/X
-Requires(post):   chkfontpath
-Requires(postun): chkfontpath
 
 %description fonts
 Bitmap X fonts provided with libdockapp.
@@ -74,6 +73,9 @@
 cp -a examples examples-devel
 rm examples-devel/Makefile*
 
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_x11fontdir}/dockapp $RPM_BUILD_ROOT%{catalogue}/dockapp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,8 +83,6 @@
 %post -p /sbin/ldconfig
 
 %post fonts
-/usr/sbin/chkfontpath -qa %{_datadir}/X11/fonts/dockapp
-
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache %{_datadir}/X11/fonts
 fi
@@ -94,7 +94,6 @@
   if [ -x /usr/bin/fc-cache ]; then
     /usr/bin/fc-cache %{_datadir}/X11/fonts
   fi
-  /usr/sbin/chkfontpath -qr %{_datadir}/X11/fonts/dockapp
 fi
 
 %files
@@ -112,8 +111,12 @@
 # there is no obvious package to depend on that owns %{_datadir}/X11/fonts/
 %{_x11fontdir}/
 #%{_x11fontdir}/dockapp/
+%{catalogue}/dockapp
 
 %changelog
+* Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
+- new fontpath.d configuraton mechanism, change by ajax, Adam Jackson
+
 * Thu May 24 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-3
 - fix libtool bug on ppc64