[libgnomeui] - spec cleanup

paragn paragn at fedoraproject.org
Thu Sep 16 10:12:08 UTC 2010


commit bb6f70bae8df0483764f5a8e30d93de271bd4457
Author: paragn <paragn at fedoraproject.org>
Date:   Thu Sep 16 15:45:45 2010 +0530

    - spec cleanup

 libgnomeui.spec |   96 ++++++++++++------------------------------------------
 1 files changed, 22 insertions(+), 74 deletions(-)
---
diff --git a/libgnomeui.spec b/libgnomeui.spec
index 36bfa51..3012eae 100644
--- a/libgnomeui.spec
+++ b/libgnomeui.spec
@@ -1,24 +1,9 @@
-%define libxml2_version 2.5
-%define libgnome_version 2.13.7
-%define libgnomecanvas_version 2.0.0
-%define libbonoboui_version 2.13.1
-%define gconf2_version 2.3.0
-%define pango_version 1.2.0
-%define glib2_version 2.16.0
-%define gtk2_version 2.12.0
-%define gnome_vfs2_version 2.7.3
-%define libglade2_version 2.0.0
-%define gnome_keyring_version 0.4
-%define orbit2_version 2.6.0
-%define libart_lgpl_version 2.3.8
-%define esound_version 1:0.2.27
-
 %define po_package libgnomeui-2.0
 
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.24.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnomeui/2.24/%{name}-%{version}.tar.bz2
 
@@ -28,24 +13,21 @@ Patch0: libgnomeui-2.23.4-disable-event-sounds.patch
 License: LGPLv2+
 Group: System Environment/Libraries
 
-BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: glib2-devel
 BuildRequires: gvfs-devel
-BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: libgnome-devel >= %{libgnome_version}
-BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version}
-BuildRequires: libglade2-devel >= %{libglade2_version}
-BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version}
-BuildRequires: zlib-devel
+BuildRequires: pango-devel
+BuildRequires: gtk2-devel
+BuildRequires: GConf2-devel 
+BuildRequires: gnome-vfs2-devel 
+BuildRequires: libgnomecanvas-devel 
+BuildRequires: libbonoboui-devel 
+BuildRequires: libxml2-devel
+BuildRequires: libgnome-devel 
+BuildRequires: libart_lgpl-devel 
+BuildRequires: libglade2-devel 
+BuildRequires: gnome-keyring-devel
 BuildRequires: libSM-devel
-BuildRequires: libICE-devel
 BuildRequires: fontconfig-devel
-BuildRequires: libjpeg-devel
 BuildRequires: gettext
 BuildRequires: automake, autoconf, libtool
 BuildRequires: intltool
@@ -55,7 +37,6 @@ BuildRequires: intltool
 #  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=249000
 
 %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 libgnomeui package
@@ -66,36 +47,9 @@ Window System.)
 %package devel
 Summary: Libraries and headers for libgnome
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-
-Requires: glib2-devel >= %{glib2_version}
-Requires: pango-devel >= %{pango_version}
-Requires: gtk2-devel >= %{gtk2_version}
-Requires: GConf2-devel >= %{gconf2_version}
-Requires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-Requires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-Requires: libbonoboui-devel >= %{libbonoboui_version}
-Requires: libxml2-devel >= %{libxml2_version}
-Requires: libgnome-devel >= %{libgnome_version}
-Requires: libart_lgpl-devel >= %{libart_lgpl_version}
-Requires: libglade2-devel >= %{libglade2_version}
-Requires: gnome-keyring-devel >= %{gnome_keyring_version}
-Requires: zlib-devel
-Requires: libSM-devel
-Requires: libICE-devel
-Requires: pkgconfig
-
-Conflicts: gnome-libs-devel < 1.4.1.2
-Conflicts: gdk-pixbuf-devel <= 0.11
+Requires: %{name} = %{version}-%{release}
 
 %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 libgnomeui-devel package
-includes the libraries and include files that you will need to
-use libgnomeui.
-
 You should install the libgnomeui-devel package if you would like to
 compile GNOME applications. You do not need to install
 libgnomeui-devel if you just want to use the GNOME desktop
@@ -113,44 +67,38 @@ autoreconf
 
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 
-export tagname=CC
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-find $RPM_BUILD_ROOT%{_libdir} -name *.la -exec rm \{\} \;
 
 %find_lang %{po_package}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f %{po_package}.lang
-%defattr(-,root,root)
-
-%doc COPYING.LIB NEWS
-
+%defattr(-,root,root,-)
+%doc COPYING.LIB NEWS ChangeLog
 %{_libdir}/lib*.so.*
 ## FIXME questionable that libgnomeui still contains these
 %{_datadir}/pixmaps/*
 %{_libdir}/libglade/2.0/*.so
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/libgnomeui
-%doc ChangeLog
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
 %changelog
+* Thu Sep 16 2010 Parag Nemade <paragn AT fedoraproject.org> 2.24.3-2
+- spec cleanup 
+
 * Wed Mar 31 2010 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
 - Update to 2.24.3
 


More information about the scm-commits mailing list