- updated to 185

- removed unknown configure options

Changed files:
    kmsg-to-syslog.patch -> 1.3
    systemd-udev-service.patch -> 1.2
    systemd.spec -> 1.181
    udevlibexecdir.patch -> 1.5

diff --git a/kmsg-to-syslog.patch b/kmsg-to-syslog.patch
index e17d5add448454cb65227a9d99effd7a35ebd044..a910871b3380ba431dae060ef015aef387cf4f17 100644 (file)
--- a/kmsg-to-syslog.patch
+++ b/kmsg-to-syslog.patch
@@ -1,8 +1,11 @@
 --- systemd-44/src/journal/journald.conf~      2012-03-15 23:13:15.000000000 +0100
 +++ systemd-44/src/journal/journald.conf       2012-04-23 08:17:08.660433320 +0200
-@@ -22,4 +22,4 @@
+@@ -22,7 +22,7 @@
  #ForwardToSyslog=yes
  #ForwardToKMsg=no
  #ForwardToConsole=no
 -#ImportKernel=yes
 +ImportKernel=no
+ #TTYPath=/dev/console
+ #MaxLevelStore=debug
+ #MaxLevelSyslog=debug

diff --git a/systemd-udev-service.patch b/systemd-udev-service.patch
index 9ebc645cbf7da7b066eb5a50db8d71f9682ed18c..d5ec47a66e6d5a85298b09df3ad744bbae73278a 100644 (file)
--- a/systemd-udev-service.patch
+++ b/systemd-udev-service.patch
@@ -9,14 +9,3 @@
  Before=basic.target
  ConditionCapability=CAP_MKNOD
  
---- systemd-183/units/plymouth-start.service~  2012-04-12 00:24:39.579670098 +0200
-+++ systemd-183/units/plymouth-start.service   2012-05-30 13:28:23.779566612 +0200
-@@ -9,7 +9,7 @@
- Description=Show Plymouth Boot Screen
- DefaultDependencies=no
- Wants=systemd-ask-password-plymouth.path
--After=systemd-vconsole-setup.service udev-settle.service
-+After=systemd-vconsole-setup.service systemd-udev-settle.service
- Before=systemd-ask-password-plymouth.service
- 
- # Dracut informs us with this flag file if plymouth is already running

diff --git a/systemd.spec b/systemd.spec
index 830e7941e05364454f4fcb0d18814556bcf7e56e..60cc069a67e9e9a5d89d5c932c105984eff5c0f2 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -38,13 +38,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:       183
-Release:       1
+Version:       185
+Release:       0.1
 Epoch:         1
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: e1e5e0f376fa2a4cb4bc31a2161c09f2
+# Source0-md5: a7dbbf05986eb0d2c164ec8e570eb78f
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -553,8 +553,6 @@ initrd.
 %patch12 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
-%{__mv} src/udev/keymap/keyboard-force-release.sh{,.in}
-
 %build
 %{__gtkdocize}
 %{__libtoolize}
@@ -578,19 +576,15 @@ patch -p1 <%{PATCH10}
        --with-distro=pld \
        --with-rootprefix="" \
        --with-rootlibdir=/%{_lib} \
-       --disable-rule_generator \
        --disable-gudev \
        --disable-keymap \
        --disable-gtk-doc \
        --disable-introspection \
-       --disable-logging \
        --with-pci-ids-path=%{_sysconfdir}/pci.ids \
        --disable-audit \
-       --disable-cryptsetup \
        --disable-pam \
        --disable-plymouth \
        --disable-selinux \
-       --disable-tcpd \
        --enable-split-usr
 
 %{__make} \
@@ -1036,6 +1030,16 @@ fi
 %{_mandir}/man7/sd-readahead.7*
 %{_mandir}/man7/systemd.special.7*
 %{_mandir}/man7/systemd.journal-fields.7*
+%{_mandir}/man8/systemd-binfmt.8*
+%{_mandir}/man8/systemd-binfmt.service.8*
+%{_mandir}/man8/systemd-journald.8*
+%{_mandir}/man8/systemd-journald.service.8*
+%{_mandir}/man8/systemd-logind.8*
+%{_mandir}/man8/systemd-logind.service.8*
+%{_mandir}/man8/systemd-modules-load.8*
+%{_mandir}/man8/systemd-modules-load.service.8*
+%{_mandir}/man8/systemd-sysctl.8*
+%{_mandir}/man8/systemd-sysctl.service.8*
 %{_mandir}/man8/systemd-udevd.8*
 %dir /var/lib/%{name}
 %dir /var/lib/%{name}/coredump
@@ -1285,6 +1289,7 @@ fi
 /lib/udev/rules.d/60-persistent-storage.rules
 /lib/udev/rules.d/60-persistent-v4l.rules
 /lib/udev/rules.d/61-accelerometer.rules
+/lib/udev/rules.d/70-power-switch.rules
 /lib/udev/rules.d/75-net-description.rules
 /lib/udev/rules.d/75-probe_mtd.rules
 /lib/udev/rules.d/75-tty-description.rules

diff --git a/udevlibexecdir.patch b/udevlibexecdir.patch
index 5dcbbf8ac90a71bfba3743fe4448aadb20d30286..3bf6762971304f9b7fb503e3a7338e93eb196f2b 100644 (file)
--- a/udevlibexecdir.patch
+++ b/udevlibexecdir.patch
@@ -29,16 +29,6 @@
  
  INSTALL_DATA_HOOKS += udev-confdirs
  
-@@ -1906,7 +1906,8 @@
-       src/udev/keymap/check-keymaps.sh
- 
- EXTRA_DIST += \
--      src/udev/keymap/check-keymaps.sh
-+      src/udev/keymap/check-keymaps.sh \
-+      src/udev/keymap/keyboard-force-release.sh.in
- 
- CLEANFILES += \
-       $(nodist_keymap_SOURCES) \
 @@ -1913,7 +1913,7 @@
        src/udev/keymap/keys.txt \
        src/udev/keymap/keys-from-name.gperf
@@ -66,22 +56,3 @@
                < $< > $@ || rm $@
  
  units/%: units/%.in Makefile
---- systemd-183/src/udev/keymap/keyboard-force-release.sh~     2012-04-10 22:32:29.934866904 +0200
-+++ systemd-183/src/udev/keymap/keyboard-force-release.sh      2012-05-29 12:52:33.283726546 +0200
-@@ -6,7 +6,7 @@
- 
- case "$2" in
-         /*) scf="$2" ;;
--        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
-+        *)  scf="@udevlibexecdir@/keymaps/force-release/$2" ;;
- esac
- 
- read attr <"/sys/$1/force_release"
---- systemd-183/src/udev/udev.pc.in~   2012-04-05 17:49:14.329482586 +0200
-+++ systemd-183/src/udev/udev.pc.in    2012-05-31 12:38:37.835904467 +0200
-@@ -2,4 +2,4 @@
- Description: udev
- Version: @VERSION@
- 
--udevdir=@pkglibexecdir@
-+udevdir=@udevlibexecdir@