[gnome-user-share] - Merge-review cleanup (#225842)

[paragn]

commit 328f3e64403ff873d65b42f4f6350b9a4f9c0fcf
Author: paragn <paragn at fedoraproject.org>
Date:   Wed Oct 13 11:51:10 2010 +0530

    - Merge-review cleanup (#225842)

 gnome-user-share.spec |   42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 deletions(-)
---
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 10ae83d..11203e1 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,19 +1,18 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.30.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/2.28/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-user-share/2.30/%{name}-%{version}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: httpd >= 2.2.0
-Requires: obex-data-server >= 0.3
+Requires: httpd 
+Requires: obex-data-server 
 Requires: mod_dnssd
 BuildRequires: GConf2-devel pkgconfig
-BuildRequires: gtk2-devel >= 2.4.0
-BuildRequires: httpd >= 2.2.0 mod_dnssd >= 0.6
+BuildRequires: gtk2-devel
+BuildRequires: httpd  mod_dnssd 
 BuildRequires: gnome-bluetooth-libs-devel
 BuildRequires: libcanberra-devel
 BuildRequires: desktop-file-utils
@@ -26,12 +25,12 @@ BuildRequires: unique-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
 BuildRequires: scrollkeeper
+
 Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2
 
 %description
-
 gnome-user-share is a small package that binds together various free
 software projects to bring easy to use user-level file sharing to the
 masses.
@@ -52,16 +51,14 @@ The program also allows to share files using ObexFTP over Bluetooth.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
 
 desktop-file-install --vendor gnome --delete-original                   \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
   --add-only-show-in GNOME                                              \
   --add-category X-Red-Hat-Base                                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -84,25 +81,15 @@ for f in $helpdir/C/figures/*.png; do
   done
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
+%gconf_schema_upgrade desktop_gnome_file_sharing.schemas 
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
-fi
+%gconf_schema_prepare desktop_gnome_file_sharing.schemas 
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
-fi
+%gconf_schema_remove desktop_gnome_file_sharing.schemas
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -115,7 +102,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 
 %files -f gnome-user-share.lang
 %defattr(-,root,root,-)
-%doc README COPYING NEWS AUTHORS
+%doc README COPYING NEWS
 %{_bindir}/*
 %{_libexecdir}/*
 %{_datadir}/gnome-user-share
@@ -126,6 +113,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Wed Oct 06 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.30.1-2
+- Merge-review cleanup (#225842)
+
 * Mon Sep 27 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-1
 - Update to 2.30.1