SPECS: xorg-app-xfs.spec - changed config dir to /etc/X11/fs - mer...

[qboosh]

Author: qboosh                       Date: Fri Feb  3 14:53:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- changed config dir to /etc/X11/fs
- merged xfs.{config,init,sysconfig} files from monolith

---- Files affected:
SPECS:
   xorg-app-xfs.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/xorg-app-xfs.spec
diff -u SPECS/xorg-app-xfs.spec:1.11 SPECS/xorg-app-xfs.spec:1.12
--- SPECS/xorg-app-xfs.spec:1.11	Thu Jan 12 15:47:59 2006
+++ SPECS/xorg-app-xfs.spec	Fri Feb  3 15:53:05 2006
@@ -10,6 +10,9 @@
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfs-%{version}.tar.bz2
 # Source0-md5:	8ed805113037e86ad01068d0b464a062
+Source1:	xfs.config
+Source2:	xfs.init
+Source3:	xfs.sysconfig
 Patch0:		xorg-xfs-freebsd.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
@@ -57,13 +60,19 @@
 %{__automake}
 %configure
 
-%{__make}
+%{__make} \
+	configdir=%{_sysconfdir}/X11/fs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	configdir=%{_sysconfdir}/X11/fs
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
+install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
+install -D %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/xfs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,7 +81,10 @@
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/X11/fs/config
+%dir %{_sysconfdir}/X11/fs
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/fs/config
+%attr(754,root,root) /etc/rc.d/init.d/xfs
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xfs
 %{_mandir}/man1/*.1x*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -81,6 +93,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/02/03 14:53:05  qboosh
+- changed config dir to /etc/X11/fs
+- merged xfs.{config,init,sysconfig} files from monolith
+
 Revision 1.11  2006/01/12 14:47:59  qboosh
 - 1.0.1 (X11R7.0 release)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.11&r2=1.12&f=u