Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit ConsoleKit
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 06 Aug 2007 22:26:17 +0200
  • Message-id: <20070806202617.7EF78678331@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package ConsoleKit
checked in at Mon Aug 6 22:26:17 CEST 2007.

--------
--- ConsoleKit/ConsoleKit.changes       2007-08-03 14:39:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/ConsoleKit/ConsoleKit.changes  2007-08-06 13:08:28.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Aug  6 13:08:23 CEST 2007 - hmacht@xxxxxxx
+
+- start ConsoleKit in runlevels 2 3 and 5 (insserv consolekit) 
+
+-------------------------------------------------------------------
+Sat Aug  4 16:48:30 CEST 2007 - aj@xxxxxxx
+
+- Reduce build requires.
+
+-------------------------------------------------------------------
+Sat Aug  4 11:16:15 CEST 2007 - aj@xxxxxxx
+
+- Split of devel and doc packages.
+
+-------------------------------------------------------------------
New Changes file:

--- /dev/null   2006-09-20 18:56:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/ConsoleKit/ConsoleKit-doc.changes      2007-08-04 11:01:23.000000000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Sat Aug  4 11:01:15 CEST 2007 - aj@xxxxxxx
+
+- New package, broken out from ConsoleKit.
+

New:
----
  ConsoleKit-doc.changes
  ConsoleKit-doc.spec
  pre_checkin.sh

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ConsoleKit-doc.spec ++++++
#
# spec file for package ConsoleKit-doc (Version 0.2.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

Name:           ConsoleKit-doc
%define         build_doc 1
%define pkg_name ConsoleKit
# 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-devel dbus-1-glib-devel gcc pam-devel pkgconfig xorg-x11-libX11-devel
%if %build_doc
BuildRequires:  gtk2-devel xmlto
Provides:       ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html
%endif
Summary:        System daemon for tracking users, sessions and seats
Version:        0.2.1
Release:        3
License:        GPL v2 or later
Group:          System/Daemons
Autoreqprov:    on
Source:         %{pkg_name}-%{version}.tar.gz
Source1:        rcconsolekit
Patch:          %{pkg_name}-initscript.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
PreReq:         %insserv_prereq

%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).



Authors:
--------
    William Jon McCann <mccann@xxxxxxx>

%if !%{build_doc}
%package -n ConsoleKit-devel
Summary:        Developer package for ConsoleKit
Requires:       %{pkg_name} = %{version}-%{release}, dbus-1-devel
Autoreqprov:    on
Group:          Development/Libraries/Other

%description -n ConsoleKit-devel
Developer package for ConsoleKit



Authors:
--------
    William Jon McCann <mccann@xxxxxxx>

%endif
%prep
%setup -q -n ConsoleKit-%{version}
%patch

%build
autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
            --prefix=/usr \
            --libdir=%_libdir \
            --mandir=%_mandir \
            --sysconfdir=%_sysconfdir \
            --libexecdir=/usr/lib \
            --enable-pam-module \
            --with-pam-module-dir=/%_lib/security \
%if %{build_doc}
            --enable-docbook-docs \
%endif
            --docdir=%_docdir/%{pkg_name}
  
make

%install
make DESTDIR=%{buildroot} install
mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/consolekit
ln -sf %{_sysconfdir}/init.d/consolekit $RPM_BUILD_ROOT/%{_sbindir}/rcconsolekit
#no .la files in /
rm -f $RPM_BUILD_ROOT/%_lib/security/pam_ck_connector.la
# no .la files at all:
rm -f $RPM_BUILD_ROOT/%_libdir/*.la
%if %{build_doc}
rm -rf $RPM_BUILD_ROOT/%_libdir/*.so*
rm -rf $RPM_BUILD_ROOT/%_sysconfdir/dbus-1/system.d/ConsoleKit.conf
rm -rf $RPM_BUILD_ROOT/%_sysconfdir/init.d/consolekit
rm -rf $RPM_BUILD_ROOT/%_bindir/
rm -rf $RPM_BUILD_ROOT/%_includedir/ConsoleKit
rm -rf $RPM_BUILD_ROOT/%_libdir/
rm -rf $RPM_BUILD_ROOT/%_sbindir/
rm -rf $RPM_BUILD_ROOT/%_mandir/
rm -rf $RPM_BUILD_ROOT/usr/lib/ck-collect-session-info
rm -rf $RPM_BUILD_ROOT/usr/lib/ck-get-x11-server-pid
rm -rf $RPM_BUILD_ROOT/%_lib/security
rm -rf $RPM_BUILD_ROOT%_libexecdir/pkgconfig/ck-connector.pc
%endif
%if !%{build_doc}

%post
%{insserv_force_if_yast consolekit}
%run_ldconfig

%postun
%{insserv_cleanup}
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%if %{build_doc}
%_docdir/%{pkg_name}
%else

%_sysconfdir/dbus-1/system.d/ConsoleKit.conf

%_sysconfdir/init.d/consolekit
%_bindir/*
%_libdir/*.so.*

%_sbindir/*
%_mandir/man8/pam_ck_connector.8.gz
/usr/lib/ck-collect-session-info
/usr/lib/ck-get-x11-server-pid
/%_lib/security

%files -n ConsoleKit-devel
%defattr(-,root,root)
%_includedir/ConsoleKit
%_libdir/*.so
%_libexecdir/pkgconfig/ck-connector.pc
%endif

%changelog
* Sat Aug 04 2007 - aj@xxxxxxx
- New package, broken out from ConsoleKit.
++++++ ConsoleKit.spec ++++++
--- /var/tmp/diff_new_pack.e26134/_old  2007-08-06 22:24:11.000000000 +0200
+++ /var/tmp/diff_new_pack.e26134/_new  2007-08-06 22:24:11.000000000 +0200
@@ -11,18 +11,28 @@
 # norootforbuild
 
 Name:           ConsoleKit
+%define         build_doc 0
+%define pkg_name ConsoleKit
+# 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-devel dbus-1-glib-devel gcc gtk2-devel pam-devel pkgconfig xmlto
+BuildRequires:  dbus-1-devel dbus-1-glib-devel gcc pam-devel pkgconfig xorg-x11-libX11-devel
+%if %build_doc
+BuildRequires:  gtk2-devel xmlto
+Provides:       ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html
+%endif
 Summary:        System daemon for tracking users, sessions and seats
 Version:        0.2.1
-Release:        32
+Release:        35
 License:        GPL v2 or later
 Group:          System/Daemons
 Autoreqprov:    on
-Source:         %{name}-%{version}.tar.gz
+Source:         %{pkg_name}-%{version}.tar.gz
 Source1:        rcconsolekit
-Patch:          %{name}-initscript.patch
+Patch:          %{pkg_name}-initscript.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+PreReq:         %insserv_prereq
 
 %description
 ConsoleKit is a system daemon for tracking what users are logged into
@@ -35,8 +45,25 @@
 --------
     William Jon McCann <mccann@xxxxxxx>
 
+%if !%{build_doc}
+%package -n ConsoleKit-devel
+Summary:        Developer package for ConsoleKit
+Requires:       %{pkg_name} = %{version}-%{release}, dbus-1-devel
+Autoreqprov:    on
+Group:          Development/Libraries/Other
+
+%description -n ConsoleKit-devel
+Developer package for ConsoleKit
+
+
+
+Authors:
+--------
+    William Jon McCann <mccann@xxxxxxx>
+
+%endif
 %prep
-%setup
+%setup -q -n ConsoleKit-%{version}
 %patch
 
 %build
@@ -49,8 +76,10 @@
             --libexecdir=/usr/lib \
            --enable-pam-module \
            --with-pam-module-dir=/%_lib/security \
+%if %{build_doc}
             --enable-docbook-docs \
-           --docdir=%_docdir/%{name}
+%endif
+           --docdir=%_docdir/%{pkg_name}
   
 make
 
@@ -61,33 +90,67 @@
 ln -sf %{_sysconfdir}/init.d/consolekit $RPM_BUILD_ROOT/%{_sbindir}/rcconsolekit
 #no .la files in /
 rm -f $RPM_BUILD_ROOT/%_lib/security/pam_ck_connector.la
+# no .la files at all:
+rm -f $RPM_BUILD_ROOT/%_libdir/*.la
+%if %{build_doc}
+rm -rf $RPM_BUILD_ROOT/%_libdir/*.so*
+rm -rf $RPM_BUILD_ROOT/%_sysconfdir/dbus-1/system.d/ConsoleKit.conf
+rm -rf $RPM_BUILD_ROOT/%_sysconfdir/init.d/consolekit
+rm -rf $RPM_BUILD_ROOT/%_bindir/
+rm -rf $RPM_BUILD_ROOT/%_includedir/ConsoleKit
+rm -rf $RPM_BUILD_ROOT/%_libdir/
+rm -rf $RPM_BUILD_ROOT/%_sbindir/
+rm -rf $RPM_BUILD_ROOT/%_mandir/
+rm -rf $RPM_BUILD_ROOT/usr/lib/ck-collect-session-info
+rm -rf $RPM_BUILD_ROOT/usr/lib/ck-get-x11-server-pid
+rm -rf $RPM_BUILD_ROOT/%_lib/security
+rm -rf $RPM_BUILD_ROOT%_libexecdir/pkgconfig/ck-connector.pc
+%endif
+%if !%{build_doc}
 
 %post
+%{insserv_force_if_yast consolekit}
 %run_ldconfig
 
+%postun
+%{insserv_cleanup}
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%if %{build_doc}
+%_docdir/%{pkg_name}
+%else
 
 %_sysconfdir/dbus-1/system.d/ConsoleKit.conf
 
 %_sysconfdir/init.d/consolekit
 %_bindir/*
-%_includedir/ConsoleKit
-%_libdir/*.so*
-%_libdir/*.la
-%_libexecdir/pkgconfig/ck-connector.pc
+%_libdir/*.so.*
 
 %_sbindir/*
 %_mandir/man8/pam_ck_connector.8.gz
-%_docdir/%{name}
 /usr/lib/ck-collect-session-info
 /usr/lib/ck-get-x11-server-pid
 /%_lib/security
 
+%files -n ConsoleKit-devel
+%defattr(-,root,root)
+%_includedir/ConsoleKit
+%_libdir/*.so
+%_libexecdir/pkgconfig/ck-connector.pc
+%endif
+
 %changelog
+* Mon Aug 06 2007 - hmacht@xxxxxxx
+- start ConsoleKit in runlevels 2 3 and 5 (insserv consolekit)
+* Sat Aug 04 2007 - aj@xxxxxxx
+- Reduce build requires.
+* Sat Aug 04 2007 - aj@xxxxxxx
+- Split of devel and doc packages.
 * Fri Aug 03 2007 - hmacht@xxxxxxx
 - remove dbus-1-devel from "Requires:"
 * Wed Apr 25 2007 - hmacht@xxxxxxx



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread