Author: baggins                      Date: Thu Jul 28 16:20:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.9
- profile patch applied upstream
- updated R

---- Files affected:
packages/xinitrc-ng:
   xinitrc-ng.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/xinitrc-ng/xinitrc-ng.spec
diff -u packages/xinitrc-ng/xinitrc-ng.spec:1.25 
packages/xinitrc-ng/xinitrc-ng.spec:1.26
--- packages/xinitrc-ng/xinitrc-ng.spec:1.25    Wed Feb 23 14:24:28 2011
+++ packages/xinitrc-ng/xinitrc-ng.spec Thu Jul 28 18:20:12 2011
@@ -2,17 +2,18 @@
 Summary:       The default startup scripts for the X Window System
 Summary(pl.UTF-8):     Domyślne skrypty startowe X Window System
 Name:          xinitrc-ng
-Version:       0.8
-Release:       9
+Version:       0.9
+Release:       1
 License:       GPL
 Group:         X11
-Source0:       
ftp://ftp.pld-linux.org/software/xinitrc-ng/%{name}-%{version}.tar.bz2
-# Source0-md5: 30760456eb96b5dea9fadcb7075e90f3
-Patch0:                %{name}-profile.patch
+Source0:       %{name}-%{version}.tar.gz
+# Source0-md5: 6c63c305529d783f9603e662bf451edb
 Requires:      /bin/sh
 Requires:      which
+Requires:      xorg-app-setxkbmap
 Requires:      xorg-app-twm
 Requires:      xorg-app-xmodmap
+Requires:      xorg-app-xrdb
 Provides:      xinitrc >= 3.0
 Obsoletes:     xinitrc
 Obsoletes:     xscripts
@@ -29,15 +30,12 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-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
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +46,7 @@
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/X11/xinit/Xclients
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/X11/xinit/xinitrc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xinit/Xmodmap
+%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/X11/xinit/Xresources
 %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/X11/xinit/xinitdefs
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/desktop
 
@@ -57,6 +56,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2011/07/28 16:20:12  baggins
+- up to 0.9
+- profile patch applied upstream
+- updated R
+
 Revision 1.25  2011/02/23 13:24:28  baggins
 - rel 9
 - load /etc/profile on session startup (needed for example if someone
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xinitrc-ng/xinitrc-ng.spec?r1=1.25&r2=1.26&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to