From fc3c44274fe807ff6e0db700533f58d600f8c9ca Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 7 Jun 2019 22:09:05 +0200 Subject: [PATCH] - updated to 0.7.15 - updated rpm5 patch - removed outdated pc patch - libappstream-builder as public library is gone --- appstream-glib-pc.patch | 10 -------- appstream-glib-rpm5.patch | 12 +++++++++ appstream-glib.spec | 54 ++++----------------------------------- 3 files changed, 17 insertions(+), 59 deletions(-) delete mode 100644 appstream-glib-pc.patch diff --git a/appstream-glib-pc.patch b/appstream-glib-pc.patch deleted file mode 100644 index 8c981a6..0000000 --- a/appstream-glib-pc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- appstream-glib-0.7.8/libappstream-builder/meson.build.orig 2018-04-20 12:37:25.000000000 +0200 -+++ appstream-glib-0.7.8/libappstream-builder/meson.build 2018-04-26 19:40:39.465141422 +0200 -@@ -79,6 +79,7 @@ - version : as_version, - libraries : asbuilder, - requires : [ -+ 'appstream-glib', - 'glib-2.0', - 'gobject-2.0', - 'gdk-pixbuf-2.0', diff --git a/appstream-glib-rpm5.patch b/appstream-glib-rpm5.patch index a6614fb..5d48270 100644 --- a/appstream-glib-rpm5.patch +++ b/appstream-glib-rpm5.patch @@ -1,3 +1,15 @@ +--- appstream-glib-0.7.15/libappstream-glib/as-utils.c.orig 2019-02-28 13:26:26.000000000 +0100 ++++ appstream-glib-0.7.15/libappstream-glib/as-utils.c 2019-06-07 21:39:27.631669049 +0200 +@@ -27,7 +27,8 @@ + #include + + #ifdef HAVE_RPM +-#include ++#include ++#include + #endif + + #include "as-app-private.h" --- appstream-glib-0.6.9/libappstream-builder/asb-package-rpm.c.orig 2016-11-30 11:07:39.000000000 +0100 +++ appstream-glib-0.6.9/libappstream-builder/asb-package-rpm.c 2017-03-04 07:59:10.334045621 +0100 @@ -33,7 +33,7 @@ diff --git a/appstream-glib.spec b/appstream-glib.spec index a877900..aef9927 100644 --- a/appstream-glib.spec +++ b/appstream-glib.spec @@ -7,15 +7,14 @@ Summary: GLib Objects and helper methods for reading and writing AppStream metadata Summary(pl.UTF-8): Obiekty GLiba i metody pomocnicze do odczytu i zapisu metadanych AppStream Name: appstream-glib -Version: 0.7.14 +Version: 0.7.15 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: https://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz -# Source0-md5: 48811c1105ce8b37ac274c6bf101075b +# Source0-md5: 51f15108d6b9224f2ce2cf9364403b10 Patch0: %{name}-rpm5.patch Patch1: %{name}-stemmer.patch -Patch2: %{name}-pc.patch URL: https://people.freedesktop.org/~hughsient/appstream-glib/ %{?with_alpm:BuildRequires: alpm-devel} BuildRequires: docbook-dtd43-xml @@ -78,6 +77,8 @@ Requires: gdk-pixbuf2-devel >= 2.31.5 Requires: glib2-devel >= 1:2.45.8 Requires: libarchive-devel Requires: libuuid-devel +Obsoletes: appstream-builder-devel < 0.7.15 +Obsoletes: appstream-builder-static < 0.7.15 %description devel Header files for appstream-glib library. @@ -137,31 +138,6 @@ AppStreamBuilder library to create AppStream metadata from packages. %description -n appstream-builder -l pl.UTF-8 Biblioteka AppStreamBuilder tworząca metadane AppStream z pakietów. -%package -n appstream-builder-devel -Summary: Header files for AppStreamBuilder library -Summary(pl.UTF-8): Pliki nagłówkowe biblioteki AppStreamBuilder -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: appstream-builder = %{version}-%{release} - -%description -n appstream-builder-devel -Header files for AppStreamBuilder library. - -%description -n appstream-builder-devel -l pl.UTF-8 -Pliki nagłówkowe biblioteki AppStreamBuilder. - -%package -n appstream-builder-static -Summary: Static AppStreamBuilder library -Summary(pl.UTF-8): Statyczna biblioteka AppStreamBuilder -Group: Development/Libraries -Requires: appstream-builder-devel = %{version}-%{release} - -%description -n appstream-builder-static -Static AppStreamBuilder library. - -%description -n appstream-builder-static -l pl.UTF-8 -Statyczna biblioteka AppStreamBuilder. - %package -n bash-completion-appstream-builder Summary: Bash completion for appstream-builder package Summary(pl.UTF-8): Bashowe dopełnianie składni dla pakietu appstream-builder @@ -179,10 +155,9 @@ Bashowe dopełnianie składni polecenia appstream-builder. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %if %{with static_libs} -%{__sed} -i -e 's/shared_library/library/' libappstream-{builder,glib}/meson.build +%{__sed} -i -e 's/shared_library/library/' libappstream-glib/meson.build %endif %build @@ -211,9 +186,6 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n appstream-builder -p /sbin/ldconfig -%postun -n appstream-builder -p /sbin/ldconfig - %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS MAINTAINERS NEWS README.md @@ -251,9 +223,6 @@ rm -rf $RPM_BUILD_ROOT %files -n appstream-builder %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/appstream-builder -%attr(755,root,root) %{_libdir}/libappstream-builder.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libappstream-builder.so.8 -%{_libdir}/girepository-1.0/AppStreamBuilder-1.0.typelib %dir %{_libdir}/asb-plugins-5 %attr(755,root,root) %{_libdir}/asb-plugins-5/libasb_plugin_appdata.so %attr(755,root,root) %{_libdir}/asb-plugins-5/libasb_plugin_desktop.so @@ -264,19 +233,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/asb-plugins-5/libasb_plugin_shell_extension.so %{_mandir}/man1/appstream-builder.1* -%files -n appstream-builder-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libappstream-builder.so -%{_includedir}/libappstream-builder -%{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir -%{_pkgconfigdir}/appstream-builder.pc - -%if %{with static_libs} -%files -n appstream-builder-static -%defattr(644,root,root,755) -%{_libdir}/libappstream-builder.a -%endif - %files -n bash-completion-appstream-builder %defattr(644,root,root,755) %{bash_compdir}/appstream-builder -- 2.44.0