.gitignore

@@ -1,2 +1 @@
-/libdbusmenu-12.10.2.tar.gz
-/libdbusmenu-16.04.0.tar.gz
+SOURCES/libdbusmenu-16.04.0.tar.gz

.libdbusmenu.metadata

@@ -0,0 +1 @@
+f88fc666609ed486a968fd6c8b739dff07d50bdd SOURCES/libdbusmenu-16.04.0.tar.gz

SPECS/libdbusmenu.spec

@@ -7,15 +7,22 @@
 # Set to 1 to run testsuite
 %global with_tests 0
 
+# No gtk2 in RHEL 10
+%if 0%{?rhel} > 9
+%bcond_with    gtk2
+%else
+%bcond_without gtk2
+%endif
+
 Name:       libdbusmenu
 Version:    %{ubuntu_release}.0
-Release:    19%{?dist}
+Release:    32%{?dist}
 Summary:    Library for passing menus over DBus
 
 # All files installed in final rpms use C sources with dual licensing headers.
 # Tests compiled in the build process are licensed GPLv3
 
-License:    LGPLv3 or LGPLv2 and GPLv3
+License:    (LGPL-3.0-only OR LGPL-2.1-only) AND GPL-3.0-only
 URL:        https://launchpad.net/libdbusmenu
 Source0:    https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+download/%{name}-%{version}.tar.gz
 
@@ -38,7 +45,9 @@ BuildRequires:  pkgconfig(gio-2.0) >= 2.35.4
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.24
 BuildRequires:  pkgconfig(glib-2.0) >= 2.35.4
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 0.10
+%if %{with gtk2}
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.16
+%endif
 BuildRequires:  pkgconfig(gtk+-3.0) >= 2.91
 BuildRequires:  pkgconfig(json-glib-1.0) >= 0.13.4
 BuildRequires:  pkgconfig(x11) >= 1.3
@@ -61,18 +70,19 @@ makes building menus simple.
 %package devel
 Summary:    %{summary} - Development files
 Requires:   %{name}%{?_isa} = %{version}-%{release}
-Requires:   dbus-glib-devel
 
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%if %{with gtk2}
 %package gtk2
 Summary:    %{summary} - GTK+2 version
 Requires:   %{name}%{?_isa} = %{version}-%{release}
 
 %description gtk2
 Shared libraries for the %{name}-gtk2 library.
+%endif
 
 %package gtk3
 Summary:    %{summary} - GTK+3 version
@@ -81,23 +91,23 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
 %description gtk3
 Shared libraries for the %{name}-gtk3 library.
 
+%if %{with gtk2}
 %package gtk2-devel
 Summary:    Development files for %{name}-gtk2
 Requires:   %{name}-gtk2%{?_isa} = %{version}-%{release}
 Requires:   %{name}%{?_isa} = %{version}-%{release}
 Requires:   gtk2-devel
-Requires:   dbus-glib-devel
 
 %description gtk2-devel
 The %{name}-gtk2-devel package contains libraries and header files for
 developing applications that use %{name}-gtk2.
+%endif
 
 %package gtk3-devel
 Summary:    Development files for %{name}-gtk3
 Requires:   %{name}-gtk3%{?_isa} = %{version}-%{release}
 Requires:   %{name}%{?_isa} = %{version}-%{release}
 Requires:   gtk3-devel
-Requires:   dbus-glib-devel
 
 %description gtk3-devel
 The %{name}-gtk3-devel package contains libraries and header files for
@@ -136,12 +146,20 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
 The %{name}-tools package contains helper tools for developing applications
 that use %{name}.
 
+%package    gtk3-tests
+Summary:    Test tools for the dbusmenu libraries
+Requires:   %{name}-gtk3%{?_isa} = %{version}-%{release}
+Requires:   %{name}%{?_isa} = %{version}-%{release}
+
+%description gtk3-tests
+The %{name}-tests package contains test tools that use %{name}-gtk3.
+
 
 %prep
 %setup -q -n %{name}-%{version} -c
 
 pushd %{name}-%{version}
-%patch0 -p1
+%patch 0 -p1
 autoreconf -fiv
 popd
 
@@ -158,24 +176,36 @@ build(){
 pushd %{name}-gtk3-%{version}
 sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench
 build --with-gtk=3
+cd tests
+# Need dbus-test-runner package for other tests.
+make test-glib-simple-items
+cd ..
 popd
 
+%if %{with gtk2}
 pushd %{name}-%{version}
 sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench
 build --with-gtk=2
 popd
+%endif
 
 
 %install
 pushd %{name}-gtk3-%{version}
 %make_install
 find %{buildroot} -name '*.la' -delete
+install -pm 755 -D test-driver \
+  $RPM_BUILD_ROOT%{_libexecdir}/%{name}-gtk3/test-driver
+install -pm 755 -D tests/.libs/test-glib-simple-items \
+  $RPM_BUILD_ROOT%{_libexecdir}/%{name}-gtk3/test-glib-simple-items
 popd
 
+%if %{with gtk2}
 pushd %{name}-%{version}
 %make_install
 find %{buildroot} -name '*.la' -delete
 popd
+%endif
 
 # Let rpmbuild pick the documents in the files section
 rm -fr %{buildroot}%{_docdir}/%{name}
@@ -194,7 +224,9 @@ done
 %endif
 
 %ldconfig_scriptlets
+%if %{with gtk2}
 %ldconfig_scriptlets gtk2
+%endif
 %ldconfig_scriptlets gtk3
 %ldconfig_scriptlets jsonloader
 
@@ -228,9 +260,11 @@ done
 %{_libdir}/libdbusmenu-gtk3.so.*
 %{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib
 
+%if %{with gtk2}
 %files gtk2
 %{_libdir}/libdbusmenu-gtk.so.*
 %{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib
+%endif
 
 %files gtk3-devel
 %dir %{_includedir}/libdbusmenu-gtk3-0.4
@@ -241,6 +275,7 @@ done
 %{_datadir}/gir-1.0/DbusmenuGtk3-0.4.gir
 %{_datadir}/vala/vapi/DbusmenuGtk3-0.4.vapi
 
+%if %{with gtk2}
 %files gtk2-devel
 %dir %{_includedir}/libdbusmenu-gtk-0.4
 %dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk
@@ -249,6 +284,7 @@ done
 %{_libdir}/pkgconfig/dbusmenu-gtk-0.4.pc
 %{_datadir}/gir-1.0/DbusmenuGtk-0.4.gir
 %{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi
+%endif
 
 %files doc
 %dir %{_datadir}/gtk-doc/
@@ -260,7 +296,51 @@ done
 %dir %{_datadir}/%{name}/json/
 %{_datadir}/%{name}/json/test-gtk-label.json
 
+%files gtk3-tests
+%{_libexecdir}/%{name}-gtk3/test-glib-simple-items
+%{_libexecdir}/%{name}-gtk3/test-driver
+
 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 16.04.0-32
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Jul 12 2024 Takao Fujiwara <fujiwara@redhat.com> - 16.04.0-31
+- Remove Xvfb dependency
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 16.04.0-30
+- Bump release for June 2024 mass rebuild
+
+* Sun May 12 2024 Takao Fujiwara <fujiwara@redhat.com> - 16.04.0-29
+- Add gtk3-tests sub package
+
+* Sat May 11 2024 Takao Fujiwara <fujiwara@redhat.com> - 16.04.0-28
+- Add CI
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 16.04.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 16.04.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Nov 06 2023 Tomas Popela <tpopela@redhat.com> - 16.04.0-25
+- Drop the requirements on dbus-glib as the project was migrated to GDBus
+
+* Thu Nov 02 2023 Tomas Popela <tpopela@redhat.com> - 16.04.0-24
+- Build require GTK+ 2 conditionally (follow up fix for previous change)
+
+* Tue Oct 10 2023 Takao Fujiwara <fujiwara@redhat.com> - 16.04.0-23
+- Delete GTK2 sub packages for RHEL
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 16.04.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 16.04.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 16.04.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 16.04.0-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

sources

@@ -1 +0,0 @@
-SHA512 (libdbusmenu-16.04.0.tar.gz) = ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241