[gnome-desktop3/f16] 3.1.5

[Matthias Clasen]

commit 10fd83c929501475c2ecae539627af8fa261103b
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 16 18:22:43 2011 -0400

    3.1.5

 .gitignore          |    1 +
 gnome-desktop3.spec |   13 ++++++-------
 sources             |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f01eee2..34b0d20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ gnome-desktop-2.90.4.tar.bz2
 /gnome-desktop-3.1.2.tar.xz
 /gnome-desktop-3.1.3.tar.xz
 /gnome-desktop-3.1.4.tar.xz
+/gnome-desktop-3.1.5.tar.xz
diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index 51e77cd..5ad95ee 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -9,7 +9,7 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop3
-Version: 3.1.4
+Version: 3.1.5
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/3.1/gnome-desktop-%{version}.tar.xz
@@ -36,7 +36,6 @@ BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_ve
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: scrollkeeper
 BuildRequires: gettext
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: automake autoconf libtool intltool
@@ -70,15 +69,14 @@ 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
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # stuff we don't want
-rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+rm -r $RPM_BUILD_ROOT/var/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -89,7 +87,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %postun -p /sbin/ldconfig
 
 %files -f %{po_package}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB NEWS README
 %{_datadir}/gnome/gnome-version.xml
 # LGPL
@@ -97,7 +94,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
@@ -105,6 +101,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
 
 %changelog
+* Tue Aug 16 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.5-1
+- Update to 3.1.5
+
 * Mon Jul 25 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.4-1
 - Update to 3.1.4
 
diff --git a/sources b/sources
index 1a49749..86e7253 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0510194af499010e26e04110f388352d  gnome-desktop-3.1.4.tar.xz
+8e103f30fcb026a5964fa06cb450b028  gnome-desktop-3.1.5.tar.xz