From f4d1972311a656bb49de45beb31a4904fde1e15f1044d83eefcc7bc2915e2f6d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 14 Oct 2014 09:27:52 +0000 Subject: [PATCH] Accepting request 256094 from GNOME:Next - Update to version 0.3.0.git.20141013.6d59429: + Allow to merge icons into appstream xml. Comes in handy for OBS, where we generate an appstream with embedded icons. - Add gobject-introspection-devel BuildRequires: dependency to bootstrap the tarball. - Add gnome-common BuildRequires and call to autogen.sh: needed, as we are currently packaging a git snapshot. - Add libyaml-devel BuildRequires: new dependency. - Split new subpackages typelib-1_0-AppstreamBuilder-1_0 and typelib-1_0-AppstreamGlib-1_0. - Rename libappstream-builder1 to libappstream-builder7 and libappstream-glib1 to libappstream-glib7, following upstreams soname change. OBS-URL: https://build.opensuse.org/request/show/256094 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=7 --- _service | 12 ++++ appstream-glib-0.2.6.tar.xz | 3 - ...eam-glib-0.3.0.git.20141013.6d59429.tar.xz | 3 + appstream-glib.changes | 17 +++++ appstream-glib.spec | 67 ++++++++++++++----- 5 files changed, 84 insertions(+), 18 deletions(-) create mode 100644 _service delete mode 100644 appstream-glib-0.2.6.tar.xz create mode 100644 appstream-glib-0.3.0.git.20141013.6d59429.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..3bf82a9 --- /dev/null +++ b/_service @@ -0,0 +1,12 @@ + + + https://github.com/hughsie/appstream-glib.git + git + 0.3.0.git.%cd.%h + + + *.tar + xz + + + diff --git a/appstream-glib-0.2.6.tar.xz b/appstream-glib-0.2.6.tar.xz deleted file mode 100644 index cd8780d..0000000 --- a/appstream-glib-0.2.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b753307f2d3d9a25173f4d3dfe60f9281e29fb4c9542d80c81748f46c822992b -size 1536708 diff --git a/appstream-glib-0.3.0.git.20141013.6d59429.tar.xz b/appstream-glib-0.3.0.git.20141013.6d59429.tar.xz new file mode 100644 index 0000000..3f98e12 --- /dev/null +++ b/appstream-glib-0.3.0.git.20141013.6d59429.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12539ad9be1e425f9809752d00bfc1f32868eb2d769607abe4fc81ddcf01f349 +size 1788424 diff --git a/appstream-glib.changes b/appstream-glib.changes index 9d23a15..f9253c2 100644 --- a/appstream-glib.changes +++ b/appstream-glib.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Oct 13 21:08:21 UTC 2014 - dimstar@opensuse.org + +- Update to version 0.3.0.git.20141013.6d59429: + + Allow to merge icons into appstream xml. Comes in handy for + OBS, where we generate an appstream with embedded icons. +- Add gobject-introspection-devel BuildRequires: dependency to + bootstrap the tarball. +- Add gnome-common BuildRequires and call to autogen.sh: needed, as + we are currently packaging a git snapshot. +- Add libyaml-devel BuildRequires: new dependency. +- Split new subpackages typelib-1_0-AppstreamBuilder-1_0 and + typelib-1_0-AppstreamGlib-1_0. +- Rename libappstream-builder1 to libappstream-builder7 and + libappstream-glib1 to libappstream-glib7, following upstreams + soname change. + ------------------------------------------------------------------- Wed Oct 8 15:16:28 UTC 2014 - dimstar@opensuse.org diff --git a/appstream-glib.spec b/appstream-glib.spec index 548850a..b2b7cff 100644 --- a/appstream-glib.spec +++ b/appstream-glib.spec @@ -18,14 +18,19 @@ Name: appstream-glib -Version: 0.2.6 +Version: 0.3.0.git.20141013.6d59429 Release: 0 Summary: AppStream Abstraction Library License: LGPL-2.1+ Group: System/Libraries Url: http://people.freedesktop.org/~hughsient/appstream-glib/ -Source: http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz +# This is a git snapshot, extracted using _service +Source: %{name}-%{version}.tar.xz +#Source: http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz +BuildRequires: gnome-common +BuildRequires: gobject-introspection-devel BuildRequires: intltool >= 0.40.0 +BuildRequires: libyaml-devel BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.14 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -53,11 +58,11 @@ What this library allows you to do: * Easily retrieve the best application data for the current locale * Efficiently interface with more heavy-weight parsers like expat -%package -n libappstream-glib1 +%package -n libappstream-glib7 Summary: AppStream Abstraction Library Group: System/Libraries -%description -n libappstream-glib1 +%description -n libappstream-glib7 This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. It also provides a simple DOM implementation that makes it easy to edit nodes and convert to and from the standardized XML representation. @@ -70,11 +75,11 @@ What this library allows you to do: * Easily retrieve the best application data for the current locale * Efficiently interface with more heavy-weight parsers like expat -%package -n libappstream-builder1 +%package -n libappstream-builder7 Summary: AppStream Abstraction Library Group: System/Libraries -%description -n libappstream-builder1 +%description -n libappstream-builder7 This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. It also provides a simple DOM implementation that makes it easy to edit nodes and convert to and from the standardized XML representation. @@ -87,11 +92,31 @@ What this library allows you to do: * Easily retrieve the best application data for the current locale * Efficiently interface with more heavy-weight parsers like expat +%package -n typelib-1_0-AppStreamBuilder-1_0 +Summary: AppStream Abstraction Library -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-AppStreamBuilder-1_0 +This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. +It also provides a simple DOM implementation that makes it easy to edit nodes and +convert to and from the standardized XML representation. + +%package -n typelib-1_0-AppStreamGlib-1_0 +Summary: AppStream Abstraction Library -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-AppStreamGlib-1_0 +This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. +It also provides a simple DOM implementation that makes it easy to edit nodes and +convert to and from the standardized XML representation. + %package devel Summary: AppStream Abstraction Library -- Development files Group: Development/Languages/C and C++ -Requires: libappstream-builder1 = %{version} -Requires: libappstream-glib1 = %{version} +Requires: libappstream-builder7 = %{version} +Requires: libappstream-glib7 = %{version} +Requires: typelib-1_0-AppStreamBuilder-1_0 = %{version} +Requires: typelib-1_0-AppStreamGlib-1_0 = %{version} %description devel This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. @@ -111,6 +136,7 @@ What this library allows you to do: %setup -q %build +NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ --enable-rpm @@ -123,13 +149,13 @@ rm %{buildroot}%{_datadir}/installed-tests/appstream-glib/*.test find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} -%post -n libappstream-glib1 -p /sbin/ldconfig +%post -n libappstream-glib7 -p /sbin/ldconfig -%postun -n libappstream-glib1 -p /sbin/ldconfig +%postun -n libappstream-glib7 -p /sbin/ldconfig -%post -n libappstream-builder1 -p /sbin/ldconfig +%post -n libappstream-builder7 -p /sbin/ldconfig -%postun -n libappstream-builder1 -p /sbin/ldconfig +%postun -n libappstream-builder7 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -138,27 +164,38 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/bash-completion/completions/appstream-builder %{_datadir}/bash-completion/completions/appstream-util %{_libdir}/asb-plugins/ +%{_mandir}/man1/appstream-builder.1%{?ext_man} +%{_mandir}/man1/appstream-util.1%{?ext_man} -%files -n libappstream-builder1 +%files -n libappstream-builder7 %defattr(-,root,root) %doc COPYING %{_libdir}/libappstream-builder.so.* -%files -n libappstream-glib1 +%files -n libappstream-glib7 %defattr(-,root,root) %doc COPYING %{_libdir}/libappstream-glib.so.* +%files -n typelib-1_0-AppStreamBuilder-1_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/AppStreamBuilder-1.0.typelib + +%files -n typelib-1_0-AppStreamGlib-1_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/AppStreamGlib-1.0.typelib + %files devel %defattr(-,root,root) %{_includedir}/libappstream-builder/ %{_includedir}/libappstream-glib/ %{_datadir}/aclocal/appstream-xml.m4 -%{_datadir}/gtk-doc/html/appstream-glib/ %{_libdir}/pkgconfig/appstream-builder.pc %{_libdir}/pkgconfig/appstream-glib.pc %{_libdir}/libappstream-builder.so %{_libdir}/libappstream-glib.so +%{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir +%{_datadir}/gir-1.0/AppStreamGlib-1.0.gir %files lang -f %{name}.lang %defattr(-,root,root)