Revert "1.1.1 upstream release"

Stick with tracker 1.0 for now. First of all, the 1.1.1 release is
highly broken because it bumps the soname even though the 1.1/1.2
releases are supposed to be ABI compatible with 1.0. Secondly, the
tracker team is not sure at this point if GNOME 3.14 is going to go with
tracker 1.o or 1.2; so it's safer to stick with 1.0 for now.

This reverts commit 4641eb1d56.
This commit is contained in:
Kalev Lember 2014-07-27 23:21:09 +02:00
parent 381db6568e
commit afa620139b
2 changed files with 43 additions and 42 deletions

View File

@ -1 +1 @@
57bde42b758e3124faea38578b2b9a58 tracker-1.1.1.tar.xz 649f7e3d2c4c9dc01dfa51e131010ba3 tracker-1.0.2.tar.xz

View File

@ -1,4 +1,3 @@
%global basever 1.2
%global _changelog_trimtime %(date +%s -d "1 year ago") %global _changelog_trimtime %(date +%s -d "1 year ago")
%global with_nautilus 0 %global with_nautilus 0
@ -15,12 +14,12 @@
Summary: Desktop-neutral search tool and indexer Summary: Desktop-neutral search tool and indexer
Name: tracker Name: tracker
Version: 1.1.1 Version: 1.0.2
Release: 1%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: https://wiki.gnome.org/Projects/Tracker URL: https://wiki.gnome.org/Projects/Tracker
Source0: http://download.gnome.org/sources/tracker/1.1/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/tracker/1.0/%{name}-%{version}.tar.xz
# only autostart in Gnome, see also # only autostart in Gnome, see also
# https://bugzilla.redhat.com/show_bug.cgi?id=771601 # https://bugzilla.redhat.com/show_bug.cgi?id=771601
@ -167,20 +166,20 @@ This package contains the documentation for tracker
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build %build
%configure --disable-static \ %configure --disable-static \
--enable-gtk-doc \ --enable-gtk-doc \
--enable-miner-evolution=no \ --enable-miner-evolution=no \
--with-firefox-plugin-dir=%{_libdir}/firefox/extensions \ --with-firefox-plugin-dir=%{_libdir}/firefox/extensions \
--disable-mp3 \ --disable-mp3 \
%if %{with_nautilus} %if %{with_nautilus}
--enable-nautilus-extension \ --enable-nautilus-extension \
%else %else
--disable-nautilus-extension \ --disable-nautilus-extension \
%endif %endif
%if 0%{?with_thunderbird} %if 0%{?with_thunderbird}
--with-thunderbird-plugin-dir=%{_libdir}/thunderbird/extensions \ --with-thunderbird-plugin-dir=%{_libdir}/thunderbird/extensions \
%endif %endif
--with-unicode-support=libicu \ --with-unicode-support=libicu \
--disable-functional-tests --disable-functional-tests
# Disable the functional tests for now, they use python bytecodes. # Disable the functional tests for now, they use python bytecodes.
@ -190,17 +189,17 @@ make V=1 %{?_smp_mflags}
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
rm -rf %{buildroot}%{_datadir}/%{name}-tests rm -rf %{buildroot}%{_datadir}/tracker-tests
# Remove .so symlinks for private libraries -- no external users are supposed # Remove .so symlinks for private libraries -- no external users are supposed
# to link with them. # to link with them.
rm -f %{buildroot}%{_libdir}/%{name}-%{basever}/*.so rm -f %{buildroot}%{_libdir}/tracker-1.0/*.so
%find_lang %{name} %find_lang %{name}
%check %check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-*.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/tracker-*.desktop
appstream-util validate-relax %{buildroot}%{_datadir}/appdata/%{name}-*.appdata.xml --nonet appstream-util validate-relax %{buildroot}%{_datadir}/appdata/tracker-*.appdata.xml --nonet
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -227,40 +226,39 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang %files -f %{name}.lang
%doc AUTHORS COPYING NEWS README %doc AUTHORS COPYING NEWS README
%{_bindir}/%{name}* %{_bindir}/tracker*
%{_libexecdir}/%{name}* %{_libexecdir}/tracker*
%{_datadir}/tracker/ %{_datadir}/tracker/
%{_datadir}/dbus-1/services/org.freedesktop.Tracker* %{_datadir}/dbus-1/services/org.freedesktop.Tracker*
%{_libdir}/lib%{name}*-%{basever}.so.* %{_libdir}/libtracker*-1.0.so.*
%{_libdir}/%{name}-%{basever}/ %{_libdir}/tracker-1.0/
%{_libdir}/girepository-1.0/Tracker-%{basever}.typelib %{_libdir}/girepository-1.0/Tracker-1.0.typelib
%{_libdir}/girepository-1.0/TrackerControl-%{basever}.typelib %{_libdir}/girepository-1.0/TrackerControl-1.0.typelib
%{_libdir}/girepository-1.0/TrackerMiner-%{basever}.typelib %{_libdir}/girepository-1.0/TrackerMiner-1.0.typelib
%{_mandir}/*/%{name}*.gz %{_mandir}/*/tracker*.gz
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}*.desktop %config(noreplace) %{_sysconfdir}/xdg/autostart/tracker*.desktop
%{_datadir}/glib-2.0/schemas/* %{_datadir}/glib-2.0/schemas/*
%exclude %{_bindir}/%{name}-needle %exclude %{_bindir}/tracker-needle
%exclude %{_bindir}/%{name}-preferences %exclude %{_bindir}/tracker-preferences
%exclude %{_mandir}/man1/%{name}-preferences.1.gz %exclude %{_mandir}/man1/tracker-preferences.1.gz
%exclude %{_mandir}/man1/%{name}-needle.1.gz %exclude %{_mandir}/man1/tracker-needle.1.gz
%files devel %files devel
%{_includedir}/%{name}-%{basever}/ %{_includedir}/tracker-1.0/
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/vala/vapi/%{name}*.* %{_datadir}/vala/vapi/tracker*.*
%{_datadir}/gir-1.0/Tracker-%{basever}.gir %{_datadir}/gir-1.0/Tracker-1.0.gir
%{_datadir}/gir-1.0/TrackerControl-%{basever}.gir %{_datadir}/gir-1.0/TrackerControl-1.0.gir
%{_datadir}/gir-1.0/TrackerMiner-%{basever}.gir %{_datadir}/gir-1.0/TrackerMiner-1.0.gir
%files ui-tools %files ui-tools
%{_bindir}/%{name}-needle %{_bindir}/tracker-needle
%{_bindir}/%{name}-preferences %{_bindir}/tracker-preferences
%{_datadir}/icons/*/*/apps/%{name}.* %{_datadir}/icons/*/*/apps/tracker.*
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/appdata/%{name}-*.appdata.xml %{_mandir}/man1/tracker-preferences.1.gz
%{_mandir}/man1/%{name}-preferences.1.gz %{_mandir}/man1/tracker-needle.1.gz
%{_mandir}/man1/%{name}-needle.1.gz
%exclude %{_datadir}/applications/trackerbird-launcher.desktop %exclude %{_datadir}/applications/trackerbird-launcher.desktop
%files firefox-plugin %files firefox-plugin
@ -287,6 +285,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gtk-doc/html/ontology/ %{_datadir}/gtk-doc/html/ontology/
%changelog %changelog
* Sun Jul 27 2014 Kalev Lember <kalevlember@gmail.com> - 1.0.2-3
- Revert back to tracker 1.0.2 for now
* Sun Jul 27 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.1.1-1 * Sun Jul 27 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.1.1-1
- 1.1.1 upstream release - 1.1.1 upstream release
- spec cleanups - spec cleanups