SPECS: xorg-app-rstart.spec - added configdir patch, put configs i...

[qboosh]

Author: qboosh                       Date: Sun Oct 15 13:28:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added configdir patch, put configs in /etc/X11/rstart (following X11-fhs.patch)
- added install patch to fix alias symlinks creation
- added used xorg apps to Requires
- release 1

---- Files affected:
SPECS:
   xorg-app-rstart.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/xorg-app-rstart.spec
diff -u SPECS/xorg-app-rstart.spec:1.10 SPECS/xorg-app-rstart.spec:1.11
--- SPECS/xorg-app-rstart.spec:1.10	Thu Apr 27 08:23:25 2006
+++ SPECS/xorg-app-rstart.spec	Sun Oct 15 15:28:08 2006
@@ -3,11 +3,13 @@
 Summary(pl):	Aplikacja rstart
 Name:		xorg-app-rstart
 Version:	1.0.2
-Release:	0.1
+Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/rstart-%{version}.tar.bz2
 # Source0-md5:	99aea04a27197056368a4431f30f9cdb
+Patch0:		%{name}-configdir.patch
+Patch1:		%{name}-install.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -15,6 +17,14 @@
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-util-util-macros >= 0.99.2
+# contexts/x11r6
+Requires:	xorg-app-iceauth
+# contexts/x11r6, rstart client
+Requires:	xorg-app-xauth
+# commands/x11r6/LoadMonitor
+Requires:	xorg-app-xload
+# commands/x11r6/Terminal
+Requires:	xterm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,21 +35,29 @@
 
 %prep
 %setup -q -n rstart-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	RSH=/usr/bin/rsh \
+	--with-default-man-path="/usr/share/man:/usr/local/man" \
+	--with-default-user-path="/usr/local/bin:/usr/bin:/bin"
 
-%{__make}
+%{__make} \
+	configdir=/etc/X11/rstart
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	configdir=/etc/X11/rstart \
+	DATA_DIR=/etc/X11/rstart
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,13 +65,30 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/rstart
+%attr(755,root,root) %{_bindir}/rstartd
 %dir %{_libdir}/X11/rstart
-%{_libdir}/X11/rstart/commands
-%{_libdir}/X11/rstart/config
-%{_libdir}/X11/rstart/contexts
 %attr(755,root,root) %{_libdir}/X11/rstart/rstartd.real
-%{_mandir}/man1/*.1x*
+%dir /etc/X11/rstart
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/config
+%dir /etc/X11/rstart/commands
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/commands/@List
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/commands/ListContexts
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/commands/ListGenericCommands
+%dir /etc/X11/rstart/commands/x11r6
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/commands/x11r6/@List
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/commands/x11r6/LoadMonitor
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/commands/x11r6/Terminal
+%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/commands/x11
+%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/commands/x
+%dir /etc/X11/rstart/contexts
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/contexts/@List
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/contexts/default
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/contexts/x11r6
+%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/contexts/x11
+%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/contexts/x
+%{_mandir}/man1/rstart.1x*
+%{_mandir}/man1/rstartd.1x*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -61,6 +96,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/10/15 13:28:08  qboosh
+- added configdir patch, put configs in /etc/X11/rstart (following X11-fhs.patch)
+- added install patch to fix alias symlinks creation
+- added used xorg apps to Requires
+- release 1
+
 Revision 1.10  2006/04/27 06:23:25  arekm
 - up to 1.0.2
 
================================================================

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