From e76cbc453c58d5ca3b55748aab92c7b728517ad8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 15 Sep 2013 19:06:49 +0200 Subject: [PATCH] - updated to 207 - TODO: update files, add symlink for /etc/sysctl.conf (see NEWS) --- hwdb-dell-keyboard.patch | 52 ---------------------------------------- systemd.spec | 9 +++---- tmpfiles-not-fatal.patch | 4 ++-- 3 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 hwdb-dell-keyboard.patch diff --git a/hwdb-dell-keyboard.patch b/hwdb-dell-keyboard.patch deleted file mode 100644 index f848444..0000000 --- a/hwdb-dell-keyboard.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- systemd-206/hwdb/60-keyboard.hwdb~ 2013-07-22 00:43:28.000000000 +0200 -+++ systemd-206/hwdb/60-keyboard.hwdb 2013-08-14 17:51:44.495023553 +0200 -@@ -191,7 +191,7 @@ - # Dell - ########################################################### - --keyboard:dmi:bvn*:bvr*:bd*:svnDell:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pvr* - KEYBOARD_KEY_81=playpause # Play/Pause - KEYBOARD_KEY_82=stopcd # Stop - KEYBOARD_KEY_83=previoussong # Previous song -@@ -223,31 +223,31 @@ - KEYBOARD_KEY_d9=f21 # Touchpad toggle - - # --keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 910:pvr* --keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 101[012]:pvr* --keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1110:pvr* --keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1210:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 910:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 101[012]:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 1110:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 1210:pvr* - KEYBOARD_KEY_84=wlan - - # Latitude XT2 --keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnLatitude XT2:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude XT2:pvr* - KEYBOARD_KEY_9b=up # tablet rocker up - KEYBOARD_KEY_9e=enter # tablet rocker press - KEYBOARD_KEY_9f=back # tablet back - KEYBOARD_KEY_a3=down # tablet rocker down - --keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnStudio 155[78]:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnStudio 155[78]:pvr* - KEYBOARD_KEY_a0=! # mute - KEYBOARD_KEY_ae=! # volume down - KEYBOARD_KEY_b0=! # volume up - - # Dell Touchpad --keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Latitude*:pvr* --keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Precision*:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pn:*Latitude*:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pn:*Precision*:pvr* - KEYBOARD_KEY_9e=! - - # Dell XPS --keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnXPS*:pvr* -+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr* - KEYBOARD_KEY_8c=! - - ########################################################### diff --git a/systemd.spec b/systemd.spec index 082d865..97f294b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -15,13 +15,13 @@ Summary: A System and Service Manager Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa Name: systemd # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often) -Version: 206 -Release: 8 +Version: 207 +Release: 0.1 Epoch: 1 License: GPL v2+ (udev), LGPL v2.1+ (the rest) Group: Base Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz -# Source0-md5: 89e36f2d3ba963020b72738549954cbc +# Source0-md5: 7799f3cc9d289b8db1c1fa56ae7ecd88 Source1: %{name}-sysv-convert Source2: %{name}_booted.c Source3: network.service @@ -58,7 +58,6 @@ Patch9: udevadm-in-sbin.patch Patch10: net-rename-revert.patch Patch11: nss-in-rootlib.patch Patch12: proc-hidepid.patch -Patch13: hwdb-dell-keyboard.patch Patch14: dont-hash-null-keys.patch URL: http://www.freedesktop.org/wiki/Software/systemd BuildRequires: acl-devel @@ -565,7 +564,6 @@ Wiązania do Systemd dla Pythona. %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 -p1 # possible cause of infinite loop inside systemd-login #patch14 -p1 cp -p %{SOURCE2} src/systemd_booted.c @@ -994,7 +992,6 @@ fi %attr(755,root,root) /lib/systemd/systemd-sleep %attr(755,root,root) /lib/systemd/systemd-sysctl %attr(755,root,root) /lib/systemd/systemd-timedated -%attr(755,root,root) /lib/systemd/systemd-timestamp %attr(755,root,root) /lib/systemd/systemd-udevd %attr(755,root,root) /lib/systemd/systemd-update-utmp %attr(755,root,root) /lib/systemd/systemd-user-sessions diff --git a/tmpfiles-not-fatal.patch b/tmpfiles-not-fatal.patch index d594d02..f38a879 100644 --- a/tmpfiles-not-fatal.patch +++ b/tmpfiles-not-fatal.patch @@ -4,8 +4,8 @@ [Service] Type=oneshot RemainAfterExit=yes --ExecStart=@rootbindir@/systemd-tmpfiles --create --remove -+ExecStart=-@rootbindir@/systemd-tmpfiles --create --remove +-ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --exclude-prefix=/dev ++ExecStart=-@rootbindir@/systemd-tmpfiles --create --remove --exclude-prefix=/dev --- systemd-39/units/systemd-tmpfiles-clean.service.in~ 2011-12-30 22:27:36.520529020 +0100 +++ systemd-39/units/systemd-tmpfiles-clean.service.in 2012-01-29 22:56:15.626015474 +0100 @@ -18,5 +18,5 @@ -- 2.44.0