- up to 0.7.8; static is gone for now; use meson for building

diff --git a/appstream-glib-pc.patch b/appstream-glib-pc.patch
deleted file mode 100644 (file)
index 5776db6..0000000
--- a/appstream-glib-pc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- appstream-glib-0.2.0/libappstream-builder/appstream-builder.pc.in.orig     2014-06-17 11:10:33.000000000 +0200
-+++ appstream-glib-0.2.0/libappstream-builder/appstream-builder.pc.in  2014-06-22 08:53:49.401148383 +0200
-@@ -3,10 +3,10 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--Name: appstream-glib
-+Name: appstream-builder
- Description: Objects and helper methods to help reading and writing AppStream metadata
- Version: @VERSION@
--Requires: glib-2.0, gobject-2.0, gdk-pixbuf-2.0
--Libs: -L${libdir} -lappstream-glib
--Cflags: -I${includedir}/libappstream-glib
-+Requires: appstream-glib, glib-2.0, gobject-2.0, gdk-pixbuf-2.0
-+Libs: -L${libdir} -lappstream-builder
-+Cflags: -I${includedir}/libappstream-builder
- 

diff --git a/appstream-glib-rpm5.patch b/appstream-glib-rpm5.patch
index dd530f2416389e3ec804c2fc7dbbd3c9a9552e47..a6614fbc2d3455afaf9912df82bc7ba68a2c1620 100644 (file)
--- a/appstream-glib-rpm5.patch
+++ b/appstream-glib-rpm5.patch
@@ -1,25 +1,3 @@
---- 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)                                           \
-       $(WARN_CFLAGS)
- 
- check_PROGRAMS =                                              \
-@@ -133,11 +134,6 @@ AppStreamBuilder_1_0_gir_LIBS =                                   \
-       $(AS_GLIB_LIBS)                                         \
-       libappstream-builder.la                                 \
-       archive
--if HAVE_RPM
--AppStreamBuilder_1_0_gir_LIBS +=                              \
--      rpmio                                                   \
--      rpm
--endif
- AppStreamBuilder_1_0_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += AppStreamBuilder-1.0.gir
- 
 --- 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 @@
@@ -199,3 +177,15 @@
        }
        return ret;
  }
+--- appstream-glib-0.7.8/libappstream-builder/asb-package-rpm.c~       2018-04-20 12:37:25.000000000 +0200
++++ appstream-glib-0.7.8/libappstream-builder/asb-package-rpm.c        2018-05-03 10:49:28.865283220 +0200
+@@ -29,6 +29,8 @@
+ 
+ #include "config.h"
+ 
++#define _DEFAULT_SOURCE 1
++
+ #include <limits.h>
+ #include <archive.h>
+ #include <archive_entry.h>
+

diff --git a/appstream-glib.spec b/appstream-glib.spec
index 8fffd88d1b6c9e4e44ba0d9a947be1338fdb5f1c..84735890d9f495a68923104d7a81707098c1420c 100644 (file)
--- a/appstream-glib.spec
+++ b/appstream-glib.spec
@@ -6,14 +6,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.6.13
+Version:       0.7.8
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 2122471fff15bb9421313d2110ce538a
+# Source0-md5: 785eff9569aa7fb8838c43f44a1da4aa
 Patch0:                %{name}-rpm5.patch
-Patch1:                %{name}-pc.patch
+Patch1:                %{name}-stemmer.patch
 URL:           https://people.freedesktop.org/~hughsient/appstream-glib/
 %{?with_alpm:BuildRequires:    alpm-devel}
 BuildRequires: autoconf >= 2.63
@@ -41,6 +41,7 @@ BuildRequires:        libstdc++-devel
 BuildRequires: libtool >= 2:2
 BuildRequires: libuuid-devel
 BuildRequires: libxslt-progs
+BuildRequires: meson
 BuildRequires: pango-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-devel >= 4.5
@@ -181,33 +182,21 @@ Bashowe dopełnianie składni polecenia appstream-builder.
 %patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__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}
+%meson build \
+       -Denable-alpm=%{__true_false aplm} \
+       -Denable-stemmer=%{__true_false stemmer} \
+       -Dgtk-doc=true
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/asb-plugins-5/lib*.{la,a}
+%meson_install -C build
 
 # already in gettext-tools >= 0.19.7
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/gettext/its/appdata.{its,loc}
 
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libappstream-*.la
-
 %find_lang %{name}
 
 %clean
@@ -239,9 +228,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/appstream-glib.pc
 %{_aclocaldir}/appstream-xml.m4
 
+%if 0
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libappstream-glib.a
+%endif
 
 %files -n bash-completion-appstream-glib
 %defattr(644,root,root,755)
@@ -273,9 +264,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir
 %{_pkgconfigdir}/appstream-builder.pc
 
+%if 0
 %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)