From 2244d99b7d68e8696c131abd6ac6766220d40fe8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 May 2013 19:58:26 +0000 Subject: [PATCH 01/36] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 3ac4321b243f7ce0d23cc345f6a82e2b9e7b336d Mon Sep 17 00:00:00 2001 From: Eduardo Echeverria Date: Tue, 28 May 2013 20:31:20 -0430 Subject: [PATCH 02/36] Initial import BZ #962029 --- .gitignore | 1 + libdbusmenu.spec | 256 +++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 258 insertions(+) create mode 100644 libdbusmenu.spec diff --git a/.gitignore b/.gitignore index e69de29..d6065df 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/libdbusmenu-12.10.2.tar.gz diff --git a/libdbusmenu.spec b/libdbusmenu.spec new file mode 100644 index 0000000..7ac700c --- /dev/null +++ b/libdbusmenu.spec @@ -0,0 +1,256 @@ +Name: libdbusmenu +Version: 12.10.2 +Release: 2%{?dist} +Summary: A library that pulling out some code out of indicator-applet + +# 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 +URL: https://launchpad.net/libdbusmenu +Source0: https://launchpad.net/libdbusmenu/12.10/12.10.2/+download/%{name}-%{version}.tar.gz + +BuildRequires: vala-tools vala-devel +BuildRequires: json-glib-devel +BuildRequires: chrpath +BuildRequires: intltool +BuildRequires: gobject-introspection-devel +BuildRequires: gnome-doc-utils +BuildRequires: gnome-common +BuildRequires: python +BuildRequires: glib2-devel +BuildRequires: valgrind-devel +BuildRequires: pkgconfig +BuildRequires: glibc-devel +BuildRequires: gtk3-devel +BuildRequires: gtk2-devel +BuildRequires: atk-devel + +%description +It passes a menu structure across DBus so that a program can create +a menu simply without worrying about how it is displayed on the +other side of the bus + + +%package devel +Summary: %{summary} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: dbus-glib-devel +%description devel +Development Files for %{name} + + +%package gtk2 +Summary: %{summary} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description gtk2 +Shared libraries for the %{name}-gtk2 library + +%package gtk3 +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: %{summary} + +%description gtk3 +Shared libraries for the %{name}-gtk3 library + + +%package gtk2-devel +Summary: Development files for %{name} +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}. + +%package gtk3-devel +Summary: Development files for %{name} +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 +developing applications that use %{name}. + +%package jsonloader +Summary: Test lib development files +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +%description jsonloader +It passes a menu structure across DBus so that a program can create +a menu simply without worrying about how it is displayed on the +other side of the bus + +%package jsonloader-devel +Summary: Test lib development files for %{name} +Requires: %{name}-jsonloader%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description jsonloader-devel +It passes a menu structure across DBus so that a program can create +a menu simply without worrying about how it is displayed on the +other side of the bus + +%package doc +Summary: Document files for %{name} +BuildArch: noarch +Group: Documentation +%description doc +The %{name}-doc package contains documents for +developing applications that use %{name}. + +%package tools +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Development tools for the dbusmenu libraries + +%description tools +The %{name}-tools package contains helper tools for +developing applications that use %{name}. + + +%prep +%setup -q -n %{name}-%{version} -c +cp -a %{name}-%{version}/{README,COPYING,COPYING.2.1,COPYING-GPL3,AUTHORS} . +cp -a %{name}-%{version} %{name}-gtk3-%{version} + +%build +pushd %{name}-gtk3-%{version} +sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench +export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" +%configure --disable-static --disable-scrollkeeper --with-gtk=3 --disable-dumper +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +make %{?_smp_mflags} V=1 +popd + + +pushd %{name}-%{version} +sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench +export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" +%configure --disable-static --disable-scrollkeeper --with-gtk=2 --disable-dumper +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +make %{?_smp_mflags} V=1 +popd + + +%install +pushd %{name}-gtk3-%{version} +make install DESTDIR=%{buildroot} +chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-gtk3.so.4.0.12 +chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-jsonloader.so.4.0.12 +chrpath --delete %{buildroot}%{_libexecdir}/dbusmenu-testapp + +find %{buildroot} -name '*.la' -exec rm -f {} ';' +popd + + +pushd %{name}-%{version} +make install DESTDIR=%{buildroot} +chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-gtk.so.4.0.12 +chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-jsonloader.so.4.0.12 +chrpath --delete %{buildroot}%{_libexecdir}/dbusmenu-testapp + +find %{buildroot} -name '*.la' -exec rm -f {} ';' +popd + + +# Put documentation in correct directory +install -dm755 %{buildroot}%{_docdir}/%{name}-tools-%{version}/ +mv %{buildroot}%{_docdir}/%{name}/README.dbusmenu-bench \ + %{buildroot}%{_docdir}/%{name}-tools-%{version}/ + +# Put examples in correct documentation directory +install -dm755 %{buildroot}%{_docdir}/%{name}-glib-devel-%{version}/examples/ +mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ + %{buildroot}%{_docdir}/%{name}-glib-devel-%{version}/examples/ + + +%post -p /sbin/ldconfig +%post gtk2 -p /sbin/ldconfig +%post gtk3 -p /sbin/ldconfig +%post jsonloader -p /sbin/ldconfig + +%postun -p /sbin/ldconfig +%postun gtk2 -p /sbin/ldconfig +%postun gtk3 -p /sbin/ldconfig +%postun jsonloader -p /sbin/ldconfig + +%files +%doc README COPYING COPYING.2.1 COPYING-GPL3 AUTHORS +%{_libdir}/libdbusmenu-glib.so.* +%{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib + +%files devel +%dir %{_includedir}/libdbusmenu-glib-0.4/ +%dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/ +%{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/*.h +%{_libdir}/libdbusmenu-glib.so +%{_libdir}/pkgconfig/dbusmenu-glib-0.4.pc +%{_datadir}/gir-1.0/Dbusmenu-0.4.gir +%{_datadir}/vala/vapi/Dbusmenu-0.4.vapi +%dir %{_docdir}/%{name}-glib-devel-%{version}/ +%dir %{_docdir}/%{name}-glib-devel-%{version}/examples/ +%doc %{_docdir}/%{name}-glib-devel-%{version}/examples/glib-server-nomenu.c + +%files jsonloader +%{_libdir}/libdbusmenu-jsonloader.so.* + + +%files jsonloader-devel +%dir %{_includedir}/libdbusmenu-glib-0.4/ +%dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ +%{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/*.h +%{_libdir}/libdbusmenu-jsonloader.so +%{_libdir}/pkgconfig/dbusmenu-jsonloader-0.4.pc + +%files gtk3 +%{_libdir}/libdbusmenu-gtk3.so.* +%{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib + +%files gtk2 +%{_libdir}/libdbusmenu-gtk.so.* +%{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib + + +%files gtk3-devel +%dir %{_includedir}/libdbusmenu-gtk3-0.4 +%dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk +%{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/*.h +%{_libdir}/libdbusmenu-gtk3.so +%{_libdir}/pkgconfig/dbusmenu-gtk3-0.4.pc +%{_datadir}/gir-1.0/DbusmenuGtk3-0.4.gir +%{_datadir}/vala/vapi/DbusmenuGtk3-0.4.vapi + +%files gtk2-devel +%dir %{_includedir}/libdbusmenu-gtk-0.4 +%dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk +%{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/*.h +%{_libdir}/libdbusmenu-gtk.so +%{_libdir}/pkgconfig/dbusmenu-gtk-0.4.pc +%{_datadir}/gir-1.0/DbusmenuGtk-0.4.gir +%{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi + + +%files doc +%doc README COPYING COPYING.2.1 AUTHORS +%dir %{_datadir}/gtk-doc/ +%{_datadir}/gtk-doc/* + +%files tools +%{_libexecdir}/dbusmenu-bench +%{_libexecdir}/dbusmenu-testapp +%dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/json/ +%{_datadir}/%{name}/json/test-gtk-label.json +%dir %{_docdir}/%{name}-tools-%{version}/ +%{_docdir}/%{name}-tools-%{version}/README.dbusmenu-bench + +%changelog +* Mon May 27 2013 Eduardo Echeverria - 12.10.2-2 +- Fix issues with macros-in-comment +- Fix cosmetics errors +- Workaround for the docs files +- Fix a issue with the ownership of the some directories + +* Sun Feb 17 2013 Eduardo Echeverria - 12.10.2-1 +- initial packaging diff --git a/sources b/sources index e69de29..5b19364 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e30fc986b447f62513d61225fa573a70 libdbusmenu-12.10.2.tar.gz From 4e9794303f3cd8946e277a4dc090a3fa94e6d6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sun, 2 Jun 2013 22:10:25 +0200 Subject: [PATCH 03/36] - valgrind exists only on selected arches --- libdbusmenu.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 7ac700c..257f5e4 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -1,8 +1,8 @@ Name: libdbusmenu Version: 12.10.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library that pulling out some code out of indicator-applet - + # All files installed in final rpms use C sources with dual licensing headers. # Tests compiled in the build process are licensed GPLv3 @@ -15,11 +15,14 @@ BuildRequires: json-glib-devel BuildRequires: chrpath BuildRequires: intltool BuildRequires: gobject-introspection-devel -BuildRequires: gnome-doc-utils +BuildRequires: gnome-doc-utils BuildRequires: gnome-common BuildRequires: python BuildRequires: glib2-devel +# valgrind exists only on selected arches +%ifarch %{ix86} x86_64 ppc ppc64 s390x %{arm} BuildRequires: valgrind-devel +%endif BuildRequires: pkgconfig BuildRequires: glibc-devel BuildRequires: gtk3-devel @@ -246,6 +249,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{_docdir}/%{name}-tools-%{version}/README.dbusmenu-bench %changelog +* Sun Jun 02 2013 Dan Horák - 12.10.2-3 +- valgrind exists only on selected arches + * Mon May 27 2013 Eduardo Echeverria - 12.10.2-2 - Fix issues with macros-in-comment - Fix cosmetics errors From 08b9352bf9245acbd64fcfd60c8c062540a880b6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:09:29 -0500 Subject: [PATCH 04/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 257f5e4..a056e58 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -1,6 +1,6 @@ Name: libdbusmenu Version: 12.10.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -249,6 +249,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{_docdir}/%{name}-tools-%{version}/README.dbusmenu-bench %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 12.10.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Jun 02 2013 Dan Horák - 12.10.2-3 - valgrind exists only on selected arches From bf4610f88076704dfe34eb8d0eb3dad830c35953 Mon Sep 17 00:00:00 2001 From: Eduardo Echeverria Date: Tue, 27 Aug 2013 01:26:54 -0430 Subject: [PATCH 05/36] switch to unversioned documentation directory --- libdbusmenu.spec | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index a056e58..0d3af08 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -1,6 +1,14 @@ +%if 0%{?fedora} >= 20 +%global tools_doc %{_docdir}/%{name}-tools +%global glib_doc %{_docdir}/%{name}-glib-devel +%else +%global tools_doc %{_docdir}/%{name}-tools-%{version} +%global glib_doc %{_docdir}/%{name}-glib-devel-%{version} +%endif + Name: libdbusmenu Version: 12.10.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -158,14 +166,14 @@ popd # Put documentation in correct directory -install -dm755 %{buildroot}%{_docdir}/%{name}-tools-%{version}/ +install -dm755 %{buildroot}%{tools_doc}/ mv %{buildroot}%{_docdir}/%{name}/README.dbusmenu-bench \ - %{buildroot}%{_docdir}/%{name}-tools-%{version}/ + %{buildroot}%{tools_doc} # Put examples in correct documentation directory -install -dm755 %{buildroot}%{_docdir}/%{name}-glib-devel-%{version}/examples/ +install -dm755 %{buildroot}%{glib_doc}/examples/ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ - %{buildroot}%{_docdir}/%{name}-glib-devel-%{version}/examples/ + %{buildroot}%{glib_doc}/examples/ %post -p /sbin/ldconfig @@ -191,9 +199,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{_libdir}/pkgconfig/dbusmenu-glib-0.4.pc %{_datadir}/gir-1.0/Dbusmenu-0.4.gir %{_datadir}/vala/vapi/Dbusmenu-0.4.vapi -%dir %{_docdir}/%{name}-glib-devel-%{version}/ -%dir %{_docdir}/%{name}-glib-devel-%{version}/examples/ -%doc %{_docdir}/%{name}-glib-devel-%{version}/examples/glib-server-nomenu.c +%dir %{glib_doc}/ +%dir %{glib_doc}/examples/ +%doc %{glib_doc}/examples/glib-server-nomenu.c %files jsonloader %{_libdir}/libdbusmenu-jsonloader.so.* @@ -245,10 +253,13 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/json/ %{_datadir}/%{name}/json/test-gtk-label.json -%dir %{_docdir}/%{name}-tools-%{version}/ -%{_docdir}/%{name}-tools-%{version}/README.dbusmenu-bench +%dir %{tools_doc}/ +%{tools_doc}/README.dbusmenu-bench %changelog +* Mon Aug 26 2013 Eduardo Echeverria - 12.10.2-5 +- switch to unversioned documentation directory + * Sat Aug 03 2013 Fedora Release Engineering - 12.10.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8a760c1a29d716ee24baebafd12a5ccd8db5d977 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:02:13 -0500 Subject: [PATCH 06/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 0d3af08..1199993 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -8,7 +8,7 @@ Name: libdbusmenu Version: 12.10.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -257,6 +257,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{tools_doc}/README.dbusmenu-bench %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 12.10.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Aug 26 2013 Eduardo Echeverria - 12.10.2-5 - switch to unversioned documentation directory From df5a1a6833076ee3365a99a7b395d7e420b08b67 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 22 Jul 2014 19:31:26 +0200 Subject: [PATCH 07/36] Rebuilt for gobject-introspection 1.41.4 --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 1199993..90bc6c2 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -8,7 +8,7 @@ Name: libdbusmenu Version: 12.10.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -257,6 +257,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{tools_doc}/README.dbusmenu-bench %changelog +* Tue Jul 22 2014 Kalev Lember - 12.10.2-7 +- Rebuilt for gobject-introspection 1.41.4 + * Sat Jun 07 2014 Fedora Release Engineering - 12.10.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 5a371c93158018fa28810a722d6bbc3219bcae2c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 02:51:29 +0000 Subject: [PATCH 08/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 90bc6c2..2d490c6 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -8,7 +8,7 @@ Name: libdbusmenu Version: 12.10.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -257,6 +257,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{tools_doc}/README.dbusmenu-bench %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 12.10.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 22 2014 Kalev Lember - 12.10.2-7 - Rebuilt for gobject-introspection 1.41.4 From 30ba19ea8b2f8ae7d4af34a49ca7df1ed8f6dc95 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 15:07:05 +0000 Subject: [PATCH 09/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 2d490c6..c89b16a 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -8,7 +8,7 @@ Name: libdbusmenu Version: 12.10.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -257,6 +257,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{tools_doc}/README.dbusmenu-bench %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 12.10.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 12.10.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 0db06717afc8203f0305d6834f75ee1572e0a76a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:02:32 +0000 Subject: [PATCH 10/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index c89b16a..ea7aaa4 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -8,7 +8,7 @@ Name: libdbusmenu Version: 12.10.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -257,6 +257,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{tools_doc}/README.dbusmenu-bench %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 12.10.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 12.10.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From ce229c3402d9b730e45867d0c8e038d249173bc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:31:37 +0000 Subject: [PATCH 11/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index ea7aaa4..821ad9f 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -8,7 +8,7 @@ Name: libdbusmenu Version: 12.10.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -257,6 +257,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{tools_doc}/README.dbusmenu-bench %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 12.10.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 12.10.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0b6cbc70806274acd17de1398872bd0428ce9ec9 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 16 Apr 2017 22:26:47 +0200 Subject: [PATCH 12/36] Update to 16.04.0 --- .gitignore | 1 + libdbusmenu.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d6065df..e2ab27d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libdbusmenu-12.10.2.tar.gz +/libdbusmenu-16.04.0.tar.gz diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 821ad9f..4303486 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -1,4 +1,6 @@ -%if 0%{?fedora} >= 20 +%global ubuntu_release 16.04 + +%if 0%{?fedora} %global tools_doc %{_docdir}/%{name}-tools %global glib_doc %{_docdir}/%{name}-glib-devel %else @@ -7,8 +9,8 @@ %endif Name: libdbusmenu -Version: 12.10.2 -Release: 11%{?dist} +Version: %{ubuntu_release}.0 +Release: 1%{?dist} Summary: A library that pulling out some code out of indicator-applet # All files installed in final rpms use C sources with dual licensing headers. @@ -16,7 +18,7 @@ Summary: A library that pulling out some code out of indicator-applet License: LGPLv3 or LGPLv2 and GPLv3 URL: https://launchpad.net/libdbusmenu -Source0: https://launchpad.net/libdbusmenu/12.10/12.10.2/+download/%{name}-%{version}.tar.gz +Source0: https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+download/%{name}-%{version}.tar.gz BuildRequires: vala-tools vala-devel BuildRequires: json-glib-devel @@ -257,6 +259,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{tools_doc}/README.dbusmenu-bench %changelog +* Sun Apr 16 2017 Simone Caronni - 16.04.0-1 +- Update to 16.04.0. + * Fri Feb 10 2017 Fedora Release Engineering - 12.10.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 5b19364..c915e4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e30fc986b447f62513d61225fa573a70 libdbusmenu-12.10.2.tar.gz +SHA512 (libdbusmenu-16.04.0.tar.gz) = ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241 From fc6583611aa37be52385002aeaa8dbcfda720b8d Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 16 Apr 2017 22:45:37 +0200 Subject: [PATCH 13/36] SPEC file update - Do not use chrpath for removing RPATH but regenerate configure through autotools - Do not bundle txt docs also in docs - Add license tag/docs to the libraries that are installed in any package combination - Be consistent with spaces/tabs - Update build requirements - Remove unused configure option - Simplify documentation installation - Update summaries and descriptions --- libdbusmenu.spec | 260 ++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 141 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 4303486..7f14af9 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -1,182 +1,166 @@ -%global ubuntu_release 16.04 +# Todo: build docs +# BuildRequires: gtk-doc >= 1.14 +# configure --enable-gtk-doc --enable-gtk-doc-html --enable-gtk-doc-pdf -%if 0%{?fedora} -%global tools_doc %{_docdir}/%{name}-tools -%global glib_doc %{_docdir}/%{name}-glib-devel -%else -%global tools_doc %{_docdir}/%{name}-tools-%{version} -%global glib_doc %{_docdir}/%{name}-glib-devel-%{version} -%endif +%global ubuntu_release 16.04 -Name: libdbusmenu -Version: %{ubuntu_release}.0 -Release: 1%{?dist} -Summary: A library that pulling out some code out of indicator-applet +Name: libdbusmenu +Version: %{ubuntu_release}.0 +Release: 1%{?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 -URL: https://launchpad.net/libdbusmenu -Source0: https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+download/%{name}-%{version}.tar.gz - -BuildRequires: vala-tools vala-devel -BuildRequires: json-glib-devel -BuildRequires: chrpath -BuildRequires: intltool -BuildRequires: gobject-introspection-devel -BuildRequires: gnome-doc-utils -BuildRequires: gnome-common -BuildRequires: python -BuildRequires: glib2-devel -# valgrind exists only on selected arches -%ifarch %{ix86} x86_64 ppc ppc64 s390x %{arm} -BuildRequires: valgrind-devel -%endif -BuildRequires: pkgconfig -BuildRequires: glibc-devel -BuildRequires: gtk3-devel -BuildRequires: gtk2-devel -BuildRequires: atk-devel +License: LGPLv3 or LGPLv2 and GPLv3 +URL: https://launchpad.net/libdbusmenu +Source0: https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+download/%{name}-%{version}.tar.gz + +BuildRequires: atk-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext +BuildRequires: glibc-devel +BuildRequires: gnome-common +BuildRequires: gnome-doc-utils +BuildRequires: intltool +BuildRequires: libtool +BuildRequires: libxslt +BuildRequires: pkgconfig +BuildRequires: pkgconfig(atk) +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 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.16 +BuildRequires: pkgconfig(gtk+-3.0) >= 2.91 +BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.4 +BuildRequires: pkgconfig(valgrind) +BuildRequires: pkgconfig(x11) >= 1.3 +BuildRequires: python +BuildRequires: vala-devel +BuildRequires: vala-tools %description -It passes a menu structure across DBus so that a program can create -a menu simply without worrying about how it is displayed on the -other side of the bus - +This is a small library designed to make sharing and displaying of menu +structures over DBus simple and easy to use. It works for both QT and GTK+ and +makes building menus simple. %package devel -Summary: %{summary} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: dbus-glib-devel -%description devel -Development Files for %{name} +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}. %package gtk2 -Summary: %{summary} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: %{summary} - GTK+2 version +Requires: %{name}%{?_isa} = %{version}-%{release} + %description gtk2 -Shared libraries for the %{name}-gtk2 library +Shared libraries for the %{name}-gtk2 library. %package gtk3 -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: %{summary} +Summary: %{summary} - GTK+3 version +Requires: %{name}%{?_isa} = %{version}-%{release} %description gtk3 -Shared libraries for the %{name}-gtk3 library +Shared libraries for the %{name}-gtk3 library. +%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 -%package gtk2-devel -Summary: Development files for %{name} -Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: gtk2-devel -Requires: dbus-glib-devel -%description gtk2-devel +%description gtk2-devel The %{name}-gtk2-devel package contains libraries and header files for -developing applications that use %{name}. +developing applications that use %{name}-gtk2. -%package gtk3-devel -Summary: Development files for %{name} -Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: gtk3-devel -Requires: dbus-glib-devel +%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 +%description gtk3-devel The %{name}-gtk3-devel package contains libraries and header files for -developing applications that use %{name}. +developing applications that use %{name}-gtk3. -%package jsonloader -Summary: Test lib development files -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -%description jsonloader -It passes a menu structure across DBus so that a program can create -a menu simply without worrying about how it is displayed on the -other side of the bus - -%package jsonloader-devel -Summary: Test lib development files for %{name} -Requires: %{name}-jsonloader%{?_isa} = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} -%description jsonloader-devel -It passes a menu structure across DBus so that a program can create -a menu simply without worrying about how it is displayed on the -other side of the bus - -%package doc -Summary: Document files for %{name} -BuildArch: noarch -Group: Documentation -%description doc -The %{name}-doc package contains documents for -developing applications that use %{name}. +%package jsonloader +Summary: Test lib development files +Requires: %{name}-devel%{?_isa} = %{version}-%{release} -%package tools -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Development tools for the dbusmenu libraries +%description jsonloader +Test library for %{name}. -%description tools -The %{name}-tools package contains helper tools for -developing applications that use %{name}. +%package jsonloader-devel +Summary: Test lib development files for %{name} +Requires: %{name}-jsonloader%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description jsonloader-devel +The %{name}-jsonloader-devel package contains libraries and header files for +developing applications that use %{name}-jsonloader. + +%package doc +Summary: Document files for %{name} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documents for developing applications that +use %{name}. + +%package tools +Summary: Development tools for the dbusmenu libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tools +The %{name}-tools package contains helper tools for developing applications +that use %{name}. %prep %setup -q -n %{name}-%{version} -c -cp -a %{name}-%{version}/{README,COPYING,COPYING.2.1,COPYING-GPL3,AUTHORS} . +cp -a %{name}-%{version}/{README,COPYING,COPYING.2.1,COPYING-GPL3,AUTHORS,ChangeLog} . cp -a %{name}-%{version} %{name}-gtk3-%{version} + %build +build(){ +autoreconf -vif +%configure --disable-static --disable-dumper $* +%make_build +} + pushd %{name}-gtk3-%{version} sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench -export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" -%configure --disable-static --disable-scrollkeeper --with-gtk=3 --disable-dumper -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} V=1 +build --with-gtk=3 popd - pushd %{name}-%{version} sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench -export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" -%configure --disable-static --disable-scrollkeeper --with-gtk=2 --disable-dumper -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} V=1 +build --with-gtk=2 popd %install pushd %{name}-gtk3-%{version} -make install DESTDIR=%{buildroot} -chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-gtk3.so.4.0.12 -chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-jsonloader.so.4.0.12 -chrpath --delete %{buildroot}%{_libexecdir}/dbusmenu-testapp - -find %{buildroot} -name '*.la' -exec rm -f {} ';' +%make_install +find %{buildroot} -name '*.la' -delete popd - pushd %{name}-%{version} -make install DESTDIR=%{buildroot} -chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-gtk.so.4.0.12 -chrpath --delete %{buildroot}%{_libdir}/libdbusmenu-jsonloader.so.4.0.12 -chrpath --delete %{buildroot}%{_libexecdir}/dbusmenu-testapp - -find %{buildroot} -name '*.la' -exec rm -f {} ';' +%make_install +find %{buildroot} -name '*.la' -delete popd - -# Put documentation in correct directory -install -dm755 %{buildroot}%{tools_doc}/ -mv %{buildroot}%{_docdir}/%{name}/README.dbusmenu-bench \ - %{buildroot}%{tools_doc} - -# Put examples in correct documentation directory -install -dm755 %{buildroot}%{glib_doc}/examples/ -mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ - %{buildroot}%{glib_doc}/examples/ - +# Let rpmbuild pick the documents in the files section +rm -fr %{buildroot}%{_docdir}/%{name} %post -p /sbin/ldconfig %post gtk2 -p /sbin/ldconfig @@ -188,12 +172,14 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %postun gtk3 -p /sbin/ldconfig %postun jsonloader -p /sbin/ldconfig -%files -%doc README COPYING COPYING.2.1 COPYING-GPL3 AUTHORS +%files +%license COPYING COPYING.2.1 COPYING-GPL3 +%doc README AUTHORS ChangeLog %{_libdir}/libdbusmenu-glib.so.* %{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib %files devel +%doc %{name}-%{version}/tests/glib-server-nomenu.c %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/*.h @@ -201,14 +187,10 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{_libdir}/pkgconfig/dbusmenu-glib-0.4.pc %{_datadir}/gir-1.0/Dbusmenu-0.4.gir %{_datadir}/vala/vapi/Dbusmenu-0.4.vapi -%dir %{glib_doc}/ -%dir %{glib_doc}/examples/ -%doc %{glib_doc}/examples/glib-server-nomenu.c %files jsonloader %{_libdir}/libdbusmenu-jsonloader.so.* - %files jsonloader-devel %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ @@ -224,7 +206,6 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{_libdir}/libdbusmenu-gtk.so.* %{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib - %files gtk3-devel %dir %{_includedir}/libdbusmenu-gtk3-0.4 %dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk @@ -243,20 +224,17 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \ %{_datadir}/gir-1.0/DbusmenuGtk-0.4.gir %{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi - -%files doc -%doc README COPYING COPYING.2.1 AUTHORS +%files doc %dir %{_datadir}/gtk-doc/ %{_datadir}/gtk-doc/* %files tools +%doc %{name}-%{version}/tools/README.dbusmenu-bench %{_libexecdir}/dbusmenu-bench %{_libexecdir}/dbusmenu-testapp %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/json/ %{_datadir}/%{name}/json/test-gtk-label.json -%dir %{tools_doc}/ -%{tools_doc}/README.dbusmenu-bench %changelog * Sun Apr 16 2017 Simone Caronni - 16.04.0-1 From 53a788177165a0295338eb9a98c3b7711c3a4250 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 17 Apr 2017 11:39:34 +0200 Subject: [PATCH 14/36] Add testsuite (disabled for now) --- libdbusmenu.spec | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 7f14af9..a112111 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -4,9 +4,12 @@ %global ubuntu_release 16.04 +# Set to 1 to run testsuite +%global with_tests 0 + Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -35,12 +38,19 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10 BuildRequires: pkgconfig(gtk+-2.0) >= 2.16 BuildRequires: pkgconfig(gtk+-3.0) >= 2.91 BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.4 -BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(x11) >= 1.3 BuildRequires: python BuildRequires: vala-devel BuildRequires: vala-tools +# pkgconfig file is checked for valgrind, but is actually only used for tests +# https://bugzilla.redhat.com/show_bug.cgi?id=1262274 +# BuildRequires: pkgconfig(valgrind) +%if 0%{?with_tests} +BuildRequires: dbus-test-runner +BuildRequires: valgrind +%endif + %description This is a small library designed to make sharing and displaying of menu structures over DBus simple and easy to use. It works for both QT and GTK+ and @@ -162,6 +172,15 @@ popd # Let rpmbuild pick the documents in the files section rm -fr %{buildroot}%{_docdir}/%{name} +%if 0%{?with_tests} +%check +for variant in %{name}-gtk3-%{version} %{name}-%{version}; do + pushd $variant + make check V=1 + popd +done +%endif + %post -p /sbin/ldconfig %post gtk2 -p /sbin/ldconfig %post gtk3 -p /sbin/ldconfig @@ -237,6 +256,10 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Mon Apr 17 2017 Simone Caronni - 16.04.0-2 +- Add tests, remove valgrind-devel build requirements (#1262274). +- Disable tests until dbus-test-runner is available. + * Sun Apr 16 2017 Simone Caronni - 16.04.0-1 - Update to 16.04.0. From 6398af0c5b93e08518da343218811215f90812f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:42:21 +0000 Subject: [PATCH 15/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index a112111..d7519bb 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -256,6 +256,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 16.04.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Apr 17 2017 Simone Caronni - 16.04.0-2 - Add tests, remove valgrind-devel build requirements (#1262274). - Disable tests until dbus-test-runner is available. From f9c5dfe1f838a3f14990b8e5b2d07a923253f89b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:20:16 +0000 Subject: [PATCH 16/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index d7519bb..e5fe05e 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -256,6 +256,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 16.04.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 16.04.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 080aefd6b3b24a907193b67dec5b15e184b4a363 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:26:12 +0000 Subject: [PATCH 17/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index e5fe05e..53fdaea 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -256,6 +256,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 16.04.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 16.04.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 29395ee1147d8d592b1fdd6769c1841cd8b36632 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 7 Feb 2018 23:59:40 +0100 Subject: [PATCH 18/36] Update Python 2 dependency declarations to new packaging standards --- libdbusmenu.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 53fdaea..fc7ead2 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -39,7 +39,7 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.16 BuildRequires: pkgconfig(gtk+-3.0) >= 2.91 BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.4 BuildRequires: pkgconfig(x11) >= 1.3 -BuildRequires: python +BuildRequires: python2 BuildRequires: vala-devel BuildRequires: vala-tools @@ -256,6 +256,10 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Wed Feb 07 2018 Iryna Shcherbina - 16.04.0-6 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 16.04.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 7474cb709032340703edd690915a0c52558b82ea Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 25 May 2018 09:27:04 +0200 Subject: [PATCH 19/36] Fix requires of the jsonloader subpackage --- libdbusmenu.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index fc7ead2..e91b5b6 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -104,6 +104,7 @@ developing applications that use %{name}-gtk3. %package jsonloader Summary: Test lib development files Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: libdbusmenu = %{version}-%{release} %description jsonloader Test library for %{name}. From 81cf3427f6448d91501468bbd09e9a9e6cddef20 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 25 May 2018 09:27:17 +0200 Subject: [PATCH 20/36] Move to ldconfig_scriptlets --- libdbusmenu.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index e91b5b6..4848528 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -182,15 +182,10 @@ for variant in %{name}-gtk3-%{version} %{name}-%{version}; do done %endif -%post -p /sbin/ldconfig -%post gtk2 -p /sbin/ldconfig -%post gtk3 -p /sbin/ldconfig -%post jsonloader -p /sbin/ldconfig - -%postun -p /sbin/ldconfig -%postun gtk2 -p /sbin/ldconfig -%postun gtk3 -p /sbin/ldconfig -%postun jsonloader -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets gtk2 +%ldconfig_scriptlets gtk3 +%ldconfig_scriptlets jsonloader %files %license COPYING COPYING.2.1 COPYING-GPL3 From 396e0df93d0c78ace903ded6622a8b83b0866ae7 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 2 Jul 2018 19:06:01 +0200 Subject: [PATCH 21/36] Remove gnome-doc-utils build dependency --- libdbusmenu.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 4848528..7d221ab 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -25,7 +25,6 @@ BuildRequires: automake BuildRequires: gettext BuildRequires: glibc-devel BuildRequires: gnome-common -BuildRequires: gnome-doc-utils BuildRequires: intltool BuildRequires: libtool BuildRequires: libxslt @@ -252,6 +251,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Mon Jul 02 2018 Charalampos Stratakis - 16.04.0-7 +- Remove gnome-doc-utils build dependency + * Wed Feb 07 2018 Iryna Shcherbina - 16.04.0-6 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 787fb37cf8a38565413457fce4bc692e1f3a8b2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:58:22 +0000 Subject: [PATCH 22/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 7d221ab..e73a0a5 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -251,6 +251,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 16.04.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 02 2018 Charalampos Stratakis - 16.04.0-7 - Remove gnome-doc-utils build dependency From 6528c156a1518e6e1252c4d2b1398bc91496933e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:55:27 +0000 Subject: [PATCH 23/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index e73a0a5..eb14d2a 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -251,6 +251,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 16.04.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 16.04.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 53c0e1141af2bda56ae28ad547ce1ceb085d038e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 4 Feb 2019 12:55:50 +0100 Subject: [PATCH 24/36] Update BRs for vala packaging changes --- libdbusmenu.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index eb14d2a..43e80b5 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -39,8 +39,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 2.91 BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.4 BuildRequires: pkgconfig(x11) >= 1.3 BuildRequires: python2 -BuildRequires: vala-devel -BuildRequires: vala-tools +BuildRequires: vala # pkgconfig file is checked for valgrind, but is actually only used for tests # https://bugzilla.redhat.com/show_bug.cgi?id=1262274 @@ -251,6 +250,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Mon Feb 04 2019 Kalev Lember - 16.04.0-10 +- Update BRs for vala packaging changes + * Fri Feb 01 2019 Fedora Release Engineering - 16.04.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 34c81ab0e32d43810f28696e3bcd09f16fa4f927 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 26 Feb 2019 14:29:27 +0100 Subject: [PATCH 25/36] Explicitly enable gobject-introspection support This fixes the flatpak module build, working around a configure.ac bug where it doesn't correctly detect the gir directory prefix when using autodetection, but works when explicitly enabling it. --- libdbusmenu.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 43e80b5..e86f740 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -142,7 +142,7 @@ cp -a %{name}-%{version} %{name}-gtk3-%{version} %build build(){ autoreconf -vif -%configure --disable-static --disable-dumper $* +%configure --disable-static --disable-dumper --enable-introspection $* %make_build } @@ -250,6 +250,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Tue Feb 26 2019 Kalev Lember - 16.04.0-11 +- Explicitly enable gobject-introspection support + * Mon Feb 04 2019 Kalev Lember - 16.04.0-10 - Update BRs for vala packaging changes From f006a4ec2145700735dc3995d1ae52c1668bcd82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:03:24 +0000 Subject: [PATCH 26/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index e86f740..1a8c331 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -250,6 +250,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 16.04.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 26 2019 Kalev Lember - 16.04.0-11 - Explicitly enable gobject-introspection support From 3f1b70600822e940cb5d7b65a21c433a868349a8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 9 Sep 2019 15:52:16 +0200 Subject: [PATCH 27/36] remove -Werror flag to fix build on fedora 31+ --- 00-no-werror.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++ libdbusmenu.spec | 13 +++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 00-no-werror.patch diff --git a/00-no-werror.patch b/00-no-werror.patch new file mode 100644 index 0000000..50ba4f1 --- /dev/null +++ b/00-no-werror.patch @@ -0,0 +1,52 @@ +diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am +index 2dea5f6..01832ce 100644 +--- a/libdbusmenu-glib/Makefile.am ++++ b/libdbusmenu-glib/Makefile.am +@@ -66,7 +66,7 @@ libdbusmenu_glib_la_LDFLAGS = \ + libdbusmenu_glib_la_CFLAGS = \ + $(DBUSMENUGLIB_CFLAGS) \ + $(COVERAGE_CFLAGS) \ +- -Wall -Werror -Wno-error=deprecated-declarations \ ++ -Wall -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\"" + + libdbusmenu_glib_la_LIBADD = \ +diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am +index 9a7a2b0..a9a2b49 100644 +--- a/libdbusmenu-gtk/Makefile.am ++++ b/libdbusmenu-gtk/Makefile.am +@@ -66,7 +66,7 @@ libdbusmenu_gtk_la_CFLAGS = \ + $(DBUSMENUGTK_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -I$(top_srcdir) \ +- -Wall -Werror -Wno-error=deprecated-declarations \ ++ -Wall -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" + + libdbusmenu_gtk_la_LIBADD = \ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 64e3e75..699c2c9 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -103,7 +103,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b + ############################################ + + DBUSMENU_GLIB_TEST_CFLAGS = \ +- -Wall -Werror \ ++ -Wall \ + -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + $(DBUSMENUTESTS_CFLAGS) \ +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 029b73e..2258cca 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -16,7 +16,7 @@ dbusmenu_dumper_CFLAGS = \ + -I $(srcdir)/.. \ + $(DBUSMENUGLIB_CFLAGS) \ + $(DBUSMENUDUMPER_CFLAGS) \ +- -Wall -Werror ++ -Wall + + dbusmenu_dumper_LDADD = \ + ../libdbusmenu-glib/libdbusmenu-glib.la \ diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 1a8c331..8e2506b 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -19,6 +19,9 @@ License: LGPLv3 or LGPLv2 and GPLv3 URL: https://launchpad.net/libdbusmenu Source0: https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+download/%{name}-%{version}.tar.gz +# patch to remove -Werror flag - fixes build despite usage of deprecated things +Patch0: 00-no-werror.patch + BuildRequires: atk-devel BuildRequires: autoconf BuildRequires: automake @@ -135,6 +138,11 @@ that use %{name}. %prep %setup -q -n %{name}-%{version} -c + +pushd %{name}-%{version} +%patch0 -p1 +popd + cp -a %{name}-%{version}/{README,COPYING,COPYING.2.1,COPYING-GPL3,AUTHORS,ChangeLog} . cp -a %{name}-%{version} %{name}-gtk3-%{version} @@ -250,6 +258,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Mon Sep 09 2019 Fabio Valentini - 16.04.0-13 +- Remove -Werror flag to fix build despite usage of deprecated things. + * Thu Jul 25 2019 Fedora Release Engineering - 16.04.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 235f03f46469e661dc2d0700aa8e3fe2bcb6303f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 9 Sep 2019 16:14:51 +0200 Subject: [PATCH 28/36] remove benchmarking tool, drop python2 dependency --- libdbusmenu.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 8e2506b..008a9cf 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -41,7 +41,6 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.16 BuildRequires: pkgconfig(gtk+-3.0) >= 2.91 BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.4 BuildRequires: pkgconfig(x11) >= 1.3 -BuildRequires: python2 BuildRequires: vala # pkgconfig file is checked for valgrind, but is actually only used for tests @@ -49,6 +48,7 @@ BuildRequires: vala # BuildRequires: pkgconfig(valgrind) %if 0%{?with_tests} BuildRequires: dbus-test-runner +BuildRequires: python2 BuildRequires: valgrind %endif @@ -179,6 +179,10 @@ popd # Let rpmbuild pick the documents in the files section rm -fr %{buildroot}%{_docdir}/%{name} +# Remove benchmarking tool written in python2 +rm %{buildroot}/%{_libexecdir}/dbusmenu-bench + + %if 0%{?with_tests} %check for variant in %{name}-gtk3-%{version} %{name}-%{version}; do @@ -250,14 +254,15 @@ done %{_datadir}/gtk-doc/* %files tools -%doc %{name}-%{version}/tools/README.dbusmenu-bench -%{_libexecdir}/dbusmenu-bench %{_libexecdir}/dbusmenu-testapp %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/json/ %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Mon Sep 09 2019 Fabio Valentini - 16.04.0-14 +- Remove benchmarking tool, drop python2 dependency. + * Mon Sep 09 2019 Fabio Valentini - 16.04.0-13 - Remove -Werror flag to fix build despite usage of deprecated things. From 01c24ec32860113e091e6d6222197e0051be0483 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:53:00 +0000 Subject: [PATCH 29/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 008a9cf..32c697c 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -260,6 +260,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 16.04.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Sep 09 2019 Fabio Valentini - 16.04.0-14 - Remove benchmarking tool, drop python2 dependency. From 58389449934c56b104a0b02aed2bbe27a52a43cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:28:05 +0000 Subject: [PATCH 30/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 32c697c..86bd72e 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -260,6 +260,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 16.04.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 16.04.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 22b5dbabcacbad0901182a27710f160d6c48fe2a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 01:01:28 +0000 Subject: [PATCH 31/36] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libdbusmenu.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 86bd72e..9267188 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -22,6 +22,7 @@ Source0: https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+down # patch to remove -Werror flag - fixes build despite usage of deprecated things Patch0: 00-no-werror.patch +BuildRequires: make BuildRequires: atk-devel BuildRequires: autoconf BuildRequires: automake From fccfb3f8eb890656e8eeda5cd20147f42ddf04db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:53:05 +0000 Subject: [PATCH 32/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 9267188..425baa5 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -261,6 +261,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 16.04.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 16.04.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6c151ecc3a565787d95a23ee08b07129bc5301d5 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 25 Mar 2021 14:28:56 +0000 Subject: [PATCH 33/36] Fix gtk-doc autoreconf issue --- libdbusmenu.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 425baa5..1e7ffa2 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -28,7 +28,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext BuildRequires: glibc-devel -BuildRequires: gnome-common +BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libtool BuildRequires: libxslt @@ -142,6 +142,7 @@ that use %{name}. pushd %{name}-%{version} %patch0 -p1 +autoreconf -fiv popd cp -a %{name}-%{version}/{README,COPYING,COPYING.2.1,COPYING-GPL3,AUTHORS,ChangeLog} . @@ -150,7 +151,6 @@ cp -a %{name}-%{version} %{name}-gtk3-%{version} %build build(){ -autoreconf -vif %configure --disable-static --disable-dumper --enable-introspection $* %make_build } From a593ddafcc9224800742834dbf6bbb8e54aaa2c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:11:09 +0000 Subject: [PATCH 34/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 1e7ffa2..3bfd466 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -261,6 +261,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 16.04.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 16.04.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6b7979f1dec0bef48cb0f52d806570104f66d13b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:00:21 +0000 Subject: [PATCH 35/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdbusmenu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdbusmenu.spec b/libdbusmenu.spec index 3bfd466..f7c36d5 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -9,7 +9,7 @@ Name: libdbusmenu Version: %{ubuntu_release}.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Library for passing menus over DBus # All files installed in final rpms use C sources with dual licensing headers. @@ -261,6 +261,9 @@ done %{_datadir}/%{name}/json/test-gtk-label.json %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 16.04.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 16.04.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7d0b1024cb4a30ba65db1134c515434582f8bae3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:00:41 +0300 Subject: [PATCH 36/36] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index c915e4c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libdbusmenu-16.04.0.tar.gz) = ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241