From a99073737cb05734f5bea0e9f80f816ce269f3b5c614edfda9741c1862ebad74 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 9 Aug 2007 14:35:26 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=11

---
 gnome-desktop.changes |  7 +++++++
 gnome-desktop.spec    | 22 ++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index 9d0d1d5..82bb53b 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug  8 01:12:54 CEST 2007 - maw@suse.de
+
+- Use %fdupes
+- Split off a -lang subpackage
+- s#%run_ldconfig#/sbin/ldconfig/ in %post and %postun.
+
 -------------------------------------------------------------------
 Fri Aug  3 00:05:26 CEST 2007 - mauro@suse.de
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 440d3e5..a3d3bcf 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           gnome-desktop
-BuildRequires:  gnome-common gnome-doc-utils gnome-doc-utils-devel gtk-doc intltool libgnomeui-devel perl-XML-Parser scrollkeeper startup-notification-devel update-desktop-files
-License:        GNU Free Documentation License, Version 1.1 (GFDL), GPL v2 or later
+BuildRequires:  fdupes gnome-common gnome-doc-utils gnome-doc-utils-devel gtk-doc intltool libgnomeui-devel perl-XML-Parser scrollkeeper startup-notification-devel update-desktop-files
+License:        GNU Free Documentation License, Version 1.1 (GFDL 1.1), GPL v2 or later
 Group:          System/GUI/GNOME
 Obsoletes:      gnome-core
 Version:        2.19.6
-Release:        1
+Release:        4
 Summary:        The GNOME Desktop API Library
 Source:         %{name}-%{version}.tar.bz2
 Url:            http://www.gnome.org
@@ -25,6 +25,7 @@ Patch:          icon-search-path.dif
 Patch1:         X-KDE-SubstituteUID.dif
 Patch2:         gnome-desktop-desktop.patch
 Patch3:         gnome-desktop-recently-used-apps.patch
+Requires:       %{name}-lang = %{version}
 
 %description
 This package contains the libgnome-desktop library that contains APIs
@@ -82,6 +83,7 @@ Authors:
     Havoc Pennington <hp@redhat.com>
     Anders Carlsson <andersca@gnu.org>           
 
+%lang_package
 %prep
 %setup -q
 %patch -p1
@@ -108,16 +110,18 @@ make %{?jobs:-j%jobs}
 %find_lang lgpl %{name}-2.0.lang
 %suse_update_desktop_file gnome-about Documentation
 
+%fdupes $RPM_BUILD_ROOT
+
 %clean
 # rm -rf $RPM_BUILD_ROOT
 
 %post
-%run_ldconfig
+/sbin/ldconfig
 
 %postun
-%run_ldconfig
+/sbin/ldconfig
 
-%files -f %{name}-2.0.lang
+%files
 %defattr (-, root, root)
 %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/*
@@ -129,6 +133,8 @@ make %{?jobs:-j%jobs}
 %{_libdir}/*.so.*
 %doc %{_mandir}/man?/*.*
 
+%files lang -f %{name}-2.0.lang
+
 %files devel
 %defattr (-, root, root)
 %{_libdir}/pkgconfig/*.pc
@@ -141,6 +147,10 @@ make %{?jobs:-j%jobs}
 %{_datadir}/gtk-doc/html/gnome-desktop
 
 %changelog
+* Wed Aug 08 2007 - maw@suse.de
+- Use %%fdupes
+- Split off a -lang subpackage
+- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun.
 * Fri Aug 03 2007 - mauro@suse.de
 - Update to version 2.19.6
 - Dependencies fixes.