[libgnome] - Merge-review cleanup (#226018)

paragn paragn at fedoraproject.org
Tue Oct 26 16:01:29 UTC 2010 

commit 1696791686aaeb437af5250b51c4fc1faf725745
Author: paragn <paragn at fedoraproject.org>
Date:   Tue Oct 26 21:30:59 2010 +0530

    - Merge-review cleanup (#226018)

 libgnome.spec |   95 ++++++++++++++------------------------------------------
 1 files changed, 24 insertions(+), 71 deletions(-)
---
diff --git a/libgnome.spec b/libgnome.spec
index 0273e26..b3f9e28 100644
--- a/libgnome.spec
+++ b/libgnome.spec
@@ -1,29 +1,17 @@
 %define _default_patch_fuzz 2
 
-%define glib2_version 2.6.0
-%define libbonobo_version 2.13.0
-%define libxml2_version 2.5
-%define libxslt_version 1.0.19
-%define gconf2_version 2.14
-%define gnome_vfs2_version 2.5.3
-%define orbit2_version 2.5.1
-%define gconf_version 2.14
-
 %define po_package libgnome-2.0
 
 Summary: GNOME base library
 Name: libgnome
 Version: 2.32.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.32/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
 License: LGPLv2+
 Group: System Environment/Libraries
 
-Requires(pre):  GConf2 >= %{gconf2_version}
-Requires(preun):  GConf2 >= %{gconf2_version}
-Requires(post):  GConf2 >= %{gconf2_version}
 # Added to avoid the warning messages about utmp group, bug #24171
 # fixme, just libzvt?
 Requires(pre): utempter
@@ -31,21 +19,21 @@ Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2
 
-BuildRequires:	zlib-devel
-BuildRequires:	glib2-devel >= %{glib2_version}
-BuildRequires:  libbonobo-devel >= %{libbonobo_version}
-BuildRequires:  GConf2-devel >= %{gconf2_version}
-BuildRequires:  gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires:  libxml2-devel >= %{libxml2_version}
-BuildRequires:  ORBit2-devel >= %{orbit2_version}
-BuildRequires:  libxslt-devel >= %{libxslt_version}
+BuildRequires: zlib-devel
+BuildRequires: glib2-devel 
+BuildRequires:  libbonobo-devel 
+BuildRequires:  GConf2-devel 
+BuildRequires:  gnome-vfs2-devel 
+BuildRequires:  libxml2-devel 
+BuildRequires:  ORBit2-devel 
+BuildRequires:  libxslt-devel 
 BuildRequires:  libcanberra-devel
 BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  popt-devel
 
-Requires: fedora-gnome-theme >= 8.0.0
+Requires: fedora-gnome-theme 
 
 # make sure to update gnome-desktop requires when changing below patch
 Patch1: default-background.patch
@@ -64,7 +52,6 @@ Patch8: im-setting.patch
 Patch9: libgnome-2.24.1-default-noblink.patch
 
 %description
-
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 GUI applications and desktop tools to be used in conjunction with a
 window manager for the X Window System. The libgnome package includes
@@ -77,28 +64,7 @@ Summary: Libraries and headers for libgnome
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Conflicts: gnome-libs-devel < 1.4.1.2
-Requires: zlib-devel
-Requires: ORBit2-devel >= %{orbit2_version}
-Requires: glib2-devel >= %{glib2_version}
-Requires: libbonobo-devel >= %{libbonobo_version}
-Requires: GConf2-devel >= %{gconf2_version}
-Requires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-Requires: libxml2-devel >= %{libxml2_version}
-Requires: libxslt-devel >= %{libxslt_version}
-Requires: popt-devel
-Requires: pkgconfig
-# for /usr/share/gtk-doc/html
-Requires: gtk-doc
-
 %description devel
-
-GNOME (GNU Network Object Model Environment) is a user-friendly set of
-GUI applications and desktop tools to be used in conjunction with a
-window manager for the X Window System. The libgnome-devel package
-includes the libraries and include files that you will need to
-use libgnome.
-
 You should install the libgnome-devel package if you would like to
 compile GNOME applications. You do not need to install libgnome-devel
 if you just want to use the GNOME desktop environment.
@@ -118,8 +84,7 @@ if you just want to use the GNOME desktop environment.
 %build
 %configure --disable-gtk-doc --disable-static --disable-esd
 
-export tagname=CC
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+make %{?_smp_mflags} 
 
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
@@ -135,15 +100,12 @@ for p in *.po; do
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export tagname=CC
-%makeinstall LIBTOOL=%{_bindir}/libtool
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la}
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
     sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
@@ -157,33 +119,21 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 %find_lang %{po_package}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_*.schemas > /dev/null || :
+%gconf_schema_upgrade desktop_gnome_*
 
 %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_*.schemas > /dev/null || :
-fi
+%gconf_schema_prepare desktop_gnome_*
 
 %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_*.schemas > /dev/null || :
-fi
+%gconf_schema_remove desktop_gnome_*
 
 %postun -p /sbin/ldconfig
 
 %files -f %{po_package}.lang
-%defattr(-,root,root)
-
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB NEWS README
-
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 %{_libdir}/bonobo/monikers/*
@@ -194,14 +144,17 @@ fi
 %{_sysconfdir}/skel/.gnome2
 
 %files devel
-%defattr(-,root,root)
-
+%defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%{_datadir}/gtk-doc/html/*
+# as per guidelines own this instead Requires:gtk-doc 
+%{_datadir}/gtk-doc
 
 %changelog
+* Fri Oct 15 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.32.0-2
+- Merge-review cleanup (#226018)
+
 * Tue Sep 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0-1
 * Update to 2.32.0

More information about the scm-commits mailing list