[meego-commits] 5149: Changes to Trunk/ConsoleKit
Anas Nashif
nashif at linux.intel.com
Thu Jul 1 03:01:42 UTC 2010
Hi,
I have made the following changes to ConsoleKit in project Trunk. Please review and accept ASAP.
Thank You,
Anas Nashif
[This message was auto-generated]
---
Request #5149:
submit: Trunk:Testing/ConsoleKit(r9) -> Trunk/ConsoleKit
Message:
migrate from Testing after handset day1
State: new 2010-06-30T14:58:08 nashif
Comment: None
changes files:
--------------
--- ConsoleKit.changes
+++ ConsoleKit.changes
@@ -0,0 +1,3 @@
+* Fri Jun 25 2010 Yan Yin <yan.yin at intel.com> - 0.4.1
+- Change to YAML format
+
new:
----
ConsoleKit.yaml
spec files:
-----------
--- ConsoleKit.spec
+++ ConsoleKit.spec
@@ -1,36 +1,40 @@
+#
+# Do not Edit! Generated by:
+# spectacle version 0.17
+#
+# >> macros
%define glib2_version 2.7.0
%define dbus_version 0.90
%define dbus_glib_version 0.70
%define polkit_version 0.92
+# << macros
-Summary: System daemon for tracking users, sessions and seats
Name: ConsoleKit
+Summary: System daemon for tracking users, sessions and seats
Version: 0.4.1
Release: 3
-License: GPLv2+
Group: System/Libraries
+License: GPLv2+
URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
Source0: http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-%{version}.tar.bz2
-# https://bugs.freedesktop.org/show_bug.cgi?id=25656
+Source100: ConsoleKit.yaml
Patch0: consolekit-allow-with-parameters.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: nodaemon.patch
+Patch2: reorder-initialization.patch
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
-
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: polkit-devel >= %{polkit_version}
+BuildRequires: pkgconfig(dbus-1) >= %{dbus_version}
+BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version}
+BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(polkit-gobject-1) >= %{polkit_version}
+BuildRequires: pkgconfig(x11)
BuildRequires: pam-devel
-BuildRequires: libX11-devel
BuildRequires: zlib-devel
BuildRequires: xmlto
-BuildRequires: automake, autoconf, libtool
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
-# https://bugs.freedesktop.org/show_bug.cgi?id=25656
-Patch1: nodaemon.patch
-Patch2: reorder-initialization.patch
%description
ConsoleKit is a system daemon for tracking what users are logged
@@ -39,11 +43,26 @@
It provides asynchronous notification via the system message bus.
+
+
+%package libs
+Summary: ConsoleKit libraries
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pam
+Requires: dbus >= %{dbus_version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description libs
+This package contains libraries and a PAM module for interacting
+with ConsoleKit.
+
+
%package x11
Summary: X11-requiring add-ons for ConsoleKit
-License: GPLv2+
Group: System/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: libX11
%description x11
@@ -53,21 +72,19 @@
gdm) that need to register their X sessions with ConsoleKit needs to
have a Requires: for this package.
-%package libs
-Summary: ConsoleKit libraries
-License: MIT
-Group: System/Libraries
-Requires: pam
-Requires: dbus >= %{dbus_version}
-%description libs
-This package contains libraries and a PAM module for interacting
-with ConsoleKit.
+%package docs
+Summary: Developer documentation for ConsoleKit
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+
+%description docs
+This package contains developer documentation for ConsoleKit.
%package devel
Summary: Development files for ConsoleKit
-License: MIT
Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
Requires: dbus-devel >= %{dbus_version}
Requires: pkgconfig
@@ -75,48 +92,77 @@
This package contains headers and libraries needed for
developing software that is interacting with ConsoleKit.
-%package docs
-Summary: Developer documentation for ConsoleKit
-Group: Documentation
-Requires: %name = %{version}-%{release}
-#BuildArch: noarch
-%description docs
-This package contains developer documentation for ConsoleKit.
%prep
-%setup -q
-%patch0 -p1 -b .parameters
-%patch1 -p1 -b .nodaemon
-%patch2 -p1 -b .reorder-initialization
+%setup -q -n %{name}-%{version}
+
+# consolekit-allow-with-parameters.patch
+%patch0 -p1
+# nodaemon.patch
+%patch1 -p1
+# reorder-initialization.patch
+%patch2 -p1
+# >> setup
+# << setup
%build
-%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
+# >> build pre
+# << build pre
+
+%configure --disable-static \
+ --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid \
+ --enable-pam-module \
+ --with-pam-module-dir=/%{_lib}/security \
+ --enable-docbook-docs \
+ --docdir=%{_datadir}/doc/%{name}-%{version}
-make
+make %{?jobs:-j%jobs}
+# >> build post
+# << build post
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
%make_install
+# >> install post
+
# make sure we don't package a history log
rm -f $RPM_BUILD_ROOT/%{_var}/log/ConsoleKit/history
-%clean
-rm -rf $RPM_BUILD_ROOT
+# << install post
+
+
%post
+# >> post
if [ -f /var/log/ConsoleKit/history ]; then
- chmod a+r /var/log/ConsoleKit/history
+chmod a+r /var/log/ConsoleKit/history
fi
+# << post
+
+
%post libs -p /sbin/ldconfig
+
%postun libs -p /sbin/ldconfig
+
+
+
+
+
+
+
+
+
%files
%defattr(-,root,root,-)
+# >> files
%doc README AUTHORS NEWS COPYING
%{_sysconfdir}/dbus-1/system.d/*
%{_datadir}/dbus-1/system-services/*.service
@@ -140,27 +186,38 @@
%{_bindir}/ck-launch-session
%{_bindir}/ck-list-sessions
%{_prefix}/lib/ConsoleKit/scripts/*
+# << files
-%files x11
-%defattr(-,root,root,-)
-%{_libexecdir}/*
%files libs
%defattr(-,root,root,-)
+# >> files libs
%{_libdir}/lib*.so.*
/%{_lib}/security/*.so
%{_mandir}/man8/pam_ck_connector.8.gz
+# << files libs
-%files devel
+%files x11
+%defattr(-,root,root,-)
+# >> files x11
+%{_libexecdir}/*
+# << files x11
+
+%files docs
%defattr(-,root,root,-)
+# >> files docs
+# << files docs
+%files devel
+%defattr(-,root,root,-)
+# >> files devel
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*
%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.*.xml
-
#%files docs
#%defattr(-,root,root,-)
#%doc %dir spec
#%doc spec/*
+# << files devel
other changes:
--------------
++++++ ConsoleKit.yaml (new)
--- ConsoleKit.yaml
+++ ConsoleKit.yaml
+Name: ConsoleKit
+Summary: System daemon for tracking users, sessions and seats
+Version: 0.4.1
+Release: 3
+Group: System/Libraries
+License: GPLv2+
+URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
+Sources:
+ - http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-%{version}.tar.bz2
+Patches:
+ - consolekit-allow-with-parameters.patch
+ - nodaemon.patch
+ - reorder-initialization.patch
+Description: |
+ ConsoleKit is a system daemon for tracking what users are logged
+ into the system and how they interact with the computer (e.g.
+ which keyboard and mouse they use).
+
+ It provides asynchronous notification via the system message bus.
+
+Requires:
+ - dbus >= %{dbus_version}
+ - dbus-glib >= %{dbus_glib_version}
+PkgConfigBR:
+ - dbus-1 >= %{dbus_version}
+ - dbus-glib-1 >= %{dbus_glib_version}
+ - glib-2.0 >= %{glib2_version}
+ - polkit-gobject-1 >= %{polkit_version}
+ - x11
+PkgBR:
+ - pam-devel
+ - zlib-devel
+ - xmlto
+ - automake
+ - autoconf
+ - libtool
+Configure: configure
+ConfigOptions:
+ - --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid
+ - --enable-pam-module
+ - --with-pam-module-dir=/%{_lib}/security
+ - --enable-docbook-docs
+ - --docdir=%{_datadir}/doc/%{name}-%{version}
+Builder: make
+SubPackages:
+ - Name: libs
+ Summary: ConsoleKit libraries
+ Group: System/Libraries
+ License: MIT
+ Description: |
+ This package contains libraries and a PAM module for interacting
+ with ConsoleKit.
+ Requires:
+ - pam
+ - dbus >= %{dbus_version}
+
+ - Name: x11
+ Summary: X11-requiring add-ons for ConsoleKit
+ Group: System/Libraries
+ License: GPLv2+
+ Description: |
+ ConsoleKit contains some tools that require Xlib to be installed,
+ those are in this separate package so server systems need not install
+ X. Applications (such as xorg-x11-xinit) and login managers (such as
+ gdm) that need to register their X sessions with ConsoleKit needs to
+ have a Requires: for this package.
+ Requires:
+ - libX11
+
+ - Name: docs
+ Summary: Developer documentation for ConsoleKit
+ Group: Documentation
+ Description: This package contains developer documentation for ConsoleKit.
+
+ - Name: devel
+ Summary: Development files for ConsoleKit
+ Group: Development/Libraries
+ License: MIT
+ Description: |
+ This package contains headers and libraries needed for
+ developing software that is interacting with ConsoleKit.
+ Requires:
+ - dbus-devel >= %{dbus_version}
+ - pkgconfig
+
More information about the MeeGo-commits
mailing list