diff --git a/.gitignore b/.gitignore index 76875ab..3ac7e73 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libstatgrab-0.90.tar.gz +/libstatgrab-0.17.tar.gz diff --git a/libstatgrab.nochmod.patch b/libstatgrab.nochmod.patch new file mode 100644 index 0000000..e759b35 --- /dev/null +++ b/libstatgrab.nochmod.patch @@ -0,0 +1,52 @@ +--- src/statgrab/Makefile.am.old 2005-02-04 19:45:16.384407326 +0100 ++++ src/statgrab/Makefile.am 2005-02-04 19:45:23.292225787 +0100 +@@ -19,12 +19,12 @@ + if STATGRAB + if SETGIDBINS + # Some operating systems need the binary to be setgid kmem +- chgrp kmem $(DESTDIR)@bindir@/statgrab +- chmod g+s $(DESTDIR)@bindir@/statgrab ++ chgrp kmem $(DESTDIR)@bindir@/statgrab || true ++ chmod g+s $(DESTDIR)@bindir@/statgrab || true + endif + if SETUIDBINS + # Some operating systems need the binary to be setuid root +- chown root $(DESTDIR)@bindir@/statgrab ++ chown root $(DESTDIR)@bindir@/statgrab || true + chmod u+s $(DESTDIR)@bindir@/statgrab + endif + endif +--- src/statgrab/Makefile.in.old 2005-02-04 19:56:55.352716673 +0100 ++++ src/statgrab/Makefile.in 2005-02-04 19:57:31.010601483 +0100 +@@ -507,10 +507,10 @@ + + install-exec-local: + # Some operating systems need the binary to be setgid kmem +-@SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab +-@SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab ++@SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab || true ++@SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab || true + # Some operating systems need the binary to be setuid root +-@SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab ++@SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab || true + @SETUIDBINS_TRUE@@STATGRAB_TRUE@ chmod u+s $(DESTDIR)@bindir@/statgrab + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +--- src/saidar/Makefile.in.old 2005-02-04 20:34:08.108193091 +0100 ++++ src/saidar/Makefile.in 2005-02-04 20:34:34.550848428 +0100 +@@ -474,11 +474,11 @@ + + install-exec-local: + # Some operating systems need the binary to be setgid kmem +-@SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar +-@SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar ++@SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar || true ++@SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar || true + # Some operating systems need the binary to be setuid root +-@SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar +-@SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar ++@SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar || true ++@SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar || true + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/libstatgrab.spec b/libstatgrab.spec index bcbabd0..01dffe4 100644 --- a/libstatgrab.spec +++ b/libstatgrab.spec @@ -1,12 +1,14 @@ %global pkgname statgrab Name: libstatgrab -Version: 0.90 -Release: 2%{?dist} +Version: 0.17 +Release: 5%{?dist}.2 +Epoch: 1 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 +Patch0: %{name}.nochmod.patch BuildRequires: libtool ncurses-devel %description @@ -38,7 +40,7 @@ information like top, but - of course - OTHER informations. %package devel Summary: The development files from %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel This package contains header files and man pages for those @@ -47,7 +49,7 @@ use to develop libstatgrab based applications. %package examples Summary: The example files from %{name} License: GPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description examples This package contains various examples used to show how @@ -55,6 +57,7 @@ to develop libstatgrab based applications. %prep %setup -q +%patch0 -p0 %build %configure --with-ncurses --disable-static @@ -113,6 +116,12 @@ find %{buildroot} -name '*.la' -delete %{_mandir}/*/saidar* %changelog +* Tue Sep 17 2013 Oliver Falk - 1:0.17-5.2 +- Fix requires (epoch) + +* Tue Sep 17 2013 Oliver Falk - 1:0.17-5.1 +- Fix BZ#1008491 - too many broken deps + * Fri Aug 16 2013 Christopher Meng - 0.90-2 - SPEC Cleanup. - Remove unneeded Requires. diff --git a/sources b/sources index 1a74067..da8807a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b7c349c500fabc14d04c7c1ac7770d94 libstatgrab-0.90.tar.gz +58385c9392898be3b09ffc5e3ebe8717 libstatgrab-0.17.tar.gz