From b706502849af07e2ce50f0951b83d7fea335e7d2 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 20 Feb 2019 23:23:23 +0100
Subject: [PATCH] Update to 2.2.0

- Switch to the meson build system
---
 .gitignore          |  1 +
 sources             |  2 +-
 tracker-miners.spec | 36 ++++++++++++++++++++----------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e33e91..1c8d54e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /tracker-miners-2.1.3.tar.xz
 /tracker-miners-2.1.4.tar.xz
 /tracker-miners-2.1.5.tar.xz
+/tracker-miners-2.2.0.tar.xz
diff --git a/sources b/sources
index 28bb129..db28254 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tracker-miners-2.1.5.tar.xz) = 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605
+SHA512 (tracker-miners-2.2.0.tar.xz) = 0dec9e8150a7b669f74c9ce79e0f1a8b87b7af5d4c04c4b96da80127fbe6e4ac4eb7bcaf279c98c2c48a265ef791ef5af64cfec202d81462cfb29beb21d6bc3d
diff --git a/tracker-miners.spec b/tracker-miners.spec
index 8c16a80..f0d45c3 100644
--- a/tracker-miners.spec
+++ b/tracker-miners.spec
@@ -8,26 +8,26 @@
 %global with_rss 1
 %endif
 
-%global tracker_version 2.1.0
+%global tracker_version 2.2.0
 
-%global systemd_units tracker-extract.service tracker-miner-apps.service tracker-miner-fs.service tracker-miner-rss.service tracker-writeback.service
+%global systemd_units tracker-extract.service tracker-miner-fs.service tracker-miner-rss.service tracker-writeback.service
 
 Name:           tracker-miners
-Version:        2.1.5
-Release:        4%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Tracker miners and metadata extractors
 
 # libtracker-extract is LGPLv2+; the miners are a mix of GPLv2+ and LGPLv2+ code
 License:        GPLv2+ and LGPLv2+
 URL:            https://wiki.gnome.org/Projects/Tracker
-Source0:        https://download.gnome.org/sources/%{name}/2.1/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/2.2/%{name}-%{version}.tar.xz
 
 BuildRequires:  giflib-devel
 BuildRequires:  intltool
-BuildRequires:  libjpeg-devel
-BuildRequires:  libtiff-devel
+BuildRequires:  meson
 BuildRequires:  systemd
 BuildRequires:  vala
+BuildRequires:  pkgconfig(dbus-1)
 %if 0%{?with_enca}
 BuildRequires:  pkgconfig(enca)
 %endif
@@ -48,9 +48,12 @@ BuildRequires:  pkgconfig(libgrss)
 %endif
 BuildRequires:  pkgconfig(libgsf-1)
 BuildRequires:  pkgconfig(libgxps)
+BuildRequires:  pkgconfig(libiptcdata)
+BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libosinfo-1.0)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
+BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(poppler-glib)
 BuildRequires:  pkgconfig(taglib_c)
@@ -58,6 +61,7 @@ BuildRequires:  pkgconfig(totem-plparser)
 BuildRequires:  pkgconfig(tracker-sparql-2.0) >= %{tracker_version}
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(vorbisfile)
+BuildRequires:  pkgconfig(zlib)
 
 %{?systemd_requires}
 Requires:       tracker%{?_isa} >= %{tracker_version}
@@ -79,19 +83,15 @@ This package contains various miners and metadata extractors for tracker.
 
 %build
 # Disable the functional tests for now, they use python bytecodes.
-%configure --disable-static \
-           --enable-libflac \
-           --enable-libvorbis \
-           --disable-mp3 \
-           --disable-functional-tests \
-           --disable-silent-rules
-%make_build
+%meson \
+  -Dfunctional_tests=false \
+  -Dsystemd_user_services=%{_userunitdir}
+%meson_build
 
 
 %install
-%make_install
+%meson_install
 
-find %{buildroot} -type f -name "*.la" -delete
 rm -rf %{buildroot}%{_datadir}/tracker-tests
 
 # Remove .so symlinks for private libraries -- no external users are supposed
@@ -126,6 +126,10 @@ rm -f %{buildroot}%{_libdir}/tracker-miners-2.0/*.so
 
 
 %changelog
+* Wed Feb 20 2019 Kalev Lember <klember@redhat.com> - 2.2.0-1
+- Update to 2.2.0
+- Switch to the meson build system
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild