Hello community, here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at 2012-12-05 13:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ConsoleKit (Old) and /work/SRC/openSUSE:Factory/.ConsoleKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ConsoleKit", Maintainer is "hma...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ConsoleKit/ConsoleKit.changes 2012-10-19 06:49:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ConsoleKit.new/ConsoleKit.changes 2012-12-05 13:48:14.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Dec 3 13:49:22 CET 2012 - ti...@suse.de + +- obsoletes udev-acl package (bnc#791320) + +------------------------------------------------------------------- +Tue Nov 27 10:28:00 UTC 2012 - rmila...@suse.com + +- import-udev-acl-tool-from-udev.patch: add udev-acl to ConsoleKit + for systems which don't use systemd-logind (bnc#791320). + +------------------------------------------------------------------- New: ---- import-udev-acl-tool-from-udev.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit.spec ++++++ --- /var/tmp/diff_new_pack.cr9Y94/_old 2012-12-05 13:48:15.000000000 +0100 +++ /var/tmp/diff_new_pack.cr9Y94/_new 2012-12-05 13:48:15.000000000 +0100 @@ -19,11 +19,15 @@ Name: ConsoleKit %define build_doc 0 %define pkg_name ConsoleKit +%define _udevdir %(pkg-config --variable=udevdir udev) # WARNING: If you are editing ConsoleKit-doc.spec, STOP. Always edit # ConsoleKit.spec and then run pre-checkin.sh which will create # ConsoleKit-doc.spec based upon ConsoleKit.spec. Url: http://consolekit.freedesktop.org BuildRequires: dbus-1-glib-devel +BuildRequires: glib2-devel +BuildRequires: glibc-devel +BuildRequires: libacl-devel BuildRequires: libtool BuildRequires: pam-devel BuildRequires: pkgconfig @@ -31,6 +35,7 @@ BuildRequires: xorg-x11-libX11-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(udev) %if %build_doc BuildRequires: gtk2-devel BuildRequires: xmlto @@ -43,6 +48,8 @@ Release: 0 Source: %{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf +Patch0: import-udev-acl-tool-from-udev.patch +Obsoletes: udev-acl <= 173 BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %if %build_doc == 0 @@ -81,6 +88,7 @@ %prep %setup -q -n ConsoleKit-%{version} +%patch0 -p1 %build export V=1 @@ -92,6 +100,7 @@ --sysconfdir=%_sysconfdir \ --libexecdir=%{_prefix}/lib/ConsoleKit \ --enable-pam-module \ + --enable-udev-acl \ --with-pam-module-dir=/%_lib/security \ --localstatedir=%{_localstatedir} \ %if %{build_doc} @@ -101,9 +110,10 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} UDEVDIR=%{_udevdir} install mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/ConsoleKit/seats.d +mkdir -p $RPM_BUILD_ROOT%{_udevdir}/rules.d rm -f $RPM_BUILD_ROOT/%_lib/security/pam_ck_connector.la rm -f $RPM_BUILD_ROOT/%_libdir/*.la %if %{build_doc} @@ -164,6 +174,10 @@ %dir %{_prefix}/lib/ConsoleKit/run-seat.d %dir %{_prefix}/lib/ConsoleKit/run-session.d %dir %{_prefix}/lib/ConsoleKit/scripts +%dir %{_udevdir} +%dir %{_udevdir}/rules.d +%{_udevdir}/udev-acl +%{_udevdir}/rules.d/70-udev-acl.rules %{_prefix}/lib/ConsoleKit/scripts/ck-system-restart %{_prefix}/lib/ConsoleKit/scripts/ck-system-stop %{_prefix}/lib/ConsoleKit/ck-collect-session-info ++++++ import-udev-acl-tool-from-udev.patch ++++++ ++++ 603 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org