commit d65befd65f9304cead0bcffe002048add0aec5ef
Author: Jakub Bogusz <[email protected]>
Date: Sat May 18 19:34:43 2019 +0200
- updated to 2.2.2
- removed obsolete link,docs patches
- now uses meson
link.patch | 10 ----------
tracker-docs.patch | 11 -----------
tracker.spec | 50 +++++++++++++++-----------------------------------
3 files changed, 15 insertions(+), 56 deletions(-)
---
diff --git a/tracker.spec b/tracker.spec
index a963100..84f8ef5 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -9,33 +9,28 @@
Summary: Tracker - an indexing subsystem
Summary(pl.UTF-8): Tracker - podsystem indeksujący
Name: tracker
-Version: 2.1.6
+Version: 2.2.2
Release: 1
License: GPL v2+
Group: Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/tracker/2.1/%{name}-%{version}.tar.xz
-# Source0-md5: 848977cfa2e9c099b53522885eee031d
-Patch0: link.patch
-Patch1: %{name}-docs.patch
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/tracker/2.2/%{name}-%{version}.tar.xz
+# Source0-md5: 2ec18c6f9e877abdfe1f50bac0e9eade
URL: http://projects.gnome.org/tracker/
BuildRequires: NetworkManager-devel >= 0.8.0
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.11
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.44.0
+BuildRequires: glib2-devel >= 1:2.46.0
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: graphviz
BuildRequires: gtk-doc >= 1.8
-BuildRequires: intltool >= 0.40.0
BuildRequires: json-glib-devel >= 1.0
%{?with_icu:BuildRequires: libicu-devel >= 4.8.1.1}
BuildRequires: libsoup-devel >= 2.40
BuildRequires: libstemmer-devel
-BuildRequires: libtool >= 2:2.2
%{!?with_icu:BuildRequires: libunistring-devel}
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 1:2.6.31
+BuildRequires: meson >= 0.47
BuildRequires: pkgconfig
BuildRequires: python >= 1:2.6
BuildRequires: rpmbuild(macros) >= 1.673
@@ -45,7 +40,7 @@ BuildRequires: upower-devel >= 0.9.0
%{?with_vala:BuildRequires: vala >= 2:0.18.0}
BuildRequires: xz
BuildRequires: zlib-devel
-Requires(post,postun): glib2 >= 1:2.44.0
+Requires(post,postun): glib2 >= 1:2.46.0
Requires: %{name}-libs = %{version}-%{release}
Requires: dbus >= 1.3.1
Requires: libxml2 >= 1:2.6.31
@@ -70,7 +65,7 @@ Summary: Tracker libraries
Summary(pl.UTF-8): Biblioteki Trackera
Group: Libraries
Requires: NetworkManager-libs >= 0.8.0
-Requires: glib2 >= 1:2.44.0
+Requires: glib2 >= 1:2.46.0
Requires: json-glib >= 1.0
Requires: libsoup >= 2.40
Requires: sqlite3 >= 3.21.0-2
@@ -88,7 +83,7 @@ Summary: Header files for Tracker libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Trackera
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: glib2-devel >= 1:2.44.0
+Requires: glib2-devel >= 1:2.46.0
Obsoletes: libtracker-devel
Obsoletes: libtracker-gtk-devel
Obsoletes: libtracker-gtk-static
@@ -158,41 +153,26 @@ API tracker dla języka Vala.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer"
-%configure \
- %{__enable_disable apidocs gtk-doc} \
- --disable-hal \
- --disable-silent-rules \
- %{!?with_static_libs:--disable-static} \
- --disable-unit-tests \
- --with-html-dir=%{_gtkdocdir} \
- --with-unicode-support=%{?with_icu:libicu}%{!?with_icu:libunistring}
+%meson build \
+ %{!?with_static_libs:--default-library=shared} \
+ %{?with_apidocs:-Ddocs=true} \
+ -Dfunctional_tests=false \
+ -Dunicode_support=%{?with_icu:icu}%{!?with_icu:unistring}
-%{__make}
+%ninja_build -C build -j1
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/tracker-%{ver}/*.la
%if %{with static_libs}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/tracker-%{ver}/libtracker-*.a
%endif
-
%find_lang tracker
%clean
diff --git a/link.patch b/link.patch
deleted file mode 100644
index 76dc160..0000000
--- a/link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tracker-2.0.1/src/libtracker-data/Makefile.am.link 2017-11-05
17:23:29.529766471 +0100
-+++ tracker-2.0.1/src/libtracker-data/Makefile.am 2017-11-05
17:23:01.347991992 +0100
-@@ -57,6 +57,7 @@ libtracker_data_la_SOURCES =
- libtracker_data_la_LIBADD = \
- $(top_builddir)/src/gvdb/libgvdb.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
-+
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-intermediate-vala.la \
- $(BUILD_LIBS) \
- $(LIBTRACKER_DATA_LIBS) \
- -lm
diff --git a/tracker-docs.patch b/tracker-docs.patch
deleted file mode 100644
index 277b1f2..0000000
--- a/tracker-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tracker-1.10.4/docs/reference/libtracker-sparql/Makefile.am.orig
2017-01-28 20:17:29.984735155 +0100
-+++ tracker-1.10.4/docs/reference/libtracker-sparql/Makefile.am
2017-01-28 20:17:32.331401795 +0100
-@@ -56,6 +56,8 @@
- --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
- --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
-
-+export
LD_LIBRARY_PATH=$(top_builddir)/src/libtracker-sparql-backend/.libs:$(top_builddir)/src/libtracker-data/.libs:$(top_builddir)/src/libtracker-common/.libs
-+
- include $(top_srcdir)/gtk-doc.make
-
- # Other files to distribute
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tracker.git/commitdiff/d65befd65f9304cead0bcffe002048add0aec5ef
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
