[gnome-color-manager] Don't depend on software we are not using

[Richard Hughes <rhughes src gnome org>]

commit 9f8fe6dc7d6a136b994cfa513fb54cbd4ea1a309
Author: Richard Hughes <richard hughsie com>
Date:   Thu Dec 12 15:01:24 2013 +0000

    Don't depend on software we are not using

 configure.ac                        |    3 ---
 contrib/gnome-color-manager.spec.in |   29 ++++++++---------------------
 src/Makefile.am                     |    7 -------
 src/gcm-calibrate.c                 |    4 ----
 src/gcm-picker.c                    |    3 ---
 src/gcm-utils.c                     |    1 -
 6 files changed, 8 insertions(+), 39 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d343a9e..c982490 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,11 +79,8 @@ dnl ---------------------------------------------------------------------------
 dnl - Check library dependencies
 dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.31.10 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9)
-PKG_CHECK_MODULES(XORG, xrandr)
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.0)
 PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2)
-PKG_CHECK_MODULES(X11, x11)
-PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0)
 PKG_CHECK_MODULES(COLORD, colord >= 0.1.34 colord-gtk >= 0.1.20)
 
 dnl **** Check for VTE ****
diff --git a/contrib/gnome-color-manager.spec.in b/contrib/gnome-color-manager.spec.in
index 33eec5e..f9cedc0 100644
--- a/contrib/gnome-color-manager.spec.in
+++ b/contrib/gnome-color-manager.spec.in
@@ -7,26 +7,18 @@ Release:   0.#BUILD#%{?alphatag}%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
-Source0:   http://download.gnome.org/sources/gnome-color-manager/3.4/%{name}-%{version}.tar.xz
+Source0:   http://download.gnome.org/sources/gnome-color-manager/3.11/%{name}-%{version}.tar.xz
 
-Requires:  color-filesystem >= 1-7
 Requires:  gnome-icon-theme
 Requires:  shared-mime-info
-Requires:  shared-color-profiles
-Requires:  dconf
-Requires:  yelp
 
 BuildRequires: gtk3-devel >= 3.0.0
-BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-BuildRequires: libtool
 BuildRequires: vte3-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: intltool
-BuildRequires: libgudev1-devel
-BuildRequires: libXrandr-devel
 BuildRequires: lcms2-devel
 BuildRequires: libtiff-devel
 BuildRequires: libexif-devel
@@ -36,7 +28,7 @@ BuildRequires: glib2-devel >= 2.25.9-2
 BuildRequires: docbook-utils
 BuildRequires: colord-devel >= 0.1.12
 BuildRequires: colord-gtk-devel >= 0.1.22
-BuildRequires: gnome-desktop3-devel
+BuildRequires: itstool
 
 Requires(post):   /usr/bin/gtk-update-icon-cache
 Requires(postun): /usr/bin/gtk-update-icon-cache
@@ -52,18 +44,12 @@ and generate color profiles in the GNOME desktop.
 %setup -q
 
 %build
-%configure --disable-scrollkeeper --disable-schemas-install
+%configure
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-for i in gcm-calibrate gcm-import ; do
-  desktop-file-install --delete-original                                \
-    --dir=$RPM_BUILD_ROOT%{_datadir}/applications/                      \
-    $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
-done
-
 %find_lang %name --with-gnome
 
 %post
@@ -89,15 +75,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gcm-*
 %{_libexecdir}/gcm-*
+%{_datadir}/appdata/*.appdata.xml
 %dir %{_datadir}/gnome-color-manager
 %dir %{_datadir}/gnome-color-manager/targets
 %dir %{_datadir}/gnome-color-manager/icons
 %dir %{_datadir}/gnome-color-manager/figures
 %dir %{_datadir}/gnome-color-manager/ti1
-%{_datadir}/gnome-color-manager/targets
-%{_datadir}/gnome-color-manager/icons
-%{_datadir}/gnome-color-manager/figures
-%{_datadir}/gnome-color-manager/ti1
+%{_datadir}/gnome-color-manager/targets/*
+%{_datadir}/gnome-color-manager/icons/*
+%{_datadir}/gnome-color-manager/figures/*
+%{_datadir}/gnome-color-manager/ti1/*
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg*
diff --git a/src/Makefile.am b/src/Makefile.am
index 841ec75..6cb7465 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,10 @@
 AM_CPPFLAGS =                                          \
        $(GLIB_CFLAGS)                                  \
-       $(X11_CFLAGS)                                   \
        $(GTK_CFLAGS)                                   \
        $(VTE_CFLAGS)                                   \
-       $(XORG_CFLAGS)                                  \
        $(TIFF_CFLAGS)                                  \
        $(EXIF_CFLAGS)                                  \
        $(EXIV_CFLAGS)                                  \
-       $(GNOME_DESKTOP_CFLAGS)                         \
        $(COLORD_CFLAGS)                                \
        $(CANBERRA_CFLAGS)                              \
        -DG_LOG_DOMAIN=\"Gcm\"                          \
@@ -82,7 +79,6 @@ gcm_calibrate_LDADD =                                 \
        $(VTE_LIBS)                                     \
        $(X11_LIBS)                                     \
        $(XORG_LIBS)                                    \
-       $(GNOME_DESKTOP_LIBS)                           \
        -lm
 
 gcm_calibrate_CFLAGS =                                 \
@@ -153,7 +149,6 @@ gcm_picker_SOURCES =                                        \
 gcm_picker_LDADD =                                     \
        libgcmshared.a                                  \
        $(GLIB_LIBS)                                    \
-       $(X11_LIBS)                                     \
        $(VTE_LIBS)                                     \
        $(XORG_LIBS)                                    \
        $(GTK_LIBS)                                     \
@@ -186,7 +181,6 @@ gcm_self_test_SOURCES =                                     \
 gcm_self_test_LDADD =                                  \
        libgcmshared.a                                  \
        $(GLIB_LIBS)                                    \
-       $(X11_LIBS)                                     \
        $(LCMS_LIBS)                                    \
        $(XORG_LIBS)                                    \
        $(GTK_LIBS)                                     \
@@ -195,7 +189,6 @@ gcm_self_test_LDADD =                                       \
        $(EXIF_LIBS)                                    \
        $(VTE_LIBS)                                     \
        $(CANBERRA_LIBS)                                \
-       $(GNOME_DESKTOP_LIBS)                           \
        -lm
 
 gcm_self_test_CFLAGS = $(AM_CFLAGS) $(WARNINGFLAGS_C)
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index a0b8bcc..03387d0 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -25,12 +25,8 @@
 #include <gtk/gtk.h>
 #include <math.h>
 #include <colord-gtk.h>
-#include <lcms2.h>
 #include <canberra-gtk.h>
 
-#define GNOME_DESKTOP_USE_UNSTABLE_API
-#include <libgnome-desktop/gnome-rr.h>
-
 #include "gcm-calibrate.h"
 #include "gcm-utils.h"
 #include "gcm-brightness.h"
diff --git a/src/gcm-picker.c b/src/gcm-picker.c
index f736b12..1d9712a 100644
--- a/src/gcm-picker.c
+++ b/src/gcm-picker.c
@@ -800,9 +800,6 @@ main (int argc, char *argv[])
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 
-       /* setup type system */
-       g_type_init ();
-
        /* setup LCMS */
        cmsSetLogErrorHandler (gcm_picker_error_cb);
 
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index 1c2aa2f..2099f59 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -25,7 +25,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <colord.h>
-#include <lcms2.h>
 #include <math.h>
 
 #include "gcm-utils.h"