Cleanup.

1 files changed, 53 insertions, 68 deletions

diff --git a/libstatgrab.spec b/libstatgrab.spec
index 5ba0148..0bd69e9 100644
--- a/libstatgrab.spec
+++ b/libstatgrab.spec
@@ -1,19 +1,13 @@
-%define shortname	statgrab
+%global pkgname statgrab
 
-Summary:		Make system statistics
-Name:			libstatgrab
-
-Version:		0.90
-Release:		1%{?dist}
-
-Source0:		http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
-
-License:		LGPLv2+
-Group:			System Environment/Libraries
-URL:			http://www.i-scream.org/%{name}/
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libtool ncurses-devel
+Name:           libstatgrab
+Version:        0.90
+Release:        1%{?dist}
+Summary:        A library that provides cross platform access to statistics about the system
+License:        LGPLv2+
+URL:            http://www.i-scream.org/libstatgrab
+Source0:        http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
+BuildRequires:  libtool ncurses-devel
 
 %description
 Libstatgrab is a library that provides cross platform access to statistics
@@ -33,33 +27,29 @@ to people writing scripts or anything else that can't easily make C
 function calls. Included with statgrab is a script to generate an MRTG
 configuration file to use statgrab. 
 
-%package -n %{shortname}-tools
-Summary: Tools from %{name} to monitoring the system
-License: GPLv2+
-Group: Applications/System
+%package   -n   %{pkgname}-tools
+Summary:        Tools from %{name} to monitoring the system
+License:        GPLv2+
 
-%description -n %{shortname}-tools
+%description -n %{pkgname}-tools
 This package contains a few tools shiped with libstatgrab.
 Eg. A tool called saidar, which shows various system
 information like top, but - of course - OTHER informations.
 
-%package devel
-Summary: The development files from %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+%package        devel
+Summary:        The development files from %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description devel
+%description    devel
 This package contains header files and man pages for those
 use to develop libstatgrab based applications.
 
-%package examples
-Summary: The example files from %{name}
-License: GPLv2+
-Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
+%package        examples
+Summary:        The example files from %{name}
+License:        GPLv2+
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description examples
+%description    examples
 This package contains various examples used to show how
 to develop libstatgrab based applications.
 
@@ -68,57 +58,39 @@ to develop libstatgrab based applications.
 
 %build
 %configure --with-ncurses --disable-static
-
 # remove rpath from libtool
-# shamelessly stolen from cinepaint.spec (thanks!)
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 cd examples/.libs
 install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \
 	network_traffic os_info page_stats process_snapshot \
-	process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir}
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+	process_stats user_list vm_stats %{buildroot}%{_bindir}
+chmod 755 %{buildroot}%{_bindir}/statgrab-make-mrtg-config
+chmod 755 %{buildroot}%{_bindir}/saidar
+chmod 755 %{buildroot}%{_bindir}/statgrab
+find %{buildroot} -name '*.la' -delete
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%files -n %shortname-tools
-%defattr(-,root,root)
-%doc COPYING
-%{_bindir}/saidar
-%{_bindir}/statgrab
-%{_bindir}/statgrab-make-mrtg-config
-%{_bindir}/statgrab-make-mrtg-index
-%{_mandir}/*/*statgrab*
-%{_mandir}/*/saidar*
-
 %files
-%defattr(-,root,root)
-%doc AUTHORS INSTALL README ChangeLog NEWS COPYING.LGPL examples/*.c
+%doc AUTHORS README ChangeLog NEWS COPYING.LGPL
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
+%doc examples/*.c
 %{_libdir}/*.so
-%{_libdir}/*.la
 %{_includedir}/*.h
-%{_libdir}/pkgconfig/%name.pc
+%{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/*/sg_*
 
 %files examples
-%defattr(-,root,root)
+%doc COPYING
 %{_bindir}/cpu_usage
 %{_bindir}/disk_traffic
 %{_bindir}/load_stats
@@ -131,7 +103,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/user_list
 %{_bindir}/vm_stats
 
+%files -n %{pkgname}-tools
+%doc COPYING
+%{_bindir}/saidar
+%{_bindir}/statgrab
+%{_bindir}/statgrab-make-mrtg-config
+%{_bindir}/statgrab-make-mrtg-index
+%{_mandir}/*/*statgrab*
+%{_mandir}/*/saidar*
+
 %changelog
+* Fri Aug 16 2013 Christopher Meng <rpm@cicku.me> - 0.90-2
+- SPEC Cleanup.
+- Remove unneeded Requires.
+
 * Tue Aug 13 2013 Oliver Falk <oliver@linux-kernel.at> - 0.90-1
 - Update
 - Should fix BZ#925891
@@ -191,32 +176,32 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima@beer.tclug.org>	- 0.13-2
 - Bump for FC6 rebuild
 
-* Thu Apr 20 2006 Oliver Falk <oliver@linux-kernel.at>		- 0.13-1
+* Thu Apr 20 2006 Oliver Falk <oliver@linux-kernel.at> - 0.13-1
 - Update
 
-* Wed Aug 10 2005 Oliver Falk <oliver@linux-kernel.at>		- 0.12-1
+* Wed Aug 10 2005 Oliver Falk <oliver@linux-kernel.at> - 0.12-1
 - Update
 - Added saidar manpage
 
-* Fri Jul 08 2005 Oliver Falk <oliver@linux-kernel.at>		- 0.11.1-3
+* Fri Jul 08 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-3
 - Included examples/*.c in doc
 
 * Wed Jul  6 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.11.1-2
 - a lot of fixes for Fedora Extras
 
-* Thu May 19 2005 Oliver Falk <oliver@linux-kernel.at>		- 0.11.1-1.1
+* Thu May 19 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-1.1
 - Specfile cleanup
 
-* Sun Apr 03 2005 Oliver Falk <oliver@linux-kernel.at>		- 0.11.1-1
+* Sun Apr 03 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-1
 - Update
 
-* Fri Mar 25 2005 Oliver Falk <oliver@linux-kernel.at>		- 0.11-2.1
+* Fri Mar 25 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-2.1
 - Fix rpmlint warnings
 
-* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at>		- 0.11-2
+* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-2
 - Don't require coreutils. They are normally installed on Fedora, but
   not available on RH 8, where the tools are usually also installed.
   Yes, rebuilding with nodeps would also do it, but it's not fine...
 
-* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at>		- 0.11-1
+* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-1
 - Initial build for Fedora Core