From 0b5db16ae850a49c855b69344d8a917d61d9e5b5a474b351fd0d49811b078954 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 2 Mar 2009 23:36:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnotify?expand=0&rev=11 --- libnotify.changes | 10 ++++++++++ libnotify.spec | 45 ++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/libnotify.changes b/libnotify.changes index 980ef39..a60781b 100644 --- a/libnotify.changes +++ b/libnotify.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Feb 28 01:20:48 CET 2009 - vuntz@novell.com + +- Remove BuildRequires: gtk-doc, update-desktop-files. +- Remove dbus-1-x11 Requires: it's wrong (we don't require + dbus-launch in any way: if the session bus is not there, having + dbus-launch won't help). The requirement should be in another + package. +- Merge doc package in devel, with adequate Provides/Obsoletes. + ------------------------------------------------------------------- Sat Jan 31 16:52:02 CET 2009 - vuntz@novell.com diff --git a/libnotify.spec b/libnotify.spec index fe48056..c411a34 100644 --- a/libnotify.spec +++ b/libnotify.spec @@ -20,16 +20,16 @@ Name: libnotify BuildRequires: dbus-1-glib-devel -BuildRequires: gtk-doc gtk2-devel update-desktop-files +BuildRequires: gtk2-devel Version: 0.4.5 -Release: 1 +Release: 2 Url: http://www.galago-project.org/ Group: System/Libraries License: GPL v2 or later; LGPL v2.1 or later Summary: Notifications Library Source: %{name}-%{version}.tar.bz2 -AutoReqProv: on -Requires: notification-daemon dbus-1-x11 libnotify1 +Requires: libnotify1 +Requires: notification-daemon BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,28 +64,14 @@ Group: System/Libraries Summary: Notifications Library Requires: %{name} = %{version} glib2-devel gtk2-devel dbus-1-devel Requires: dbus-1-glib-devel +Provides: libnotify-doc = %{version} +Obsoletes: libnotify-doc < %{version} %description devel D-BUS notifications library. -Authors: --------- - Christian Hammond - Mike Hearn - -%package doc -License: LGPL v2.1 or later -Group: System/Libraries -Summary: Additional Package Documentation. -Requires: %{name} = %{version} - -%description doc -D-BUS notifications library. - - - Authors: -------- Christian Hammond @@ -106,11 +92,9 @@ make %{?jobs:-j%jobs} %clean rm -rf $RPM_BUILD_ROOT -%post -n libnotify1 -/sbin/ldconfig +%post -n libnotify1 -p /sbin/ldconfig -%postun -n libnotify1 -/sbin/ldconfig +%postun -n libnotify1 -p /sbin/ldconfig %files %defattr (-, root, root) @@ -127,12 +111,19 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/* - -%files doc -%defattr (-, root, root) +# Own these repositories to not depend on gtk-doc while building: +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/libnotify %changelog +* Sat Feb 28 2009 vuntz@novell.com +- Remove BuildRequires: gtk-doc, update-desktop-files. +- Remove dbus-1-x11 Requires: it's wrong (we don't require + dbus-launch in any way: if the session bus is not there, having + dbus-launch won't help). The requirement should be in another + package. +- Merge doc package in devel, with adequate Provides/Obsoletes. * Sat Jan 31 2009 vuntz@novell.com - Remove la file. * Sat Dec 20 2008 mboman@suse.de