rpms/gnome-utils/devel gnome-utils.spec,1.207,1.208

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6954

Modified Files:
	gnome-utils.spec 
Log Message:
- misc spec fixes



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- gnome-utils.spec	17 Jan 2010 04:05:52 -0000	1.207
+++ gnome-utils.spec	28 Jan 2010 22:46:44 -0000	1.208
@@ -9,37 +9,37 @@
 
 Name:           gnome-utils
 Version:        2.29.5
-Release:        1%{?dist}
-Epoch: 		1
+Release:        2%{?dist}
+Epoch:          1
 Summary:        GNOME utility programs
 
 Group:          Applications/System
 License:        GPLv2+
-URL: 	        http://www.gnome.org
+URL:            http://www.gnome.org
 Source0:        http://download.gnome.org/sources/gnome-utils/2.29/gnome-utils-%{version}.tar.bz2
 
-Patch0:		spinner.patch
+Patch0:      spinner.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=597435
-Patch2:		selfshot.patch
+Patch2:      selfshot.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: 	glib2-devel >= %{glib2_version}
+BuildRequires:    glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires:  libcanberra-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libX11-devel
-BuildRequires:	libgtop2-devel
-BuildRequires:	e2fsprogs-devel
+BuildRequires:   libgtop2-devel
+BuildRequires:   e2fsprogs-devel
 BuildRequires:  usermode
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  gnome-common
-BuildRequires:	automake autoconf libtool
-BuildRequires:	scrollkeeper
+BuildRequires:   automake autoconf libtool
+BuildRequires:   scrollkeeper
 
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): GConf2 >= 2.14
@@ -48,8 +48,8 @@ Requires(pre): GConf2 >= 2.14
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 # obsolete the standalone baobab package from Extras
-Obsoletes: baobab
-Provides: baobab
+Obsoletes: baobab < %{version}-%{release}
+Provides: baobab = %{version}-%{release}
 
 %description
 The gnome-utils package contains a set of small "desk accessory" utility
@@ -128,9 +128,9 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 ./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 /bin/cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
 #%%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
+auth      include      config-util
+account      include      config-util
+session      include      config-util
 EOF
 
 ./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
@@ -152,13 +152,13 @@ desktop-file-install --vendor gnome --de
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --copy-generic-name-to-name				    \
+  --copy-generic-name-to-name                \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-baobab.desktop
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --remove-category=Office 				    \
-  --add-category=Utility				    \
+  --remove-category=Office                 \
+  --add-category=Utility                \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-dictionary.desktop
 
 # save space by linking identical images in translated docs
@@ -197,11 +197,11 @@ rm -rf $RPM_BUILD_ROOT
 update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
-	%{_sysconfdir}/gconf/schemas/baobab.schemas \
-		>& /dev/null || :
+   %{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
+   %{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
+   %{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
+   %{_sysconfdir}/gconf/schemas/baobab.schemas \
+      >& /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
@@ -238,8 +238,8 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %post -n gnome-system-log
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas \
-		>& /dev/null || :
+   %{_sysconfdir}/gconf/schemas/gnome-system-log.schemas \
+      >& /dev/null || :
 
 %pre -n gnome-system-log
 if [ "$1" -gt 1 ]; then
@@ -291,6 +291,7 @@ fi
 %{_mandir}/man1/gnome-screenshot.1.gz
 
 %files devel
+%defattr(-,root,root,-)
 %{_libdir}/libgdict-1.0.so
 %{_libdir}/pkgconfig/gdict-1.0.pc
 %{_includedir}/gdict-1.0/
@@ -301,6 +302,7 @@ fi
 %{_libdir}/libgdict-1.0.so.*
 
 %files -n gnome-system-log -f gnome-system-log.lang
+%defattr(-,root,root,-)
 %{_bindir}/gnome-system-log
 %{_sbindir}/gnome-system-log
 %{_datadir}/gnome-utils/
@@ -311,6 +313,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Thu Jan 28 2010 Ray Strode <rstrode at redhat.com> 2.29.5-2
+- misc spec fixes
+
 * Sat Jan 16 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.29.5-1
 - Update to 2.29.5