rpms/tracker
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix rawhide build, enable gobject-introspection, fix rpaths so introspection compiles, general cleanups

Browse Source
This commit is contained in:
Peter Robinson 2011-04-12 11:53:32 +01:00
parent 31f084a554
commit 42d6b0473e
3 changed files with 12 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tracker-0.10-gnome3-build-fixes.patch
View File

@ -1,11 +0,0 @@
--- configure.ac 2011-04-08 08:03:30.000000000 -0400
+++ configure.ac.new 2011-04-09 02:35:13.969905763 -0400
@@ -468,7 +468,7 @@
TRACKER_NAUTILUS_EXTENSION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
- gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-3.0 >= $GTK_REQUIRED
libnautilus-extension"
PKG_CHECK_MODULES(TRACKER_NAUTILUS_EXTENSION, [$TRACKER_NAUTILUS_EXTENSION_REQUIRED],

134
tracker-0.9-fedora-build-fixes.patch
View File

@ -1,134 +0,0 @@
--- docs/tools/Makefile.am 2010-12-01 05:37:10.000000000 -0500
+++ docs/tools/Makefile.am.new 2010-12-03 21:28:47.235232125 -0500
@@ -12,7 +12,10 @@
LDADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-data/libtracker-data.la \
- $(LIBTRACKER_DATA_LIBS)
+ $(LIBTRACKER_DATA_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
ontology_graph_SOURCES = \
ontology-graph.c
--- docs/tools/Makefile.in 2010-12-02 11:15:45.000000000 -0500
+++ docs/tools/Makefile.in.new 2010-12-03 21:31:39.137243927 -0500
@@ -410,7 +410,10 @@
LDADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-data/libtracker-data.la \
- $(LIBTRACKER_DATA_LIBS)
+ $(LIBTRACKER_DATA_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
ontology_graph_SOURCES = \
ontology-graph.c
--- docs/reference/libtracker-client/Makefile.am 2010-11-10 10:58:55.000000000 -0500
+++ docs/reference/libtracker-client/Makefile.am.new 2010-12-03 21:44:30.717843736 -0500
@@ -36,7 +36,9 @@
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_CLIENT_LIBS)
+ $(LIBTRACKER_CLIENT_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS = --sgml-mode --output-format=xml
--- docs/reference/libtracker-client/Makefile.in 2010-12-02 11:15:44.000000000 -0500
+++ docs/reference/libtracker-client/Makefile.in.new 2010-12-03 21:45:23.520865732 -0500
@@ -400,7 +400,9 @@
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_CLIENT_LIBS)
+ $(LIBTRACKER_CLIENT_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb
--- docs/reference/libtracker-extract/Makefile.am 2010-11-10 10:58:55.000000000 -0500
+++ docs/reference/libtracker-extract/Makefile.am.new 2010-12-03 21:47:24.501864478 -0500
@@ -34,7 +34,9 @@
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_EXTRACT_LIBS)
+ $(LIBTRACKER_EXTRACT_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS = --sgml-mode --output-format=xml
--- docs/reference/libtracker-extract/Makefile.in 2010-12-02 11:15:45.000000000 -0500
+++ docs/reference/libtracker-extract/Makefile.in.new 2010-12-03 21:48:32.781865171 -0500
@@ -397,7 +397,9 @@
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_EXTRACT_LIBS)
+ $(LIBTRACKER_EXTRACT_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb
--- docs/reference/libtracker-miner/Makefile.am 2010-11-10 10:58:55.000000000 -0500
+++ docs/reference/libtracker-miner/Makefile.am.new 2010-12-03 21:51:13.275061430 -0500
@@ -46,7 +46,10 @@
$(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_MINER_LIBS)
+ $(LIBTRACKER_MINER_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
--- docs/reference/libtracker-miner/Makefile.in 2010-12-02 11:15:45.000000000 -0500
+++ docs/reference/libtracker-miner/Makefile.in.new 2010-12-03 21:52:31.387843244 -0500
@@ -410,7 +410,10 @@
$(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_MINER_LIBS)
+ $(LIBTRACKER_MINER_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb
--- docs/reference/libtracker-sparql/Makefile.am 2010-11-10 10:58:55.000000000 -0500
+++ docs/reference/libtracker-sparql/Makefile.am.new 2010-12-03 21:53:49.711842894 -0500
@@ -34,7 +34,9 @@
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_SPARQL_LIBS)
+ $(LIBTRACKER_SPARQL_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS = --sgml-mode --output-format=xml
--- docs/reference/libtracker-sparql/Makefile.in 2010-12-02 11:15:45.000000000 -0500
+++ docs/reference/libtracker-sparql/Makefile.in.new 2010-12-03 21:54:42.545968217 -0500
@@ -397,7 +397,9 @@
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(LIBTRACKER_SPARQL_LIBS)
+ $(LIBTRACKER_SPARQL_LIBS) \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
# Extra options to supply to gtkdoc-mkdb

29
tracker.spec
View File

@ -6,9 +6,7 @@ License: GPLv2+
Group: Applications/System
URL: http://projects.gnome.org/tracker/
Source0: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/%{name}-%{version}.tar.bz2
Patch0: tracker-0.9-fedora-build-fixes.patch
Patch1: tracker-0.10-gnome3-build-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: poppler-devel evolution-devel libxml2-devel libgsf-devel
BuildRequires: libuuid-devel libnotify-devel dbus-devel
BuildRequires: gnome-desktop-devel nautilus-devel gnome-panel-devel
@ -21,7 +19,7 @@ BuildRequires: upower-devel gnome-keyring-devel NetworkManager-glib-devel
BuildRequires: libunistring-devel gupnp-dlna-devel taglib-devel
BuildRequires: gdk-pixbuf-devel
BuildRequires: desktop-file-utils intltool gettext graphviz dia
BuildRequires: autoconf automake libtool
BuildRequires: gobject-introspection
%description
Tracker is a powerful desktop-neutral first class object database,
@ -86,26 +84,21 @@ search in nuautilus using tracker is built-in directly in the nautilus package.
%prep
%setup -q
#%patch1 -p0 -b .gtk3
#autopoint --force &&
#AUTOPOINT='intltoolize --automake --copy' autoreconf --verbose --force --install
%patch0 -p0 -b .fix
%global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir)
## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build
%configure --disable-static \
--enable-miner-evolution --disable-gtk-doc --disable-functional-tests
# Disable the functional tests for now, they use python bytecodes.
# Disable rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make V=1 %{?_smp_mflags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
@ -122,9 +115,6 @@ rm -rf %{buildroot}%{_datadir}/tracker-tests
%find_lang %{name}
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%post search-tool
@ -150,6 +140,8 @@ fi
%{_datadir}/dbus-1/services/org.freedesktop.Tracker*
%{_libdir}/*.so.*
%{_libdir}/tracker-0.10/
%{_libdir}/girepository-1.0/TrackerExtract-0.10.typelib
%{_libdir}/girepository-1.0/TrackerMiner-0.10.typelib
%{_mandir}/*/tracker*.gz
%{_sysconfdir}/ld.so.conf.d/tracker-%{_arch}.conf
%{_sysconfdir}/xdg/autostart/tracker*.desktop
@ -166,6 +158,9 @@ fi
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/vala/vapi/tracker*.*
%{_datadir}/gir-1.0/Tracker-0.10.gir
%{_datadir}/gir-1.0/TrackerExtract-0.10.gir
%{_datadir}/gir-1.0/TrackerMiner-0.10.gir
%files search-tool
%defattr(-, root, root, -)
@ -200,7 +195,7 @@ fi
%changelog
* Tue Apr 12 2011 Peter Robinson <pbrobinson@gmail.com> - 0.10.8-2
- Rebuild against new gupnp-dlna
- Rebuild against new gupnp-dlna, build introspection support
* Sat Apr 09 2011 Deji Akingunola <dakingun@gmail.com> - 0.10.8-1
- Update to 0.10.8