From 4bbc7eb0c449b164832b1ef8a589fe4c2e84eb2a Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Wed, 19 Aug 2015 20:01:33 -0700 Subject: update to 0.91 add non-corrupt 0.91 tarball All the 0.91 updates --- .gitignore | 3 +-- libstatgrab.nochmod.patch | 68 +++++++++++++++++++---------------------------- libstatgrab.spec | 11 +++++--- sources | 3 +-- 4 files changed, 37 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 3ac7e73..1148f04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/libstatgrab-0.90.tar.gz -/libstatgrab-0.17.tar.gz +libstatgrab-0.91.tar.gz diff --git a/libstatgrab.nochmod.patch b/libstatgrab.nochmod.patch index e759b35..83efcc2 100644 --- a/libstatgrab.nochmod.patch +++ b/libstatgrab.nochmod.patch @@ -1,52 +1,40 @@ ---- 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 @@ +Index: src/saidar/Makefile.in +=================================================================== +--- src/saidar.orig/Makefile.in ++++ src/saidar/Makefile.in +@@ -662,11 +662,11 @@ uninstall-am: uninstall-binPROGRAMS 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 ++@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 ++@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: +Index: src/saidar/Makefile.am +=================================================================== +--- src/saidar.orig/Makefile.am ++++ src/saidar/Makefile.am +@@ -19,12 +19,12 @@ install-exec-local: + if SAIDAR + if SETGIDBINS + # Some operating systems need the binary to be setgid kmem +- chgrp kmem $(DESTDIR)@bindir@/saidar +- chmod g+s $(DESTDIR)@bindir@/saidar ++ chgrp kmem $(DESTDIR)@bindir@/saidar || true ++ chmod g+s $(DESTDIR)@bindir@/saidar || true + endif + if SETUIDBINS + # Some operating systems need the binary to be setuid root +- chown root $(DESTDIR)@bindir@/saidar ++ chown root $(DESTDIR)@bindir@/saidar || true + chmod u+s $(DESTDIR)@bindir@/saidar + endif + endif diff --git a/libstatgrab.spec b/libstatgrab.spec index db9a61e..2724f47 100644 --- a/libstatgrab.spec +++ b/libstatgrab.spec @@ -1,8 +1,8 @@ %global pkgname statgrab Name: libstatgrab -Version: 0.17 -Release: 8%{?dist}.2 +Version: 0.91 +Release: 1%{?dist}.2 Epoch: 1 Summary: A library that provides cross platform access to statistics about the system License: LGPLv2+ @@ -60,7 +60,7 @@ to develop libstatgrab based applications. %patch0 -p0 %build -%configure --with-ncurses --disable-static +%configure --with-ncurses --disable-static --enable-examples # remove rpath from libtool 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 @@ -82,7 +82,7 @@ find %{buildroot} -name '*.la' -delete %postun -p /sbin/ldconfig %files -%doc AUTHORS README ChangeLog NEWS COPYING.LGPL +%doc AUTHORS README ChangeLog NEWS COPYING.LGPL COPYING PLATFORMS %{_libdir}/*.so.* %files devel @@ -116,6 +116,9 @@ find %{buildroot} -name '*.la' -delete %{_mandir}/*/saidar* %changelog +* Wed Aug 19 2015 Tim Orling - 0.91-1 +- Update to 0.91 (#1119266) + * Wed Jun 17 2015 Fedora Release Engineering - 1:0.17-8.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index da8807a..cbfee75 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b7c349c500fabc14d04c7c1ac7770d94 libstatgrab-0.90.tar.gz -58385c9392898be3b09ffc5e3ebe8717 libstatgrab-0.17.tar.gz +b906d312076ca9be3d5188edfe07f496 libstatgrab-0.91.tar.gz -- cgit