- updated to 199

- removed obsolete systemctl-path patch

diff --git a/systemctl-path.patch b/systemctl-path.patch
deleted file mode 100644 (file)
index 9edacd9..0000000
--- a/systemctl-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- systemd-198/units/initrd-cleanup.service~  2013-03-07 13:07:09.946850823 +0100
-+++ systemd-198/units/initrd-cleanup.service   2013-03-21 14:50:00.400052081 +0100
-@@ -15,4 +15,4 @@
- 
- [Service]
- Type=oneshot
--ExecStart=/usr/bin/systemctl --no-block isolate initrd-switch-root.target
-+ExecStart=@SYSTEMCTL@ --no-block isolate initrd-switch-root.target
---- systemd-198/units/initrd-parse-etc.service~        2013-03-07 13:07:09.946850823 +0100
-+++ systemd-198/units/initrd-parse-etc.service 2013-03-21 14:50:59.820556209 +0100
-@@ -15,6 +15,6 @@
- 
- [Service]
- Type=oneshot
--ExecStartPre=/usr/bin/systemctl daemon-reload
--ExecStart=/usr/bin/systemctl start local-fs.target
--ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service
-+ExecStartPre=@SYSTEMCTL@ daemon-reload
-+ExecStart=@SYSTEMCTL@ start local-fs.target
-+ExecStart=@SYSTEMCTL@ --no-block start initrd-cleanup.service
---- systemd-198/units/initrd-switch-root.service~      2013-03-05 00:43:05.950383752 +0100
-+++ systemd-198/units/initrd-switch-root.service       2013-03-21 14:51:14.987351504 +0100
-@@ -15,5 +15,5 @@
- [Service]
- Type=oneshot
- # we have to use "--force" here, otherwise systemd would umount /run
--ExecStart=/usr/bin/systemctl --no-block --force switch-root /sysroot
-+ExecStart=@SYSTEMCTL@ --no-block --force switch-root /sysroot
- KillMode=none

diff --git a/systemd.spec b/systemd.spec
index a9458b83829639310174c38954c6eec8aeb097f2..760fc8c8ec3148cf314a77931c78aef63fe8d74d 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -14,13 +14,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:       198
-Release:       6
+Version:       199
+Release:       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: 26a75e2a310f8c1c1ea9ec26ddb171c5
+# Source0-md5: 4bb13f84ce211e93f0141774a90a2322
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -56,8 +56,7 @@ Patch8:               udev-ploop-rules.patch
 Patch9:                udevadm-in-sbin.patch
 Patch10:       net-rename-revert.patch
 Patch11:       nss-in-rootlib.patch
-Patch12:       systemctl-path.patch
-Patch13:       proc-hidepid.patch
+Patch12:       proc-hidepid.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -570,13 +569,8 @@ Wiązania do Systemd dla Pythona.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
-%{__mv} units/initrd-cleanup.service{,.in}
-%{__mv} units/initrd-parse-etc.service{,.in}
-%{__mv} units/initrd-switch-root.service{,.in}
-
 %build
 %{__gtkdocize}
 %{__libtoolize}
@@ -632,8 +626,8 @@ ln -s /lib/udev/udevd $RPM_BUILD_ROOT/lib/systemd/systemd-udevd
 ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_sbindir}/udevd
 
 # compat symlinks for "/ merged into /usr" programs
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/udevadm
-ln -s %{_sbindir}/udevadm $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT/{,s}bin/udevadm
+ln -s %{_sbindir}/udevadm $RPM_BUILD_ROOT/bin
 ln -s /lib/udev $RPM_BUILD_ROOT/usr/lib/
 
 # install custom udev rules from pld package
@@ -726,7 +720,7 @@ cp -p %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/prefdm.service
 #      - halt,kexec,poweroff,reboot: generic ones used by ConsoleKit-systemd,
 #      - syslog _might_ be used by some syslog implementation (none for now),
 #      - isn't dbus populated by dbus-systemd only (so to be moved there)?
-install -d $RPM_BUILD_ROOT%{systemdunitdir}/{dbus,halt,kexec,poweroff,reboot,syslog}.target.wants
+install -d $RPM_BUILD_ROOT%{systemdunitdir}/{basic,dbus,halt,kexec,poweroff,reboot,syslog}.target.wants
 
 # Create new-style configuration files so that we can ghost-own them
 touch $RPM_BUILD_ROOT%{_sysconfdir}/{hostname,locale.conf,machine-id,machine-info,timezone,vconsole.conf}
@@ -1131,7 +1125,8 @@ fi
 %dir %{_libexecdir}/sysctl.d
 %dir /lib/systemd/system-sleep
 %dir /lib/systemd/system-shutdown
-%{_libexecdir}/sysctl.d/coredump.conf
+%{_libexecdir}/sysctl.d/50-coredump.conf
+%{_libexecdir}/sysctl.d/50-default.conf
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %attr(755,root,root) /bin/systemd_booted
@@ -1163,7 +1158,7 @@ fi
 %dir %{systemdunitdir}/sockets.target.wants
 %dir %{systemdunitdir}/sysinit.target.wants
 %dir %{systemdunitdir}/syslog.target.wants
-%{systemdunitdir}/basic.target.wants/*
+%dir %{systemdunitdir}/timers.target.wants
 %{systemdunitdir}/final.target.wants/*
 %{systemdunitdir}/graphical.target.wants/*
 %{systemdunitdir}/local-fs.target.wants/*
@@ -1181,6 +1176,7 @@ fi
 %{systemdunitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
 %{systemdunitdir}/sysinit.target.wants/sys-*.mount
 %{systemdunitdir}/sysinit.target.wants/systemd-*
+%{systemdunitdir}/timers.target.wants/*.timer
 %{_mandir}/man8/systemd-ask-password-console.path.8*
 %{_mandir}/man8/systemd-ask-password-console.service.8*
 %{_mandir}/man8/systemd-ask-password-wall.path.8*
@@ -1320,14 +1316,14 @@ fi
 /lib/udev/hwdb.d/20-acpi-vendor.hwdb
 /lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
 /lib/udev/hwdb.d/20-pci-classes.hwdb
-/lib/udev/hwdb.d/20-pci-vendor-product.hwdb
+/lib/udev/hwdb.d/20-pci-vendor-model.hwdb
 /lib/udev/hwdb.d/20-usb-classes.hwdb
-/lib/udev/hwdb.d/20-usb-vendor-product.hwdb
+/lib/udev/hwdb.d/20-usb-vendor-model.hwdb
 
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udevd
 %attr(755,root,root) %{_sbindir}/udevadm
-%attr(755,root,root) %{_bindir}/udevadm
+%attr(755,root,root) /bin/udevadm
 
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d

diff --git a/target-pld.patch b/target-pld.patch
index b766050ef0066288ba18ba945a7e44f3edee907b..863c888912648bf0d1511896d1064195761fe288 100644 (file)
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -4,8 +4,8 @@ index 170465a..bce467d 100644
 +++ b/Makefile.am
 @@ -196,6 +196,8 @@
  SYSINIT_TARGET_WANTS =
- BASIC_TARGET_WANTS =
  SOCKETS_TARGET_WANTS =
+ TIMERS_TARGET_WANTS =
 +FINAL_TARGET_WANTS =
 +GRAPHICAL_TARGET_WANTS =
  
@@ -13,8 +13,8 @@ index 170465a..bce467d 100644
  USER_UNIT_ALIASES =
 @@ -214,6 +216,8 @@
        what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
-       what="$(BASIC_TARGET_WANTS)" && wants=basic.target && $(add-wants)
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
+       what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
 +      what="$(FINAL_TARGET_WANTS)" && wants=final.target && $(add-wants)
 +      what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && $(add-wants)
  

diff --git a/udev-so.patch b/udev-so.patch
index 1f4c385f5fbfb5c89d104d48b6cff7b2ee42996e..a135a82a9a1dfb5d2e4bb865490e6b4b961acd79 100644 (file)
--- a/udev-so.patch
+++ b/udev-so.patch
@@ -4,10 +4,10 @@
                $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
--              ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+-              $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
 -              mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
 +              if test "x$$so_img_name" != "x"; then \
-+                      ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
++                      $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
 +                      mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
 +              fi; true; \
        fi

diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
index e0d5d29f0bb1994f818c2b1b2594b82c2423e5a8..6228b7cfe3c5980bf47cb64cc38ac1f716952989 100644 (file)
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -14,7 +14,7 @@
  [Service]
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add
+-ExecStart=@rootbindir@/udevadm trigger --type=subsystems --action=add ; @rootbindir@/udevadm trigger --type=devices --action=add
 +ExecStart=@sbindir@/udevadm trigger --type=subsystems --action=add ; @sbindir@/udevadm trigger --type=devices --action=add
 --- systemd-183/units/systemd-udev-settle.service.in~  2012-05-30 13:43:34.886201138 +0200
 +++ systemd-183/units/systemd-udev-settle.service.in   2012-05-30 13:55:44.546175399 +0200
@@ -22,5 +22,13 @@
  Type=oneshot
  TimeoutSec=180
  RemainAfterExit=yes
--ExecStart=@bindir@/udevadm settle
+-ExecStart=@rootbindir@/udevadm settle
 +ExecStart=@sbindir@/udevadm settle
+--- systemd-199/units/initrd-udevadm-cleanup-db.service.in~    2013-03-11 18:01:33.616138706 +0100
++++ systemd-199/units/initrd-udevadm-cleanup-db.service.in     2013-03-26 19:09:54.525625477 +0100
+@@ -15,4 +15,4 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=-@rootbindir@/udevadm info --cleanup-db
++ExecStart=-@sbindir@/udevadm info --cleanup-db