- Merge-review cleanup (#226026)

libgtop2.spec

@@ -1,24 +1,17 @@
-%define __libtoolize :
-
-%define glib2_version 2.0.1
-
 %define po_package libgtop-2.0
 
-Name:		libgtop2
+Name:  libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.28.2
-Release: 	1%{?dist}
-License: 	GPLv2+
+Version:  2.28.2
+Release:  2%{?dist}
+License:  GPLv2+
 URL:            http://download.gnome.org/sources/libgtop/2.28
 Group:          System Environment/Libraries
 #VCS: git://git.gnome.org/libgtop
-Source: 	http://download.gnome.org/sources/libgtop/2.28/libgtop-%{version}.tar.bz2
-BuildRequires:	glib2-devel >= %{glib2_version}
-BuildRequires:  texinfo libtool gettext
-BuildRequires:  intltool
-
-Patch0: libs.patch
-BuildRequires: automake autoconf libtool gtk-doc
+Source:  http://download.gnome.org/sources/libgtop/2.28/libgtop-%{version}.tar.bz2
+BuildRequires: glib2-devel
+BuildRequires:  libtool gettext
+BuildRequires:  intltool libtool
 
 %description
 libgtop is a library for portably obtaining information about processes,
@@ -27,10 +20,8 @@ such as their PID, memory usage, etc.
 %package devel
 Summary: Libraries and include files for developing with libgtop
 Group: Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= %{glib2_version}
-Requires: 	pkgconfig
-Requires:	gtk-doc
+Requires: %{name} = %{version}-%{release}
+Requires: gtk-doc
 
 %description devel
 This package provides the necessary development libraries and include
@@ -38,36 +29,29 @@ files to allow you to develop with libgtop.
 
 %prep
 %setup -q -n libgtop-%{version}
-%patch0 -p1 -b .libs
-autoreconf -i -f
 
 %build
 %configure --disable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %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)
+%defattr(-, root, root,-)
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %{_libdir}/*.so
 %{_includedir}/libgtop-2.0
 %{_libdir}/pkgconfig/*.pc
@@ -76,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_datadir}/info
 
 %changelog
+* Fri Oct 01 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.28.2-2
+- Merge-review cleanup (#226026)
+
 * Tue Sep 28 2010 Matthias Clasen <mclasen@redhat.com> - 2.28.2-1
 - Update to 2.28.2