From 69ee2b87d3f223f76748ffc81dbceacfd5854402c676eb593286fc6c6e66082a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 24 Sep 2012 15:00:55 +0000 Subject: [PATCH] Accepting request 135461 from home:elvigia:branches:Base:System - rtkit-use-system-sd-daemon.patch Use system sddaemon libs. - Update to version 0.11.x, not much has changed other than systemd related updates/improvements. OBS-URL: https://build.opensuse.org/request/show/135461 OBS-URL: https://build.opensuse.org/package/show/Base:System/rtkit?expand=0&rev=17 --- rtkit-0.10_git201107141740.tar.bz2 | 3 --- rtkit-0.11_git201205151338.tar.xz | 3 +++ rtkit-use-system-sd-daemon.patch | 37 ++++++++++++++++++++++++++++++ rtkit.changes | 11 +++++++++ rtkit.spec | 16 ++++++++----- 5 files changed, 61 insertions(+), 9 deletions(-) delete mode 100644 rtkit-0.10_git201107141740.tar.bz2 create mode 100644 rtkit-0.11_git201205151338.tar.xz create mode 100644 rtkit-use-system-sd-daemon.patch diff --git a/rtkit-0.10_git201107141740.tar.bz2 b/rtkit-0.10_git201107141740.tar.bz2 deleted file mode 100644 index adb88a6..0000000 --- a/rtkit-0.10_git201107141740.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24c1ccdb3e567382cfdb39f3813f5bc7a6cc72b38a67dcd50c38c0bfec9f28b8 -size 41227 diff --git a/rtkit-0.11_git201205151338.tar.xz b/rtkit-0.11_git201205151338.tar.xz new file mode 100644 index 0000000..3e44d85 --- /dev/null +++ b/rtkit-0.11_git201205151338.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:815116739ba385bf1827033c1218d1c41911fbf5739ef674d9a5ba6ed49dd418 +size 42984 diff --git a/rtkit-use-system-sd-daemon.patch b/rtkit-use-system-sd-daemon.patch new file mode 100644 index 0000000..aadfee5 --- /dev/null +++ b/rtkit-use-system-sd-daemon.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile.am b/Makefile.am +index febc355..611cf14 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -56,13 +56,16 @@ systemdsystemunit_DATA = \ + endif + + rtkit_daemon_SOURCES = \ +- rtkit-daemon.c rtkit.h \ +- sd-daemon.c sd-daemon.h ++ rtkit-daemon.c rtkit.h ++ + rtkit_daemon_LDADD = \ +- $(DBUS_LIBS) ++ $(DBUS_LIBS) \ ++ $(SD_DAEMON_LIBS) ++ + rtkit_daemon_CFLAGS = \ + $(AM_CFLAGS) \ +- $(DBUS_CFLAGS) ++ $(DBUS_CFLAGS) \ ++ $(SD_DAEMON_CFLAGS) + + rtkitctl_SOURCES = \ + rtkitctl.c rtkit.h +diff --git a/configure.ac b/configure.ac +index 5a77363..2806def 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,6 +115,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt]) + AC_SEARCH_LIBS([cap_init], [cap]) + + PKG_CHECK_MODULES(DBUS, dbus-1) ++PKG_CHECK_MODULES([SD_DAEMON], libsystemd-daemon) + + AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), diff --git a/rtkit.changes b/rtkit.changes index cb5f254..7d2ff03 100644 --- a/rtkit.changes +++ b/rtkit.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Sep 23 13:48:55 UTC 2012 - crrodriguez@opensuse.org + +- rtkit-use-system-sd-daemon.patch Use system sddaemon libs. + +------------------------------------------------------------------- +Sun Sep 23 03:47:35 UTC 2012 - crrodriguez@opensuse.org + +- Update to version 0.11.x, not much has changed other + than systemd related updates/improvements. + ------------------------------------------------------------------- Tue Dec 20 21:08:37 UTC 2011 - coolo@suse.com diff --git a/rtkit.spec b/rtkit.spec index 3c3a1bb..b4d7a90 100644 --- a/rtkit.spec +++ b/rtkit.spec @@ -1,7 +1,7 @@ # # spec file for package rtkit # -# 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 @@ -15,27 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rtkit Summary: Realtime Policy and Watchdog Daemon License: GPL-3.0+ and BSD-3-Clause Group: System/Base -Version: 0.10_git201107141740 +Version: 0.11_git201205151338 Release: 0 # The daemon itself is GPL v3 or later, the reference implementation for the client BSD-3-Clause -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.xz Url: http://git.0pointer.de/?p=rtkit.git BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: dbus-1-devel >= 1.2 BuildRequires: libcap-devel BuildRequires: polkit-devel +BuildRequires: xz Requires: polkit PreReq: dbus-1 %if 0%{?suse_version} > 1140 BuildRequires: systemd +BuildRequires: pkgconfig(libsystemd-daemon) %{?systemd_requires} %define has_systemd 1 %endif +Patch0: rtkit-use-system-sd-daemon.patch %description RealtimeKit is a D-Bus system service that changes the @@ -46,11 +50,11 @@ processes. %prep %setup -q +%patch0 -p1 %build -./bootstrap.sh -# %configure --libexecdir=$prefix/lib/rtkit -%configure \ +autoreconf -fiv +%configure --disable-silent-rules \ %if 0%{?has_systemd} --with-systemdsystemunitdir=%{_unitdir} \ %endif