From 4c4316436d2ebcdb0eda2a3085821ce332b3d4fb Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 27 Nov 2014 08:16:20 +0000 Subject: [PATCH 1/1] - from PLD --- xinitrc-execute.patch | 11 +++++++++ xinitrc-ng.spec | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 xinitrc-execute.patch create mode 100644 xinitrc-ng.spec diff --git a/xinitrc-execute.patch b/xinitrc-execute.patch new file mode 100644 index 0000000..d7a50ce --- /dev/null +++ b/xinitrc-execute.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..5d74f39 --- /dev/null +++ b/xinitrc-ng.spec @@ -0,0 +1,56 @@ +# TODO +# - slim, entrance, wdm support as XDM +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: 4 +License: GPL +Group: X11 +Source0: %{name}-%{version}.tar.gz +# Source0-md5: f369317256368bf00dd07957929d5a63 +Patch0: xinitrc-execute.patch +URL: http://svn.pld-linux.org/trac/svn/wiki/packages/xinitrc-ng +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 < 3.0 +Obsoletes: xscripts +Conflicts: lightdm < 1.7.12-4 +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +The xinitrc-ng package contains the scripts which are used to start a +window manager and apropriate configuration files. + +%description -l pl.UTF-8 +Pakiet xinitrc-ng zawiera skrypty do uruchomienia zarządcy okien oraz +odpowiednie plik konfiguracyjne. + +%prep +%setup -q +%patch0 -p1 + +%install +rm -rf $RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README +%attr(755,root,root) %{_sysconfdir}/X11/xinit/Xclients +%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc +%attr(755,root,root) %{_sysconfdir}/X11/xinit/prefdm +%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 -- 2.46.0