[tracker] Revert silly version changes I made earlier

[Martyn James Russell <mr src gnome org>]

commit 32eabc392477196a14039d2b2bd5c815ee1c1f9e
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Jul 22 12:14:48 2014 +0100

    Revert silly version changes I made earlier
    
    Commits:
    Revert "all: Only use major version for pkgconfig"
    Revert "libtracker-miner: Fix PkgConfig "Requires", juse major version number only"
    
    This reverts commit 9ebf1aa756c408ab91bda59e3f9e2fce85a1e4a1.
    This reverts commit a5fcbc1467184c06937fd81ba455f2ea1c1de0ca.
    This reverts commit 3417e2464f81a4158dfa50d954f704745daecf6d.

 data/Makefile.am         |   32 ++++++++++++++++++--------------
 data/tracker-miner.pc.in |    2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index e6bb1f4..055f214 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -55,7 +55,11 @@ autostart_DATA =                                       \
        tracker-store.desktop
 
 if HAVE_TRACKER_MINER_FS
-autostart_DATA += tracker-miner-fs.desktop tracker-extract.desktop
+autostart_DATA += tracker-miner-fs.desktop
+endif
+
+if HAVE_TRACKER_EXTRACT
+autostart_DATA += tracker-extract.desktop
 endif
 
 if HAVE_TRACKER_MINER_APPS
@@ -73,25 +77,25 @@ endif
 @INTLTOOL_DESKTOP_RULE@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-       tracker-control-$(TRACKER_MAJOR_VERSION).0.pc \
-       tracker-sparql-$(TRACKER_MAJOR_VERSION).0.pc \
-       tracker-miner-$(TRACKER_MAJOR_VERSION).0.pc
+pkgconfig_DATA =                                       \
+       tracker-control-$(TRACKER_API_VERSION).pc      \
+       tracker-sparql-$(TRACKER_API_VERSION).pc       \
+       tracker-miner-$(TRACKER_API_VERSION).pc
 
-tracker-control-$(TRACKER_MAJOR_VERSION).0.pc: tracker-control.pc
+tracker-control-$(TRACKER_API_VERSION).pc: tracker-control.pc
        cp $< $@
 
-tracker-sparql-$(TRACKER_MAJOR_VERSION).0.pc: tracker-sparql.pc
+tracker-sparql-$(TRACKER_API_VERSION).pc: tracker-sparql.pc
        cp $< $@
 
-tracker-miner-$(TRACKER_MAJOR_VERSION).0.pc: tracker-miner.pc
+tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
        cp $< $@
 
-CLEANFILES = \
-       $(autostart_DATA) \
-       $(desktop_in_files) \
-       tracker-control-$(TRACKER_MAJOR_VERSION).0.pc \
-       tracker-sparql-$(TRACKER_MAJOR_VERSION).0.pc \
-       tracker-miner-$(TRACKER_MAJOR_VERSION).0.pc
+CLEANFILES =                                           \
+       $(autostart_DATA)                              \
+       $(desktop_in_files)                            \
+       tracker-control-$(TRACKER_API_VERSION).pc      \
+       tracker-sparql-$(TRACKER_API_VERSION).pc       \
+       tracker-miner-$(TRACKER_API_VERSION).pc
 
 EXTRA_DIST = $(desktop_in_in_files)
diff --git a/data/tracker-miner.pc.in b/data/tracker-miner.pc.in
index 1960319..dd6729e 100644
--- a/data/tracker-miner.pc.in
+++ b/data/tracker-miner.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: tracker-miner
 Description: A library to develop tracker data miners
 Version: @VERSION@
-Requires: glib-2.0 gio-2.0 tracker-sparql- TRACKER_MAJOR_VERSION@.0 @LIBTRACKER_MINER_PC_REQUIRES@
+Requires: glib-2.0 gio-2.0 tracker-sparql- TRACKER_API_VERSION@ @LIBTRACKER_MINER_PC_REQUIRES@
 Libs: -L${libdir} -ltracker-miner- TRACKER_API_VERSION@
 Cflags: -I${includedir}/tracker- TRACKER_API_VERSION@