[gnome-desktop3/f18] Update to 3.6.1

[Kalev Lember]

commit 764ceefc03de7baa2a78aab6a5cfbef3eda9fa97
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Oct 17 18:57:25 2012 +0200

    Update to 3.6.1
    
    ... and some spec file cleanup.

 .gitignore          |    1 +
 gnome-desktop3.spec |   29 ++++++++++++-----------------
 sources             |    2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2619bdd..b6e9e07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ gnome-desktop-2.90.4.tar.bz2
 /gnome-desktop-3.5.91.tar.xz
 /gnome-desktop-3.6.0.tar.xz
 /gnome-desktop-3.6.0.1.tar.xz
+/gnome-desktop-3.6.1.tar.xz
diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index 3e62818..071d063 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -1,24 +1,22 @@
-%define libxml2_version                   2.4.20
-%define gtk3_version                      3.0.0
-%define glib2_version                     2.19.1
+%define gtk3_version                      3.3.6
+%define glib2_version                     2.33.3
 %define startup_notification_version      0.5
-%define gnome_doc_utils_version           0.3.2
 %define gtk_doc_version                   1.9
-%define gsettings_desktop_schemas_version 0.1.4
+%define gsettings_desktop_schemas_version 3.5.91
 %define po_package                        gnome-desktop-3.0
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop3
-Version: 3.6.0.1
+Version: 3.6.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/3.4/gnome-desktop-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-desktop/3.6/gnome-desktop-%{version}.tar.xz
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 
 # needed for GnomeWallClock
-Requires: gsettings-desktop-schemas >= 3.1.91
+Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
 
 Requires: redhat-menus
 ### uncomment when gnome-about is packaged here
@@ -32,16 +30,13 @@ Requires: system-backgrounds-gnome
 Requires: gnome-themes-standard
 
 BuildRequires: gnome-common
-BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gobject-introspection-devel
 BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: libxkbfile-devel
 BuildRequires: xkeyboard-config-devel
-BuildRequires: scrollkeeper
 BuildRequires: gettext
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: automake autoconf libtool intltool
@@ -60,13 +55,9 @@ License: LGPLv2+
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
 
-Requires: libxml2-devel >= %{libxml2_version}
 Requires: gtk3-devel >= %{gtk3_version}
 Requires: glib2-devel >= %{glib2_version}
 Requires: startup-notification-devel >= %{startup_notification_version}
-Requires: gnome-doc-utils >= %{gnome_doc_utils_version}
-Requires: pkgconfig
-Requires: gtk-doc >= %{gtk_doc_version}
 
 %description devel
 Libraries and header files for the GNOME-internal private library
@@ -76,8 +67,7 @@ libgnomedesktop.
 %setup -q -n gnome-desktop-%{version}
 
 %build
-%configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \
-           --disable-scrollkeeper
+%configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids"
 make %{?_smp_mflags}
 
 %install
@@ -107,9 +97,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
+%dir %{_datadir}/gtk-doc/
+%dir %{_datadir}/gtk-doc/html/
 %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
 
 %changelog
+* Wed Oct 17 2012 Kalev Lember <kalevlember at gmail.com> - 3.6.1-1
+- Update to 3.6.1
+
 * Wed Sep 26 2012 Richard Hughes <hughsient at gmail.com> - 3.6.0.1-1
 - Update to 3.6.0.1
 
diff --git a/sources b/sources
index 84382f2..f445fff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48e8c2e0c86553f1b7e6088ab8c292c1  gnome-desktop-3.6.0.1.tar.xz
+05a16c52b7fe44883c4032cb0357dde5  gnome-desktop-3.6.1.tar.xz