- merged 1.2 from PLD

diff --git a/xinitrc-execute.patch b/xinitrc-execute.patch
deleted file mode 100644 (file)
index d7a50ce..0000000
--- a/xinitrc-execute.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xinitrc-ng-1.1/xinitrc~    2011-07-27 23:59:12.000000000 +0300
-+++ xinitrc-ng-1.1/xinitrc     2014-06-06 01:33:19.861745454 +0300
-@@ -3,7 +3,7 @@
- # Call standard xinit actions
- . /etc/X11/xinit/xinitdefs
- 
--if [ -f $HOME/.Xclients ]; then
-+if [ -x $HOME/.Xclients ]; then
-       exec $HOME/.Xclients "$@"
- else
-       exec /etc/X11/xinit/Xclients "$@"

diff --git a/xinitrc-ng.spec b/xinitrc-ng.spec
index 5b720f8c7e30b8b771a8402d5e872ca0c08544b6..5d789a62b5e2eb0387001f6557c1a0e255b1cd5a 100644 (file)
--- a/xinitrc-ng.spec
+++ b/xinitrc-ng.spec
@@ -3,14 +3,13 @@
 Summary:       The default startup scripts for the X Window System
 Summary(pl.UTF-8):     Domyślne skrypty startowe X Window System
 Name:          xinitrc-ng
 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:       1.1
-Release:       6
+Version:       1.2
+Release:       1

 License:       GPL
 Group:         X11
 Source0:       %{name}-%{version}.tar.gz
 License:       GPL
 Group:         X11
 Source0:       %{name}-%{version}.tar.gz

-# Source0-md5: f369317256368bf00dd07957929d5a63
-Patch0:                xinitrc-execute.patch
-Patch1:                tld.patch
+# Source0-md5: c64bf54a56bb7cabaf4568e7ae315517
+Patch0:                tld.patch

 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/xinitrc-ng
 Requires:      /bin/sh
 Requires:      which
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/xinitrc-ng
 Requires:      /bin/sh
 Requires:      which


@@ -35,8 +34,7 @@ odpowiednie plik konfiguracyjne.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
-%patch1 -p1
+%patch -P0 -p1

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT