- updated to 0.6.9

- updated rpm5 patch

diff --git a/appstream-glib-rpm5.patch b/appstream-glib-rpm5.patch
index 87c269355332aba1582fc302da83acbcdd089ee5..dd530f2416389e3ec804c2fc7dbbd3c9a9552e47 100644 (file)
--- a/appstream-glib-rpm5.patch
+++ b/appstream-glib-rpm5.patch
@@ -1,22 +1,14 @@
---- appstream-glib-0.2.0/libappstream-builder/Makefile.am.orig 2014-06-19 10:09:35.000000000 +0200
-+++ appstream-glib-0.2.0/libappstream-builder/Makefile.am      2014-06-21 22:26:16.105266525 +0200
-@@ -66,6 +66,7 @@
- 
- libappstream_builder_la_LIBADD =                              \
-       $(AS_GLIB_LIBS)                                         \
-+      $(LIBARCHIVE_LIBS)                                      \
-       $(RPM_LIBS)                                             \
-       $(GLIB_LIBS)
- 
-@@ -76,6 +77,7 @@
+--- appstream-glib-0.6.9/libappstream-builder/Makefile.am.orig 2016-08-24 13:20:19.000000000 +0200
++++ appstream-glib-0.6.9/libappstream-builder/Makefile.am      2017-03-04 08:00:55.814044416 +0100
+@@ -90,6 +90,7 @@ libappstream_builder_la_LDFLAGS =                            \
        -export-symbols-regex '^asb_.*'
  
  libappstream_builder_la_CFLAGS =                              \
-+        $(RPM_CFLAGS)                                         \
-       $(WARNINGFLAGS_C)
++      $(RPM_CFLAGS)                                           \
+       $(WARN_CFLAGS)
  
- if HAVE_INTROSPECTION
-@@ -107,11 +109,6 @@
+ check_PROGRAMS =                                              \
+@@ -133,11 +134,6 @@ AppStreamBuilder_1_0_gir_LIBS =                                   \
        $(AS_GLIB_LIBS)                                         \
        libappstream-builder.la                                 \
        archive
@@ -28,8 +20,8 @@
  AppStreamBuilder_1_0_gir_FILES = $(introspection_sources)
  INTROSPECTION_GIRS += AppStreamBuilder-1.0.gir
  
---- appstream-glib-0.3.4/libappstream-builder/asb-package-rpm.c.orig   2014-12-22 17:02:12.000000000 +0100
-+++ appstream-glib-0.3.4/libappstream-builder/asb-package-rpm.c        2015-01-20 18:51:42.939675985 +0100
+--- 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 @@
  #include <archive.h>
  #include <archive_entry.h>
@@ -38,8 +30,8 @@
 +#include <rpm/rpm46compat.h>
  #include <rpm/rpmts.h>
  
- #include "as-cleanup.h"
-@@ -225,6 +225,36 @@ asb_package_rpm_set_source (AsbPackage *
+ #include "asb-package-rpm.h"
+@@ -132,6 +132,36 @@ asb_package_rpm_set_source (AsbPackage *
        asb_package_set_source_pkgname (pkg, srcrpm);
  }
  
@@ -73,10 +65,10 @@
 +#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
 +#define       _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
 +
- /**
-  * asb_package_rpm_ensure_nevra:
-  **/
-@@ -235,7 +265,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
+ static gboolean
+ asb_package_rpm_ensure_nevra (AsbPackage *pkg, GError **error)
+ {
+@@ -139,7 +169,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
        AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
        rpmtd td;
  
@@ -85,16 +77,16 @@
        headerGet (priv->h, RPMTAG_NAME, td, HEADERGET_MINMEM);
        asb_package_set_name (pkg, rpmtdGetString (td));
        headerGet (priv->h, RPMTAG_VERSION, td, HEADERGET_MINMEM);
-@@ -246,7 +276,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
+@@ -150,7 +180,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
        asb_package_set_arch (pkg, rpmtdGetString (td));
        headerGet (priv->h, RPMTAG_EPOCH, td, HEADERGET_MINMEM);
-       asb_package_set_epoch (pkg, rpmtdGetNumber (td));
+       asb_package_set_epoch (pkg, (guint) rpmtdGetNumber (td));
 -      rpmtdFree (td);
 +      free (td);
        return TRUE;
  }
  
-@@ -260,10 +290,10 @@ asb_package_rpm_ensure_source (AsbPackag
+@@ -161,10 +191,10 @@ asb_package_rpm_ensure_source (AsbPackag
        AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
        rpmtd td;
  
@@ -107,7 +99,7 @@
        return TRUE;
  }
  
-@@ -277,10 +307,10 @@ asb_package_rpm_ensure_url (AsbPackage *
+@@ -175,24 +205,28 @@ asb_package_rpm_ensure_url (AsbPackage *
        AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
        rpmtd td;
  
@@ -120,7 +112,6 @@
        return TRUE;
  }
  
-@@ -290,14 +320,18 @@ asb_package_rpm_ensure_url (AsbPackage *
  static gboolean
  asb_package_rpm_ensure_vcs (AsbPackage *pkg, GError **error)
  {
@@ -133,14 +124,15 @@
 +      td = malloc (sizeof (*td));
        headerGet (priv->h, RPMTAG_VCS, td, HEADERGET_MINMEM);
        asb_package_set_vcs (pkg, rpmtdGetString (td));
-       rpmtdFree (td);
+-      rpmtdFree (td);
++      free (td);
 +#else
 +      asb_package_set_vcs (pkg, NULL);
 +#endif
        return TRUE;
  }
  
-@@ -311,10 +345,10 @@ asb_package_rpm_ensure_license (AsbPacka
+@@ -203,10 +237,10 @@ asb_package_rpm_ensure_license (AsbPacka
        AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
        rpmtd td;
  
@@ -153,7 +145,7 @@
        return TRUE;
  }
  
-@@ -387,7 +421,7 @@ asb_package_rpm_ensure_releases (AsbPack
+@@ -277,7 +311,7 @@ asb_package_rpm_ensure_releases (AsbPack
  
        /* read out the file list */
        for (i = 0; i < 3; i++)
@@ -162,7 +154,7 @@
        /* get the ChangeLog info */
        headerGet (priv->h, RPMTAG_CHANGELOGTIME, td[0], HEADERGET_MINMEM);
        headerGet (priv->h, RPMTAG_CHANGELOGNAME, td[1], HEADERGET_MINMEM);
-@@ -402,7 +436,7 @@ asb_package_rpm_ensure_releases (AsbPack
+@@ -292,7 +326,7 @@ asb_package_rpm_ensure_releases (AsbPack
        }
        for (i = 0; i < 3; i++) {
                rpmtdFreeData (td[i]);
@@ -171,8 +163,8 @@
        }
        return TRUE;
  }
-@@ -424,7 +458,7 @@ asb_package_rpm_ensure_deps (AsbPackage
-       _cleanup_strv_free_ gchar **deps = NULL;
+@@ -309,7 +343,7 @@ asb_package_rpm_ensure_deps (AsbPackage
+       rpmtd td = NULL;
  
        /* read out the dep list */
 -      td = rpmtdNew ();
@@ -180,8 +172,8 @@
        rc = headerGet (priv->h, RPMTAG_REQUIRENAME, td, HEADERGET_MINMEM);
        if (!rc) {
                ret = FALSE;
-@@ -452,7 +486,7 @@ asb_package_rpm_ensure_deps (AsbPackage
-       asb_package_set_deps (pkg, deps);
+@@ -339,7 +373,7 @@ asb_package_rpm_ensure_deps (AsbPackage
+         g_free (tmp);
  out:
        rpmtdFreeData (td);
 -      rpmtdFree (td);
@@ -189,7 +181,7 @@
        return ret;
  }
  
-@@ -478,7 +512,7 @@ asb_package_rpm_ensure_filelists (AsbPac
+@@ -362,7 +396,7 @@ asb_package_rpm_ensure_filelists (AsbPac
  
        /* read out the file list */
        for (i = 0; i < 3; i++)
@@ -198,7 +190,7 @@
        rc = headerGet (priv->h, RPMTAG_DIRNAMES, td[0], HEADERGET_MINMEM);
        if (rc)
                rc = headerGet (priv->h, RPMTAG_BASENAMES, td[1], HEADERGET_MINMEM);
-@@ -513,7 +547,7 @@ asb_package_rpm_ensure_filelists (AsbPac
+@@ -397,7 +431,7 @@ asb_package_rpm_ensure_filelists (AsbPac
  out:
        for (i = 0; i < 3; i++) {
                rpmtdFreeData (td[i]);

diff --git a/appstream-glib.spec b/appstream-glib.spec
index 3632edaf6307bb5eb9e6c820dd7d199b9c632e5d..60c2023e74820d9e6c36369ba00ec70a16e69a9c 100644 (file)
--- a/appstream-glib.spec
+++ b/appstream-glib.spec
@@ -1,16 +1,17 @@
 #
 # Conditional build:
 %bcond_with    alpm    # Arch Linux PacMan support
+%bcond_with    stemmer # search stemmer based on libstemmer
 
 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.5.16
+Version:       0.6.9
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz
-# Source0-md5: f02ef07ddd24d2b4e10dcd1d3f892d79
+# Source0-md5: 075daf7f903d2355e0c133ac41dcbced
 Patch0:                %{name}-rpm5.patch
 Patch1:                %{name}-pc.patch
 URL:           https://people.freedesktop.org/~hughsient/appstream-glib/
@@ -23,8 +24,9 @@ BuildRequires:        fontconfig-devel
 # pkgconfig(freetype2) >= 9.10.0
 BuildRequires: freetype-devel >= 1:2.2.1
 BuildRequires: gcab-devel
+BuildRequires: gcc >= 5:3.2
 BuildRequires: gdk-pixbuf2-devel >= 2.31.5
-BuildRequires: gettext-tools >= 0.17
+BuildRequires: gettext-tools >= 0.19.7
 BuildRequires: glib2-devel >= 1:2.45.8
 BuildRequires: gobject-introspection-devel >= 0.9.8
 BuildRequires: gperf
@@ -35,6 +37,7 @@ BuildRequires:        json-glib-devel >= 1.1.1
 BuildRequires: libarchive-devel
 BuildRequires: libsoup-devel >= 2.52
 BuildRequires: libstdc++-devel
+%{?with_stemmer:BuildRequires: libstemmer-devel}
 BuildRequires: libtool >= 2:2
 BuildRequires: libuuid-devel
 BuildRequires: libxslt-progs
@@ -183,9 +186,11 @@ Bashowe dopełnianie składni polecenia appstream-builder.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+%{?with_stemmer:CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer"}
 %configure \
        %{?with_alpm:--enable-alpm} \
        --disable-silent-rules \
+       %{?with_stemmer:--enable-stemmer} \
        --with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -253,7 +258,6 @@ rm -rf $RPM_BUILD_ROOT
 %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_absorb.so
 %attr(755,root,root) %{_libdir}/asb-plugins-5/libasb_plugin_appdata.so
 %attr(755,root,root) %{_libdir}/asb-plugins-5/libasb_plugin_desktop.so
 %attr(755,root,root) %{_libdir}/asb-plugins-5/libasb_plugin_font.so