--- a/libgnome.spec	Thu Aug 11 18:30:17 2005 +0000
+++ b/libgnome.spec	Thu Aug 11 18:34:53 2005 +0000
@@ -1,34 +1,26 @@
+#
+# spec file for package libgnome
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
 Name:         libgnome
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.6.0
-Release:      46
-Distribution: Java Desktop System, Release 3
+Version:      2.10.0
+Release:      3
+Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      GNOME Base Library
-Source:       http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.5/libgnome-%{version}.tar.bz2
-%ifos solaris
-Source1:      backgrounds.tar.bz2
-%else
-Source1:      backgrounds-linux.tar.bz2
-%endif
-Source2:      libgnome-l10n-po-1.14.tar.bz2
-%ifos solaris
-Source3:      Sun-Default.png
-%else
-Source3:      Sun-Default-linux.png
-%endif
-Source4:      libgnome-2.3.gz
-Source5:      gnome-open.1.gz
-Source6:      l10n-configure.sh
+Source:       http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.10/libgnome-%{version}.tar.bz2
+Source1:      gnome-open.1.gz
+Source2:      libgnome-2.3.gz
 Patch1:       libgnome-01-default-background.diff
 Patch2:       libgnome-02-default-theme.diff
 Patch3:       libgnome-03-lockdown-schemas.diff
-Patch4:       libgnome-04-moniker-build.diff
-Patch5:       libgnome-05-input-method-status-style.diff
-Patch6:       libgnome-06-g11n-potfiles.diff
-Patch7:       libgnome-07-g11n-potfiles.diff
-Patch8:       libgnome-08-unusable-as-root.diff
+Patch4:       libgnome-04-input-method-status-style.diff
+Patch5:       libgnome-05-unusable-as-root.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:	      %{_defaultdocdir}/doc
@@ -78,19 +70,12 @@
 
 %prep
 %setup -q
-bzcat %SOURCE2 | tar xf -
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-# the following line is required for default-background branching patch
-mv schemas/desktop_gnome_background.schemas schemas/desktop_gnome_background.schemas.in
 
-bash -x %SOURCE6
 
 %build
 %ifos linux
@@ -105,7 +90,7 @@
 fi
 
 libtoolize --force
-aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
+aclocal $ACLOCAL_FLAGS -I .
 autoheader
 automake -a -c -f
 autoconf
@@ -121,12 +106,8 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL  
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man3
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds
-bzcat %SOURCE1 | (cd $RPM_BUILD_ROOT%{_datadir}/pixmaps; tar -xf -)
-cp %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/Sun-Default.png
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
 
 #Copy zh_HK from zh_TW
 #Fixes bug 4930405
@@ -143,6 +124,7 @@
 %post
 /sbin/ldconfig
 SCHEMAS="desktop_gnome_accessibility_keyboard.schemas		\
+	 desktop_gnome_accessibility_startup.schemas		\
 	 desktop_gnome_applications_browser.schemas		\
 	 desktop_gnome_applications_help_viewer.schemas		\
 	 desktop_gnome_applications_terminal.schemas		\
@@ -173,7 +155,6 @@
 %{_libdir}/libgnome*so.*
 %{_libdir}/bonobo/monikers/*so*
 %{_libdir}/bonobo/servers/*.server
-%{_datadir}/pixmaps/backgrounds/*
 
 %files devel
 %defattr(-, root, root)
@@ -185,6 +166,31 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jul 19 2005 - [email protected]
+- Modify libgnome-02-default-theme.diff,
+  libgnome-03-lockdown-schemas.diff and 
+  libgnome-04-input-method-status-style.diff
+  so that the changes are applied to the .schemas.in 
+  files instead of .schemas files.
+
+* Thu Jun 23 2005 - [email protected]
+- Modified libgnome-03-lockdown-schemas.diff to
+  include starsuite and starsuite-printeradmin in the 
+  allowed_applications list.
+  Fixes bug #6288742.
+
+* Fri May 20 2005 - [email protected]
+- Remove backgrounds and put them in gnome-backgrounds
+  package. Sanitizes things a lot.
+
+* Thu May 12 2005 - [email protected]
+- Modified libgnome-03-lockdown-schemas.diff to
+  update the entries in the allowed_applications list.
+  Fixes bug #6266517.
+
+* Fri May 06 2005 - [email protected]
+- Bump to 2.10.0
+
 * Fri Dec 24 2004 - [email protected]
 - Replacing /usr/bin/staroffice with /usr/bin/soffice in
   libgnome-03-lockdown-schemas.diff. Fixes Bug #6208251.