Hello community,
here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at 2012-03-01 07:25:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ConsoleKit (Old)
and /work/SRC/openSUSE:Factory/.ConsoleKit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ConsoleKit", Maintainer is "hmacht(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ConsoleKit/ConsoleKit-doc.changes 2011-10-28 19:21:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ConsoleKit.new/ConsoleKit-doc.changes 2012-03-01 07:25:07.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Feb 27 13:44:03 UTC 2012 - vuntz(a)opensuse.org
+
+- Fix systemd-related packaging:
+ + Add systemd-devel BuildRequires.
+ + Use %{?systemd_requires}.
+ + Stop passing --with-systemdsystemunitdir to configure: we'll
+ just use the right default value, which should be %{_unitdir}.
+ + Call %service_{add,del}_* macros in scriptlets for
+ console-kit-daemon.service.
+ + Note that we don't call those macros for
+ console-kit-log-system-{restart,start,stop}.service since those
+ services are used in specific cases only.
+
+-------------------------------------------------------------------
ConsoleKit.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ConsoleKit-doc.spec ++++++
--- /var/tmp/diff_new_pack.IyK6cq/_old 2012-03-01 07:25:09.000000000 +0100
+++ /var/tmp/diff_new_pack.IyK6cq/_new 2012-03-01 07:25:09.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ConsoleKit-doc
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-
Name: ConsoleKit-doc
%define build_doc 1
%define pkg_name ConsoleKit
@@ -27,22 +26,25 @@
BuildRequires: dbus-1-glib-devel
BuildRequires: libtool
BuildRequires: pam-devel
-BuildRequires: xorg-x11-libX11-devel
+BuildRequires: pkgconfig
BuildRequires: polkit-devel
+BuildRequires: systemd-devel
+BuildRequires: xorg-x11-libX11-devel
BuildRequires: zlib-devel
-BuildRequires: pkgconfig
%if %build_doc
-BuildRequires: gtk2-devel xmlto
+BuildRequires: gtk2-devel
+BuildRequires: xmlto
Provides: ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html
%endif
Summary: System daemon for tracking users, sessions and seats
-Version: 0.4.5
-Release: 1
License: GPL-2.0+
Group: System/Daemons
+Version: 0.4.5
+Release: 0
Source: %{pkg_name}-%{version}.tar.bz2
Source2: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
%if %build_doc == 0
PreReq: pwdutils login
PreReq: pam-config >= 0.22
@@ -56,19 +58,18 @@
%if !%{build_doc}
%package -n ConsoleKit-devel
-License: GPL-2.0+
Summary: Developer package for ConsoleKit
-Requires: %{pkg_name} = %{version}-%{release}, dbus-1-devel
Group: Development/Libraries/Other
+Requires: %{pkg_name} = %{version}-%{release}
+Requires: dbus-1-devel
%description -n ConsoleKit-devel
Developer package for ConsoleKit and libck-connector
%package -n ConsoleKit-x11
-License: GPL-2.0+
Summary: System daemon for tracking users, sessions and seats
-Requires: %{pkg_name} = %{version}-%{release}
Group: System/Daemons
+Requires: %{pkg_name} = %{version}-%{release}
Supplements: packageand(xorg-x11:ConsoleKit)
%description -n ConsoleKit-x11
@@ -93,7 +94,6 @@
--enable-pam-module \
--with-pam-module-dir=/%_lib/security \
--localstatedir=%{_localstatedir} \
- --with-systemdsystemunitdir=/lib/systemd/system \
%if %{build_doc}
--enable-docbook-docs \
%endif
@@ -127,15 +127,23 @@
%endif
%if !%{build_doc}
+%pre
+%service_add_pre console-kit-daemon.service
+
%post
/sbin/ldconfig
+%service_add_post console-kit-daemon.service
if [ -n "$YAST_IS_RUNNING" ]; then
/usr/sbin/pam-config --service login -a -f --ck_connector
else
/usr/sbin/pam-config --service login -a --ck_connector || echo "please call \"/usr/sbin/pam-config --service login -a --ck_connector\" manually"
fi
+%preun
+%service_del_preun console-kit-daemon.service
+
%postun
+%service_del_postun console-kit-daemon.service
# make sure this is not called on update
if [ "$1" = 0 ]; then
/usr/sbin/pam-config --service login -d --ck_connector ||:
@@ -172,8 +180,15 @@
%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
-/lib/systemd/system/console-kit-*.service
-/lib/systemd/system/*.target.wants
+%{_unitdir}/console-kit-daemon.service
+%{_unitdir}/console-kit-log-system-restart.service
+%{_unitdir}/console-kit-log-system-start.service
+%{_unitdir}/console-kit-log-system-stop.service
+%{_unitdir}/basic.target.wants/console-kit-log-system-start.service
+%{_unitdir}/halt.target.wants/console-kit-log-system-stop.service
+%{_unitdir}/kexec.target.wants/console-kit-log-system-restart.service
+%{_unitdir}/poweroff.target.wants/console-kit-log-system-stop.service
+%{_unitdir}/reboot.target.wants/console-kit-log-system-restart.service
%files -n ConsoleKit-devel
%defattr(-,root,root)
++++++ ConsoleKit.spec ++++++
--- /var/tmp/diff_new_pack.IyK6cq/_old 2012-03-01 07:25:09.000000000 +0100
+++ /var/tmp/diff_new_pack.IyK6cq/_new 2012-03-01 07:25:09.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ConsoleKit
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-
Name: ConsoleKit
%define build_doc 0
%define pkg_name ConsoleKit
@@ -27,22 +26,25 @@
BuildRequires: dbus-1-glib-devel
BuildRequires: libtool
BuildRequires: pam-devel
-BuildRequires: xorg-x11-libX11-devel
+BuildRequires: pkgconfig
BuildRequires: polkit-devel
+BuildRequires: systemd-devel
+BuildRequires: xorg-x11-libX11-devel
BuildRequires: zlib-devel
-BuildRequires: pkgconfig
%if %build_doc
-BuildRequires: gtk2-devel xmlto
+BuildRequires: gtk2-devel
+BuildRequires: xmlto
Provides: ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html
%endif
Summary: System daemon for tracking users, sessions and seats
-Version: 0.4.5
-Release: 1
License: GPL-2.0+
Group: System/Daemons
+Version: 0.4.5
+Release: 0
Source: %{pkg_name}-%{version}.tar.bz2
Source2: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
%if %build_doc == 0
PreReq: pwdutils login
PreReq: pam-config >= 0.22
@@ -56,19 +58,18 @@
%if !%{build_doc}
%package -n ConsoleKit-devel
-License: GPL-2.0+
Summary: Developer package for ConsoleKit
-Requires: %{pkg_name} = %{version}-%{release}, dbus-1-devel
Group: Development/Libraries/Other
+Requires: %{pkg_name} = %{version}-%{release}
+Requires: dbus-1-devel
%description -n ConsoleKit-devel
Developer package for ConsoleKit and libck-connector
%package -n ConsoleKit-x11
-License: GPL-2.0+
Summary: System daemon for tracking users, sessions and seats
-Requires: %{pkg_name} = %{version}-%{release}
Group: System/Daemons
+Requires: %{pkg_name} = %{version}-%{release}
Supplements: packageand(xorg-x11:ConsoleKit)
%description -n ConsoleKit-x11
@@ -93,7 +94,6 @@
--enable-pam-module \
--with-pam-module-dir=/%_lib/security \
--localstatedir=%{_localstatedir} \
- --with-systemdsystemunitdir=/lib/systemd/system \
%if %{build_doc}
--enable-docbook-docs \
%endif
@@ -127,15 +127,23 @@
%endif
%if !%{build_doc}
+%pre
+%service_add_pre console-kit-daemon.service
+
%post
/sbin/ldconfig
+%service_add_post console-kit-daemon.service
if [ -n "$YAST_IS_RUNNING" ]; then
/usr/sbin/pam-config --service login -a -f --ck_connector
else
/usr/sbin/pam-config --service login -a --ck_connector || echo "please call \"/usr/sbin/pam-config --service login -a --ck_connector\" manually"
fi
+%preun
+%service_del_preun console-kit-daemon.service
+
%postun
+%service_del_postun console-kit-daemon.service
# make sure this is not called on update
if [ "$1" = 0 ]; then
/usr/sbin/pam-config --service login -d --ck_connector ||:
@@ -172,8 +180,15 @@
%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
-/lib/systemd/system/console-kit-*.service
-/lib/systemd/system/*.target.wants
+%{_unitdir}/console-kit-daemon.service
+%{_unitdir}/console-kit-log-system-restart.service
+%{_unitdir}/console-kit-log-system-start.service
+%{_unitdir}/console-kit-log-system-stop.service
+%{_unitdir}/basic.target.wants/console-kit-log-system-start.service
+%{_unitdir}/halt.target.wants/console-kit-log-system-stop.service
+%{_unitdir}/kexec.target.wants/console-kit-log-system-restart.service
+%{_unitdir}/poweroff.target.wants/console-kit-log-system-stop.service
+%{_unitdir}/reboot.target.wants/console-kit-log-system-restart.service
%files -n ConsoleKit-devel
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org