- removed nss-myhostname-link.patch (fixed upstream)

- fix dell vendor identifiers in keyboard hwdb database
- rel 4

diff --git a/hwdb-dell-keyboard.patch b/hwdb-dell-keyboard.patch
new file mode 100644 (file)
index 0000000..f848444
--- /dev/null
+++ b/hwdb-dell-keyboard.patch
@@ -0,0 +1,52 @@
+--- 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/nss-myhostname-link.patch b/nss-myhostname-link.patch
deleted file mode 100644 (file)
index 81c6042..0000000
--- a/nss-myhostname-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- systemd-202/Makefile.am~   2013-04-19 21:51:50.816971656 +0200
-+++ systemd-202/Makefile.am    2013-04-19 22:04:20.667803944 +0200
-@@ -3435,6 +3435,9 @@
-       -shared \
-       -shrext .so.2
- 
-+libnss_myhostname_la_LIBADD = \
-+      libsystemd-shared.la
-+
- rootlib_LTLIBRARIES = \
-       libnss_myhostname.la
- endif

diff --git a/systemd.spec b/systemd.spec
index 4c90a82f9c8c8a1095b362192066c6139f5438a4..b4488f65f8d69df538c19e874652b14ab42bf810 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@ 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:       3
+Release:       4
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
@@ -58,7 +58,7 @@ Patch9:               udevadm-in-sbin.patch
 Patch10:       net-rename-revert.patch
 Patch11:       nss-in-rootlib.patch
 Patch12:       proc-hidepid.patch
-Patch13:       nss-myhostname-link.patch
+Patch13:       hwdb-dell-keyboard.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -559,7 +559,7 @@ Wiązania do Systemd dla Pythona.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-#patch13 -p1
+%patch13 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build