diff --git a/.gitignore b/.gitignore index a19fb7d..9923626 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ systemd-*src.rpm /systemd-31.tar.bz2 /systemd-32.tar.bz2 /systemd-33.tar.bz2 +/systemd-34.tar.bz2 diff --git a/sources b/sources index 6698ccd..511b8cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -361cad7c3debbdd81c211527509ba181 systemd-33.tar.bz2 +35761c50d5fe8fa8d15a3c651ab8bace systemd-34.tar.bz2 diff --git a/systemd-git-e191553d1dc80cd6d65d05f0cb29f8967fab6983.patch b/systemd-git-e191553d1dc80cd6d65d05f0cb29f8967fab6983.patch deleted file mode 100644 index c53e707..0000000 --- a/systemd-git-e191553d1dc80cd6d65d05f0cb29f8967fab6983.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e191553d1dc80cd6d65d05f0cb29f8967fab6983 -Author: Kay Sievers -Date: Wed Aug 17 19:38:07 2011 +0200 - - convert int to boolean for dbus_bool_t - -diff --git a/src/dbus-manager.c b/src/dbus-manager.c -index ae88895..cfc2afc 100644 ---- a/src/dbus-manager.c -+++ b/src/dbus-manager.c -@@ -444,7 +444,7 @@ static DBusMessage *message_from_file_changes( - if (carries_install_info >= 0) { - dbus_bool_t b; - -- b = carries_install_info; -+ b = !!carries_install_info; - if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b)) - goto oom; - } diff --git a/systemd.spec b/systemd.spec index 7ecdbd1..6942ada 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,8 +1,8 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Version: 33 -Release: 2%{?dist} +Version: 34 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Summary: A System and Service Manager @@ -44,7 +44,6 @@ Source1: macros.systemd Source2: systemd-sysv-convert # Stop-gap, just to ensure things work out-of-the-box for this driver. Source3: udlfb.conf -Patch1: systemd-git-e191553d1dc80cd6d65d05f0cb29f8967fab6983.patch # For sysvinit tools Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 @@ -107,7 +106,6 @@ SysV compatibility tools for systemd %prep %setup -q -%patch1 -p1 %build %configure --with-rootdir= --with-distro=fedora --with-rootlibdir=/%{_lib} @@ -236,6 +234,7 @@ fi %{_libdir}/../lib/tmpfiles.d/systemd.conf %{_libdir}/../lib/tmpfiles.d/x11.conf %{_libdir}/../lib/tmpfiles.d/legacy.conf +%{_libdir}/../lib/tmpfiles.d/tmp.conf %ghost %config(noreplace) %{_sysconfdir}/hostname %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -345,6 +344,9 @@ fi %{_bindir}/systemd-sysv-convert %changelog +* Thu Aug 25 2011 Lennart Poettering - 34-1 +- New upstream release + * Fri Aug 19 2011 Harald Hoyer 33-2 - fix ABRT on service file reloading Resolves: rhbz#732020