rpms/libdockapp/EL-4 libdockapp.spec,1.3,1.4

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/libdockapp/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30472/EL-4

Modified Files:
	libdockapp.spec 
Log Message:
sync with devel and adapt to EL


Index: libdockapp.spec
===================================================================
RCS file: /cvs/extras/rpms/libdockapp/EL-4/libdockapp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libdockapp.spec	30 Sep 2007 13:26:32 -0000	1.3
+++ libdockapp.spec	27 Dec 2007 08:19:19 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           libdockapp
 Version:        0.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        DockApp Development Standard Library
 
 Group:          System Environment/Libraries
@@ -16,7 +16,7 @@
 Patch1:         dockapp-0.6.1-ppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libXpm-devel libXext-devel libX11-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 LibDockApp is a library that provides a framework for developing dockapps. 
@@ -33,8 +33,7 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libXpm-devel
-Requires:       libX11-devel
+Requires:       xorg-x11-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -44,6 +43,8 @@
 %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.
@@ -64,14 +65,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT XFONTDIR=$RPM_BUILD_ROOT%{_x11fontdir}
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT XFONTDIR=$RPM_BUILD_ROOT%{_x11fontdir} \
+   INSTALL='install -p'
+rm $RPM_BUILD_ROOT%{_libdir}/libdockapp.la
 # fonts.alias is empty, so unusefull.
 rm $RPM_BUILD_ROOT%{_x11fontdir}/dockapp/fonts.alias
 
-rm -rf examples-devel
-cp -a examples examples-devel
-rm examples-devel/Makefile*
+rm -rf __examples_dist
+cp -a examples __examples_dist
+rm __examples_dist/Makefile*
 
 mkdir -p $RPM_BUILD_ROOT%{catalogue}
 ln -sf %{_x11fontdir}/dockapp $RPM_BUILD_ROOT%{catalogue}/dockapp
@@ -83,6 +85,8 @@
 %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,6 +98,7 @@
   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
@@ -103,17 +108,21 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples-devel/*
+%doc __examples_dist/*
 %{_includedir}/*
 %{_libdir}/*.so
 
 %files fonts
+%defattr(-,root,root,-)
 # there is no obvious package to depend on that owns %{_datadir}/X11/fonts/
 %{_x11fontdir}/
 #%{_x11fontdir}/dockapp/
 %{catalogue}/dockapp
 
 %changelog
+* Thu Dec 27 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-5
+- minor cleanups
+
 * Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
 - new fontpath.d configuraton mechanism, change by ajax, Adam Jackson