SPECS: xinitrc-ng.spec - unified

[qboosh]

Author: qboosh                       Date: Sat Oct 14 21:43:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   xinitrc-ng.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/xinitrc-ng.spec
diff -u SPECS/xinitrc-ng.spec:1.18 SPECS/xinitrc-ng.spec:1.19
--- SPECS/xinitrc-ng.spec:1.18	Wed Aug 23 20:43:52 2006
+++ SPECS/xinitrc-ng.spec	Sat Oct 14 23:42:55 2006
@@ -11,9 +11,9 @@
 Requires:	/bin/sh
 Requires:	xorg-app-twm
 Requires:	which
-Obsoletes:	xscripts
-Obsoletes:	xinitrc
 Provides:	xinitrc >= 3.0
+Obsoletes:	xinitrc
+Obsoletes:	xscripts
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,8 +33,8 @@
 install -d $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,sysconfig,wmstyle}
 install -d $RPM_BUILD_ROOT%{_datadir}/xsessions
 
-install Xclients Xmodmap xinitdefs xinitrc $RPM_BUILD_ROOT/etc/X11/xinit/
-install desktop $RPM_BUILD_ROOT/etc/sysconfig/
+install Xclients Xmodmap xinitdefs xinitrc $RPM_BUILD_ROOT/etc/X11/xinit
+install desktop $RPM_BUILD_ROOT/etc/sysconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,6 +54,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/10/14 21:42:55  qboosh
+- unified
+
 Revision 1.18  2006/08/23 18:43:52  havner
 - /etc/sysconfig/wmstyle and /usr/share/xsessions only moved to
   filesystem.spec as it already contains xinitrc related dirs
@@ -110,4 +113,3 @@
 
 Revision 1.1  2003/09/28 20:41:35  adgor
 - Initial
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xinitrc-ng.spec?r1=1.18&r2=1.19&f=u