.gitignore

@@ -1 +1 @@
-SOURCES/libnotify-0.7.9.tar.xz
+SOURCES/libnotify-0.7.7.tar.xz

.libnotify.metadata

@@ -1 +1 @@
-75f80afad4d77b4968bfbcd47f4beea5ac2cc87b SOURCES/libnotify-0.7.9.tar.xz
+4cdf482737df504ac37f5489940b5c7ea5e18d57 SOURCES/libnotify-0.7.7.tar.xz

SOURCES/0001-notify-send-Give-failing-exit-code-if-showing-notifi.patch

@@ -1,4 +1,4 @@
-From 390500fc0c806ed347f76afcfe8a62a74653e81b Mon Sep 17 00:00:00 2001
+From d530d52df61731f1e36071a89e4d2a8719a3cfbf Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode@redhat.com>
 Date: Tue, 12 May 2020 10:12:26 -0400
 Subject: [PATCH] notify-send: Give failing exit code if showing notification
@@ -15,10 +15,10 @@ https://gitlab.gnome.org/GNOME/libnotify/-/merge_requests/13
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/tools/notify-send.c b/tools/notify-send.c
-index 67e0b03..52fa46a 100644
+index c0b9eeb..f8d59de 100644
 --- a/tools/notify-send.c
 +++ b/tools/notify-send.c
-@@ -105,61 +105,61 @@ notify_notification_set_hint_variant (NotifyNotification *notification,
+@@ -104,61 +104,61 @@ notify_notification_set_hint_variant (NotifyNotification *notification,
                                        N_("Invalid hint type \"%s\". Valid types "
                                           "are int, double, string and byte."),
                                        type);
@@ -81,10 +81,10 @@ index 67e0b03..52fa46a 100644
                  {"version", 'v', 0, G_OPTION_ARG_NONE, &do_version,
                   N_("Version of the package."),
                   NULL},
-@@ -247,39 +247,49 @@ main (int argc, char *argv[])
+@@ -242,39 +242,49 @@ main (int argc, char *argv[])
  
                  while ((hint = hints[i++])) {
-                         tokens = g_strsplit (hint, ":", 3);
+                         tokens = g_strsplit (hint, ":", -1);
                          l = g_strv_length (tokens);
  
                          if (l != 3) {
@@ -135,5 +135,5 @@ index 67e0b03..52fa46a 100644
 +        return 0;
  }
 -- 
-2.33.1
+2.32.0
 

SOURCES/libnotify-0.7.9-consistent-ids.patch

@@ -1,26 +0,0 @@
-From 34bf541f11b57995a019731e5a8d328422458bd3 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Mon, 13 Dec 2021 15:20:32 +0000
-Subject: [PATCH] docs: Use consistent IDs in spec build
-
-This avoids differences between IDs for separate builds of the
-specification.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1915831
----
- docs/config.xsl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/docs/config.xsl b/docs/config.xsl
-index 7aa9def..59490e7 100644
---- a/docs/config.xsl
-+++ b/docs/config.xsl
-@@ -3,4 +3,5 @@
-                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                 version="1.0">
-   <xsl:param name="html.stylesheet" select="'docbook.css'"/>
-+  <xsl:param name="generate.consistent.ids" select="1"/>
- </xsl:stylesheet>
--- 
-2.33.1
-

SPECS/libnotify.spec

@@ -1,30 +1,22 @@
 %define glib2_version           2.26.0
 
 Name: libnotify
-Version: 0.7.9
+Version: 0.7.7
-Release: 8%{?dist}
+Release: 6%{?dist}
 Summary: Desktop notification library
 
 License: LGPLv2+
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/GNOME/sources/libnotify/0.7/%{name}-%{version}.tar.xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1915831#
-# https://bugzilla.redhat.com/show_bug.cgi?id=1915831#
-# https://bugzilla.redhat.com/show_bug.cgi?id=1915831
-Patch10001:  libnotify-0.7.9-consistent-ids.patch
 
-Patch20001: 0001-notify-send-Give-failing-exit-code-if-showing-notifi.patch
+Patch10001: 0001-notify-send-Give-failing-exit-code-if-showing-notifi.patch
 
-BuildRequires: docbook-xsl-ns
+BuildRequires: chrpath
-BuildRequires: gdk-pixbuf2-devel
+BuildRequires: git
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gobject-introspection-devel
+BuildRequires: gdk-pixbuf2-devel
 BuildRequires: gtk3-devel
-BuildRequires: gtk-doc
+BuildRequires: gobject-introspection-devel
-BuildRequires: meson
-BuildRequires: xmlto
-BuildRequires: /usr/bin/xsltproc
-
 Requires: glib2%{?_isa} >= %{glib2_version}
 
 %description
@@ -42,16 +34,24 @@ This package contains libraries and header files needed for
 development of programs using %{name}.
 
 %prep
-%autosetup -p1
+%autosetup -S git
 
 %build
-%meson
+%configure
-%meson_build
+make %{?_smp_mflags}
 
 %install
-%meson_install
+%make_install
 
-%ldconfig_scriptlets
+# Remove lib64 rpaths
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/notify-send
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %license COPYING
@@ -59,7 +59,6 @@ development of programs using %{name}.
 %{_bindir}/notify-send
 %{_libdir}/libnotify.so.*
 %{_libdir}/girepository-1.0/Notify-0.7.typelib
-%{_mandir}/man1/notify-send.1*
 
 %files devel
 %dir %{_includedir}/libnotify
@@ -69,55 +68,11 @@ development of programs using %{name}.
 %dir %{_datadir}/gtk-doc/html/libnotify
 %{_datadir}/gtk-doc/html/libnotify/*
 %{_datadir}/gir-1.0/Notify-0.7.gir
-%doc %{_docdir}/libnotify/spec/
 
 %changelog
-* Wed Dec 22 2021 Ray Strode <rstrode@redhat.com> - 0.7.9-8
+* Mon Oct 25 2021 Ray Strode <rstrode@redhat.com> - 0.7.7-6
 - Make notify-send return failure when it fails
-  Resolves: #2017158
+  Resolves: #1834682
-
-* Mon Dec 13 2021 David King <amigadave@amigadave.com> - 0.7.9-7
-- Fix inconsistent IDs in specification (#1915831)
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.7.9-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.7.9-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-3
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Feb 26 2020 Kalev Lember <klember@redhat.com> - 0.7.9-1
-- Update to 0.7.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 0.7.8-2
-- Rebuild with Meson fix for #1699099
-
-* Sat Apr 06 2019 Kalev Lember <klember@redhat.com> - 0.7.8-1
-- Update to 0.7.8
-- Switch to the meson build system
-- Build DocBook documentation
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.7-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild