From d89adda4329678744c7452f496af7ec5af40e48515a17a169899f4a99566274b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 4 Oct 2019 15:58:01 +0000 Subject: [PATCH] Accepting request 735108 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/735108 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=179 --- fix-tracker-miner-fs-lto-crash.patch | 46 ---------------------------- tracker-2.2.2.tar.xz | 3 -- tracker-2.3.0.tar.xz | 3 ++ tracker.changes | 36 ++++++++++++++++++++++ tracker.spec | 9 +++--- 5 files changed, 43 insertions(+), 54 deletions(-) delete mode 100644 fix-tracker-miner-fs-lto-crash.patch delete mode 100644 tracker-2.2.2.tar.xz create mode 100644 tracker-2.3.0.tar.xz diff --git a/fix-tracker-miner-fs-lto-crash.patch b/fix-tracker-miner-fs-lto-crash.patch deleted file mode 100644 index 51205d9..0000000 --- a/fix-tracker-miner-fs-lto-crash.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build -index 084d77c2d8d67c6d3eddf4d92602d2d1cd606efe..c30d182d5278cd070712f404a396789e3b02660e 100644 ---- a/src/libtracker-sparql-backend/meson.build -+++ b/src/libtracker-sparql-backend/meson.build -@@ -22,7 +22,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version, - tracker_sparql_dep = declare_dependency( - link_with: libtracker_sparql, - include_directories: srcinc, -- dependencies: [tracker_common_dep, tracker_sparql_intermediate_dep], -+ dependencies: [tracker_common_dep], - ) - - # The introspection generation for libtracker-sparql is awkward because we have -diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build -index df0e87fda9b83bfee490e5acd018ef0676300f5a..a6c3d0972d8f0a6e58bec011a2deb860759b2152 100644 ---- a/src/tracker-store/meson.build -+++ b/src/tracker-store/meson.build -@@ -21,6 +21,7 @@ tracker_store_sources = [ - - tracker_store = executable('tracker-store', - tracker_store_sources, -+ tracker_sparql_vapi, - c_args: tracker_c_args + [ - '-include', 'config.h' - ], -diff --git a/tests/functional-tests/ipc/meson.build b/tests/functional-tests/ipc/meson.build -index bd4c3250e3d0978a19e851238ad50f4c946e6643..8ee7175fefe72ef99bfde2719ee24fe16dd7497d 100644 ---- a/tests/functional-tests/ipc/meson.build -+++ b/tests/functional-tests/ipc/meson.build -@@ -4,7 +4,7 @@ functional_ipc_test_c_args = [ - ] - - insert_or_replace_test = executable('test-insert-or-replace', -- 'test-insert-or-replace.vala', -+ 'test-insert-or-replace.vala', tracker_sparql_vapi, - dependencies: [tracker_common_dep, tracker_sparql_dep]) - test('functional-ipc-insert-or-replace', insert_or_replace_test, - env: test_env) -diff --git a/utils/tracker-resdump/meson.build b/utils/tracker-resdump/meson.build -index 86ae5d32c370cd8a934322b34b6259e544d8a960..9e5f1102823860315f51e81f3ccfd5dd3328cda6 100644 ---- a/utils/tracker-resdump/meson.build -+++ b/utils/tracker-resdump/meson.build -@@ -1,2 +1,2 @@ --executable('tracker-resdump', 'tracker-resdump.vala', -+executable('tracker-resdump', 'tracker-resdump.vala', tracker_sparql_vapi, - dependencies: [tracker_common_dep, tracker_sparql_dep]) diff --git a/tracker-2.2.2.tar.xz b/tracker-2.2.2.tar.xz deleted file mode 100644 index b273763..0000000 --- a/tracker-2.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6a73462f9aa9c32efa139003d2abd2ac5f70f8af6ce744729954975a661e2e6 -size 2792104 diff --git a/tracker-2.3.0.tar.xz b/tracker-2.3.0.tar.xz new file mode 100644 index 0000000..b7716d4 --- /dev/null +++ b/tracker-2.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c04534da83419b0bc65216e367da51a420f52bb8449f4cc4542c651e5c6bf7b +size 1603444 diff --git a/tracker.changes b/tracker.changes index a8b44e9..0c906af 100644 --- a/tracker.changes +++ b/tracker.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Tue Sep 10 05:53:31 CDT 2019 - mgorse@suse.com + +- Update to version 2.3.0: + + No changes since 2.2.99.1. + +------------------------------------------------------------------- +Thu Sep 5 18:48:13 CDT 2019 - mgorse@suse.com + +- Update to version 2.2.99.1: + + Handle circular references in TrackerResource. + + Removed stress tests. + + Handle application/x-zero-size. + + Refactors and cleanups in functional testing infrastructure. + + Documentation improvements. + + Make tracker_sparql_escape_string() escape single quotes. + + Don't make tracker:referenceSource a subproperty of + nie:identifier. + + Translations: eu. +- Add trackertestutils to -devel package. + +------------------------------------------------------------------- +Thu Aug 22 16:59:05 CST 2019 - yfjiang@suse.com + +- Update to version 2.2.99.0: + + Support for storing Musicbrainz metadata in the multimedia + ontology. + + Doc cleanups. + + Test suite improvements. + + Build fixes. + + Fix detection of files that need writeback. + + Fix crashes and invalid memory writes. +- libtracker-common is built as a static library and only used in + build time. So remove it in the %install section. +- Drop fix-tracker-miner-fs-lto-crash.patch: fixed upstream. + ------------------------------------------------------------------- Mon Jul 15 10:32:32 UTC 2019 - Martin Liška diff --git a/tracker.spec b/tracker.spec index a39f453..3062547 100644 --- a/tracker.spec +++ b/tracker.spec @@ -21,15 +21,13 @@ %define RPMTrackerAPI 2_0 Name: tracker -Version: 2.2.2 +Version: 2.3.0 Release: 0 Summary: Object database, tag/metadata database, search tool and indexer License: GPL-2.0-or-later Group: Productivity/Other URL: https://wiki.gnome.org/Projects/Tracker -Source0: https://download.gnome.org/sources/tracker/2.2/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM fix-tracker-miner-fs-lto-crash.patch -- Fix build with LTO enabled -Patch0: fix-tracker-miner-fs-lto-crash.patch +Source0: https://download.gnome.org/sources/tracker/2.3/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gcc-c++ @@ -233,6 +231,7 @@ mkdir -p %{buildroot}%{_datadir}/tracker/icons/ %fdupes %{buildroot}%{_datadir}/vala/ %fdupes %{buildroot}%{_datadir}/gtk-doc +rm -f %{buildroot}%{_libdir}/tracker-%{TrackerAPI}/libtracker-common.a %post -n libtracker-control-%{RPMTrackerAPI}-0 -p /sbin/ldconfig %postun -n libtracker-control-%{RPMTrackerAPI}-0 -p /sbin/ldconfig @@ -267,7 +266,6 @@ mkdir -p %{buildroot}%{_datadir}/tracker/icons/ %{_mandir}/man1/tracker-tag.1%{ext_man} %files -n libtracker-common-%{RPMTrackerAPI} -%{_libdir}/tracker-%{TrackerAPI}/libtracker-common.so %{_libdir}/tracker-%{TrackerAPI}/libtracker-data.so %{_datadir}/glib-2.0/schemas/org.freedesktop.Tracker.enums.xml @@ -292,6 +290,7 @@ mkdir -p %{buildroot}%{_datadir}/tracker/icons/ %files -n tracker-devel %doc AUTHORS README.md NEWS %{_libdir}/lib*.so +%{_libdir}/tracker-%{TrackerAPI}/trackertestutils %{_includedir}/tracker-%{TrackerAPI}/ %{_libdir}/pkgconfig/tracker-control-%{TrackerAPI}.pc %{_libdir}/pkgconfig/tracker-miner-%{TrackerAPI}.pc