sync with f16

This commit is contained in:
Matthias Clasen 2011-09-02 08:07:56 -04:00
parent 4bdb803e93
commit edb06d8bbd
3 changed files with 49 additions and 24 deletions

2
.gitignore vendored
View File

@ -12,4 +12,4 @@ tracker-0.8.13.tar.bz2
/tracker-0.10.5.tar.bz2 /tracker-0.10.5.tar.bz2
/tracker-0.10.8.tar.bz2 /tracker-0.10.8.tar.bz2
/tracker-0.10.10.tar.bz2 /tracker-0.10.10.tar.bz2
/tracker-0.10.24.tar.bz2 /tracker-0.11.2.tar.xz

View File

@ -1 +1 @@
1a8368d5818fdd198b3615a7922642e1 tracker-0.10.24.tar.bz2 880732875f2ffa968da8dd15b02ad62c tracker-0.11.2.tar.xz

View File

@ -1,14 +1,13 @@
Summary: Desktop-neutral search tool and indexer Summary: Desktop-neutral search tool and indexer
Name: tracker Name: tracker
Version: 0.10.24 Version: 0.11.2
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://projects.gnome.org/tracker/ URL: http://projects.gnome.org/tracker/
Source0: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/%{name}-%{version}.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.11/%{name}-%{version}.tar.xz
Patch0: tracker-0.10-gnome3-build-fixes.patch
BuildRequires: poppler-glib-devel evolution-devel libxml2-devel libgsf-devel BuildRequires: poppler-glib-devel evolution-devel libxml2-devel libgsf-devel
BuildRequires: libuuid-devel libnotify-devel dbus-devel BuildRequires: libuuid-devel libnotify-devel dbus-devel
BuildRequires: gnome-desktop-devel nautilus-devel gnome-panel-devel BuildRequires: gnome-desktop-devel nautilus-devel gnome-panel-devel
BuildRequires: libjpeg-devel libexif-devel exempi-devel raptor-devel BuildRequires: libjpeg-devel libexif-devel exempi-devel raptor-devel
@ -23,9 +22,12 @@ BuildRequires: desktop-file-utils intltool gettext
BuildRequires: gtk-doc graphviz dia BuildRequires: gtk-doc graphviz dia
BuildRequires: gobject-introspection BuildRequires: gobject-introspection
# doesn't build with current evolution
Obsoletes: tracker-evolution-plugin < 0.10.24-3.fc16
%description %description
Tracker is a powerful desktop-neutral first class object database, Tracker is a powerful desktop-neutral first class object database,
tag/metadata database, search tool and indexer. tag/metadata database, search tool and indexer.
It consists of a common object database that allows entities to have an It consists of a common object database that allows entities to have an
almost infinte number of properties, metadata (both embedded/harvested as almost infinte number of properties, metadata (both embedded/harvested as
@ -35,7 +37,7 @@ links to other entities.
It provides additional features for file based objects including context It provides additional features for file based objects including context
linking and audit trails for a file object. linking and audit trails for a file object.
It has the ability to index, store, harvest metadata. retrieve and search It has the ability to index, store, harvest metadata. retrieve and search
all types of files and other first class objects all types of files and other first class objects
%package devel %package devel
@ -59,6 +61,7 @@ Obsoletes: paperbox <= 0.4.4
Graphical frontend to tracker search and tagging facilities. This has Graphical frontend to tracker search and tagging facilities. This has
dependencies on GNOME libraries dependencies on GNOME libraries
%if 0
%package evolution-plugin %package evolution-plugin
Summary: Tracker's evolution plugin Summary: Tracker's evolution plugin
Group: User Interface/Desktops Group: User Interface/Desktops
@ -66,6 +69,7 @@ Requires: %{name} = %{version}-%{release}
%description evolution-plugin %description evolution-plugin
Tracker's evolution plugin Tracker's evolution plugin
%endif
%package nautilus-plugin %package nautilus-plugin
Summary: Tracker's nautilus plugin Summary: Tracker's nautilus plugin
@ -86,17 +90,19 @@ This package contains the documentation for tracker
%prep %prep
%setup -q %setup -q
%patch0 -p0 -b .gtk3
%global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir) %global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir)
## nuke unwanted rpaths, see also ## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
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-miner-evolution --enable-gtk-doc --disable-functional-tests --disable-miner-evolution \
--disable-miner-firefox \
--enable-gtk-doc \
--disable-functional-tests
# Disable the functional tests for now, they use python bytecodes. # Disable the functional tests for now, they use python bytecodes.
make V=1 %{?_smp_mflags} make V=1 %{?_smp_mflags}
@ -126,7 +132,11 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi fi
%postun -p /sbin/ldconfig %postun
/sbin/ldconfig
if [ $1 -eq 0 ]; then
glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
fi
%postun search-tool %postun search-tool
touch --no-create %{_datadir}/icons/hicolor touch --no-create %{_datadir}/icons/hicolor
@ -134,6 +144,9 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi fi
%posttrans
glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-, root, root, -) %defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING NEWS README %doc AUTHORS ChangeLog COPYING NEWS README
@ -142,13 +155,14 @@ fi
%{_datadir}/tracker/ %{_datadir}/tracker/
%{_datadir}/dbus-1/services/org.freedesktop.Tracker* %{_datadir}/dbus-1/services/org.freedesktop.Tracker*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libdir}/tracker-0.10/ %{_libdir}/tracker-0.12/
%{_libdir}/girepository-1.0/Tracker-0.10.typelib %{_libdir}/girepository-1.0/Tracker-0.12.typelib
%{_libdir}/girepository-1.0/TrackerExtract-0.10.typelib %{_libdir}/girepository-1.0/TrackerExtract-0.12.typelib
%{_libdir}/girepository-1.0/TrackerMiner-0.10.typelib %{_libdir}/girepository-1.0/TrackerMiner-0.12.typelib
%{_mandir}/*/tracker*.gz %{_mandir}/*/tracker*.gz
%{_sysconfdir}/ld.so.conf.d/tracker-%{_arch}.conf %{_sysconfdir}/ld.so.conf.d/tracker-%{_arch}.conf
%{_sysconfdir}/xdg/autostart/tracker*.desktop %{_sysconfdir}/xdg/autostart/tracker*.desktop
%{_datadir}/glib-2.0/schemas/*
%exclude %{_bindir}/tracker-preferences %exclude %{_bindir}/tracker-preferences
%exclude %{_bindir}/tracker-needle %exclude %{_bindir}/tracker-needle
%exclude %{_libexecdir}/tracker-search-bar %exclude %{_libexecdir}/tracker-search-bar
@ -158,13 +172,13 @@ fi
%files devel %files devel
%defattr(-, root, root, -) %defattr(-, root, root, -)
%{_includedir}/tracker-0.10/ %{_includedir}/tracker-0.12/
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/vala/vapi/tracker*.* %{_datadir}/vala/vapi/tracker*.*
%{_datadir}/gir-1.0/Tracker-0.10.gir %{_datadir}/gir-1.0/Tracker-0.12.gir
%{_datadir}/gir-1.0/TrackerExtract-0.10.gir %{_datadir}/gir-1.0/TrackerExtract-0.12.gir
%{_datadir}/gir-1.0/TrackerMiner-0.10.gir %{_datadir}/gir-1.0/TrackerMiner-0.12.gir
%files search-tool %files search-tool
%defattr(-, root, root, -) %defattr(-, root, root, -)
@ -179,10 +193,12 @@ fi
%{_mandir}/man1/tracker-preferences.1.gz %{_mandir}/man1/tracker-preferences.1.gz
%{_mandir}/man1/tracker-needle.1.gz %{_mandir}/man1/tracker-needle.1.gz
%if 0
%files evolution-plugin %files evolution-plugin
%defattr(-, root, root, -) %defattr(-, root, root, -)
%{evo_plugins_dir}/liborg-freedesktop-Tracker-evolution-plugin.so %{evo_plugins_dir}/liborg-freedesktop-Tracker-evolution-plugin.so
%{evo_plugins_dir}/org-freedesktop-Tracker-evolution-plugin.eplug %{evo_plugins_dir}/org-freedesktop-Tracker-evolution-plugin.eplug
%endif
%files nautilus-plugin %files nautilus-plugin
%defattr(-, root, root, -) %defattr(-, root, root, -)
@ -192,12 +208,15 @@ fi
%defattr(-, root, root, -) %defattr(-, root, root, -)
%doc docs/reference/COPYING %doc docs/reference/COPYING
%{_datadir}/gtk-doc/html/libtracker-miner/ %{_datadir}/gtk-doc/html/libtracker-miner/
%{_datadir}/gtk-doc/html/libtracker-client/
%{_datadir}/gtk-doc/html/libtracker-extract/ %{_datadir}/gtk-doc/html/libtracker-extract/
%{_datadir}/gtk-doc/html/libtracker-sparql/ %{_datadir}/gtk-doc/html/libtracker-sparql/
%{_datadir}/gtk-doc/html/ontology/ %{_datadir}/gtk-doc/html/ontology/
%changelog %changelog
* Thu Sep 1 2011 Matthias Clasen <mclasen@redhat.com> - 0.11.2-1
- Update to 0.11.2
- Drop the evolution miner temporarily
* Tue Aug 30 2011 Milan Crha <mcrha@redhat.com> - 0.10.24-2 * Tue Aug 30 2011 Milan Crha <mcrha@redhat.com> - 0.10.24-2
- Rebuild against newer evolution-data-server - Rebuild against newer evolution-data-server
@ -205,7 +224,13 @@ fi
- Update to 0.10.24 - Update to 0.10.24
- Re-enable the evolution plugin - Re-enable the evolution plugin
* Tue Jul 26 2011 Deji Akingunola <dakingun@gmail.com> - 0.10.21-1 * Thu Aug 04 2011 Adam Williamson <awilliam@redhat.com> - 0.10.21-2
- obsolete the evo plugin as well so upgrades work
* Wed Aug 03 2011 Adam Williamson <awilliam@redhat.com> - 0.10.21-1
- complete disabling the evolution plugin
* Tue Jul 26 2011 Deji Akingunola <dakingun@gmail.com>
- Update to 0.10.21 - Update to 0.10.21
- Temporarily disable the evolution plugin - Temporarily disable the evolution plugin