From e384079ef1ed181052ee4b19a8ead388f8186b9f39fa5fb500add8b7371d060c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 2 Mar 2017 10:10:12 +0000 Subject: [PATCH 1/4] Accepting request 461842 from home:XRevan86 OBS-URL: https://build.opensuse.org/request/show/461842 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libnotify?expand=0&rev=44 --- libnotify.changes | 7 +++++++ libnotify.spec | 44 ++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/libnotify.changes b/libnotify.changes index 2e828e1..36a418c 100644 --- a/libnotify.changes +++ b/libnotify.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 28 10:11:13 UTC 2017 - sor.alexei@meowr.ru + +- Recommend the virtual dbus(org.freedesktop.Notifications) package + instead of notification-daemon. +- Spec cleanup. + ------------------------------------------------------------------- Fri Oct 14 09:10:15 UTC 2016 - zaitor@opensuse.org diff --git a/libnotify.spec b/libnotify.spec index 9043ea9..72bb86f 100644 --- a/libnotify.spec +++ b/libnotify.spec @@ -1,7 +1,7 @@ # # spec file for package libnotify # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,16 @@ Name: libnotify +Version: 0.7.7 +Release: 0 +Summary: Notifications Library +License: LGPL-2.1+ +Group: System/Libraries +Url: http://galago-project.org/ +Source: https://download.gnome.org/sources/libnotify/0.7/%{name}-%{version}.tar.xz +Source99: baselibs.conf BuildRequires: gobject-introspection-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -25,15 +34,6 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: gnome-common BuildRequires: gtk-doc %endif -Version: 0.7.7 -Release: 0 -Url: http://www.galago-project.org/ -Summary: Notifications Library -License: LGPL-2.1+ -Group: System/Libraries -Source: http://download.gnome.org/sources/libnotify/0.7/%{name}-%{version}.tar.xz -Source99: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description D-BUS notifications library. @@ -41,7 +41,7 @@ D-BUS notifications library. %package -n libnotify4 Summary: Notifications Library Group: System/Libraries -Recommends: notification-daemon +Recommends: dbus(org.freedesktop.Notifications) %description -n libnotify4 D-BUS notifications library. @@ -80,27 +80,27 @@ D-BUS notifications library. %prep %setup -q %if 0%{?BUILD_FROM_VCS} -[ -x ./autogens.sh ] && NOCONFIGURE=1 ./autogen.sh +[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh %endif %build %configure\ %if 0%{?BUILD_FROM_VCS} - --enable-gtk-doc \ + --enable-gtk-doc \ %endif - --disable-static -make %{?_smp_mflags} + --disable-static +make %{?_smp_mflags} V=1 %install -%makeinstall -%{__rm} -f %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -n libnotify4 -p /sbin/ldconfig %postun -n libnotify4 -p /sbin/ldconfig %files -n libnotify4 -%defattr (-, root, root) +%defattr(-,root,root) # README is empty %doc AUTHORS COPYING ChangeLog NEWS %{_libdir}/*.so.* @@ -110,18 +110,18 @@ make %{?_smp_mflags} %{_libdir}/girepository-1.0/Notify-0.7.typelib %files tools -%defattr (-, root, root) +%defattr(-,root,root) %{_bindir}/notify-send %files devel -%defattr (-, root, root) +%defattr(-,root,root) %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/* %{_datadir}/gir-1.0/*.gir # Own these repositories to not depend on gtk-doc while building: -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html +%dir %{_datadir}/gtk-doc/ +%dir %{_datadir}/gtk-doc/html/ %{_datadir}/gtk-doc/html/libnotify %changelog From 64f8a06fc85863b6e6da2f3f1c47ad45c63178d88c43f7931dad8df40cf8dc92 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 24 Apr 2017 11:11:32 +0000 Subject: [PATCH 2/4] Accepting request 483843 from home:jengelh:branches:GNOME:Factory - Rectify RPM groups OBS-URL: https://build.opensuse.org/request/show/483843 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libnotify?expand=0&rev=45 --- libnotify.changes | 5 +++++ libnotify.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libnotify.changes b/libnotify.changes index 36a418c..c1a50bb 100644 --- a/libnotify.changes +++ b/libnotify.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 14:19:58 UTC 2017 - jengelh@inai.de + +- Rectify RPM groups + ------------------------------------------------------------------- Tue Feb 28 10:11:13 UTC 2017 - sor.alexei@meowr.ru diff --git a/libnotify.spec b/libnotify.spec index 72bb86f..9efa8aa 100644 --- a/libnotify.spec +++ b/libnotify.spec @@ -21,7 +21,7 @@ Version: 0.7.7 Release: 0 Summary: Notifications Library License: LGPL-2.1+ -Group: System/Libraries +Group: Development/Libraries/X11 Url: http://galago-project.org/ Source: https://download.gnome.org/sources/libnotify/0.7/%{name}-%{version}.tar.xz Source99: baselibs.conf From 7a1ef0c971fa3b869ecf55d34d9f23c43cf8f55c99f0ff3aa0470df412155acd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 1 Mar 2018 11:12:15 +0000 Subject: [PATCH 3/4] Accepting request 580515 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/580515 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libnotify?expand=0&rev=46 --- _service | 14 ++++++++ _servicedata | 4 +++ libnotify-0.7.7+20170717.43aac61.tar.xz | 3 ++ libnotify-0.7.7.tar.xz | 3 -- libnotify-rpmlintrc | 2 ++ libnotify.changes | 14 ++++++++ libnotify.spec | 45 ++++++++++--------------- 7 files changed, 55 insertions(+), 30 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 libnotify-0.7.7+20170717.43aac61.tar.xz delete mode 100644 libnotify-0.7.7.tar.xz create mode 100644 libnotify-rpmlintrc diff --git a/_service b/_service new file mode 100644 index 0000000..444b958 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git://git.gnome.org/libnotify + git + 0.7.7+%cd.%h + 43aac613f1c2a56aa672c36c157c9b8eb193ac25 + enable + + + *.tar + xz + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..5d0ace6 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + git://git.gnome.org/libnotify + 43aac613f1c2a56aa672c36c157c9b8eb193ac25 \ No newline at end of file diff --git a/libnotify-0.7.7+20170717.43aac61.tar.xz b/libnotify-0.7.7+20170717.43aac61.tar.xz new file mode 100644 index 0000000..feb7363 --- /dev/null +++ b/libnotify-0.7.7+20170717.43aac61.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02b11290654a37f562b3f50b0f96c73d1c9e80bf33d12849c050ac769f0fe3c1 +size 106284 diff --git a/libnotify-0.7.7.tar.xz b/libnotify-0.7.7.tar.xz deleted file mode 100644 index 718d93b..0000000 --- a/libnotify-0.7.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04 -size 285356 diff --git a/libnotify-rpmlintrc b/libnotify-rpmlintrc new file mode 100644 index 0000000..aec0c07 --- /dev/null +++ b/libnotify-rpmlintrc @@ -0,0 +1,2 @@ +# Silence rpmlint about libnotify-tools.x86_64: W: shlib-policy-missing-lib +addFilter("libnotify-tools.* shlib-policy-missing-lib"); diff --git a/libnotify.changes b/libnotify.changes index c1a50bb..bc4dc97 100644 --- a/libnotify.changes +++ b/libnotify.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 26 15:19:53 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 0.7.7+20170717.43aac61: + + Conditionall call g_type_init() after a version check. + + build: Update the list of headers in srcdir. + + notify-send: Call setlocale in main function. +- Switch to git-checkout via source service, following this, add + gtk-doc and gnome-common BuildRequires ans pass autogen.sh to + bootstrap tarball and pass --enable-gtk-doc to configure. +- Clean up spec, use autosetup and make_build macros. +- Add libnotify-rpmlintrc, silence rpmlint warning about + shlib-policy-missing-lib. + ------------------------------------------------------------------- Thu Mar 30 14:19:58 UTC 2017 - jengelh@inai.de diff --git a/libnotify.spec b/libnotify.spec index 9efa8aa..140c29f 100644 --- a/libnotify.spec +++ b/libnotify.spec @@ -1,7 +1,7 @@ # # spec file for package libnotify # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,24 @@ Name: libnotify -Version: 0.7.7 +Version: 0.7.7+20170717.43aac61 Release: 0 Summary: Notifications Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/X11 Url: http://galago-project.org/ -Source: https://download.gnome.org/sources/libnotify/0.7/%{name}-%{version}.tar.xz +#Source0: https://download.gnome.org/sources/libnotify/0.7/%%{name}-%%{version}.tar.xz +Source: %{name}-%{version}.tar.xz +Source98: libnotify-rpmlintrc Source99: baselibs.conf + +BuildRequires: gnome-common BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc BuildRequires: pkgconfig BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) -%if 0%{?BUILD_FROM_VCS} -BuildRequires: gnome-common -BuildRequires: gtk-doc -%endif %description D-BUS notifications library. @@ -78,50 +79,40 @@ Obsoletes: libnotify-doc < %{version} D-BUS notifications library. %prep -%setup -q -%if 0%{?BUILD_FROM_VCS} -[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh -%endif +%autosetup %build -%configure\ -%if 0%{?BUILD_FROM_VCS} - --enable-gtk-doc \ -%endif - --disable-static -make %{?_smp_mflags} V=1 +NOCONFIGURE=1 ./autogen.sh +%configure \ + --enable-gtk-doc \ + --disable-static \ + %{nil} +%make_build %install %make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n libnotify4 -p /sbin/ldconfig - %postun -n libnotify4 -p /sbin/ldconfig %files -n libnotify4 -%defattr(-,root,root) +%license COPYING # README is empty -%doc AUTHORS COPYING ChangeLog NEWS +%doc AUTHORS ChangeLog NEWS %{_libdir}/*.so.* %files -n typelib-1_0-Notify-0_7 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Notify-0.7.typelib %files tools -%defattr(-,root,root) %{_bindir}/notify-send %files devel -%defattr(-,root,root) %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/* %{_datadir}/gir-1.0/*.gir -# 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 From fdf9eb1886b701613826f90ce9161c7e7425c3d5abc9cf7d6eb77e6dbdf02a70 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 3 Mar 2018 12:10:12 +0000 Subject: [PATCH 4/4] Revert failed experiment OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libnotify?expand=0&rev=47 --- libnotify.changes | 2 -- libnotify.spec | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libnotify.changes b/libnotify.changes index bc4dc97..5b8b817 100644 --- a/libnotify.changes +++ b/libnotify.changes @@ -20,8 +20,6 @@ Thu Mar 30 14:19:58 UTC 2017 - jengelh@inai.de ------------------------------------------------------------------- Tue Feb 28 10:11:13 UTC 2017 - sor.alexei@meowr.ru -- Recommend the virtual dbus(org.freedesktop.Notifications) package - instead of notification-daemon. - Spec cleanup. ------------------------------------------------------------------- diff --git a/libnotify.spec b/libnotify.spec index 140c29f..38ed165 100644 --- a/libnotify.spec +++ b/libnotify.spec @@ -22,12 +22,11 @@ Release: 0 Summary: Notifications Library License: LGPL-2.1-or-later Group: Development/Libraries/X11 -Url: http://galago-project.org/ +URL: http://galago-project.org/ #Source0: https://download.gnome.org/sources/libnotify/0.7/%%{name}-%%{version}.tar.xz Source: %{name}-%{version}.tar.xz Source98: libnotify-rpmlintrc Source99: baselibs.conf - BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -42,7 +41,7 @@ D-BUS notifications library. %package -n libnotify4 Summary: Notifications Library Group: System/Libraries -Recommends: dbus(org.freedesktop.Notifications) +Recommends: notification-daemon %description -n libnotify4 D-BUS notifications library.