SPECS: xorg-app-xinit.spec - xinitdir patch - dont pack default xi...

[havner]

Author: havner                       Date: Wed Aug 23 12:13:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- xinitdir patch
- dont pack default xinitrc, require external one instead
- rel 0.2

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

---- Diffs:

================================================================
Index: SPECS/xorg-app-xinit.spec
diff -u SPECS/xorg-app-xinit.spec:1.11 SPECS/xorg-app-xinit.spec:1.12
--- SPECS/xorg-app-xinit.spec:1.11	Sun Apr  2 11:29:57 2006
+++ SPECS/xorg-app-xinit.spec	Wed Aug 23 14:13:08 2006
@@ -7,19 +7,22 @@
 Summary(pl):	Aplikacja xinit
 Name:		xorg-app-xinit
 Version:	1.0.2
-Release:	0.1
+Release:	0.2
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.bz2
 # Source0-md5:	d591fafe69b57969b0521c461073a01f
 Patch0:		%{name}-xwrapper.patch
+Patch1:		%{name}-xinitdir.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	cpp
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-proto-inputproto-devel
 BuildRequires:	xorg-util-util-macros >= 0.99.2
+Requires:	/etc/X11/xinit/xinitrc
 Requires:	xorg-app-xauth
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,6 +35,7 @@
 %prep
 %setup -q -n xinit-%{version}
 %patch0 -p0
+%patch1 -p1
 
 %build
 %{__aclocal}
@@ -48,6 +52,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# this is supposed to be provided by xinitrc*
+rm -rf $RPM_BUILD_ROOT/etc/X11/xinit
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -55,7 +62,6 @@
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/X11/xinit
 %{_mandir}/man1/*.1x*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -64,6 +70,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/08/23 12:13:08  havner
+- xinitdir patch
+- dont pack default xinitrc, require external one instead
+- rel 0.2
+
 Revision 1.11  2006/04/02 09:29:57  arekm
 - up to 1.0.2
 
================================================================

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