diff options
| author | Oliver Falk <oliver@linux-kernel.at> | 2013-09-17 08:20:09 +0200 |
|---|---|---|
| committer | Oliver Falk <oliver@linux-kernel.at> | 2013-09-17 08:20:09 +0200 |
| commit | c921f06dc057a4d9737b84ef582b064e43722dbb (patch) | |
| tree | e52dee7fd91c5ccf5ccd935082fbcefa98a5e04e | |
| parent | 11844f31f3f5bb6fc50baceab45bee6ee27a32bc (diff) | |
| download | libstatgrab-c921f06dc057a4d9737b84ef582b064e43722dbb.tar.gz libstatgrab-c921f06dc057a4d9737b84ef582b064e43722dbb.tar.xz libstatgrab-c921f06dc057a4d9737b84ef582b064e43722dbb.zip | |
* Readd patch
| -rw-r--r-- | libstatgrab.nochmod.patch | 52 | ||||
| -rw-r--r-- | libstatgrab.spec | 2 |
2 files changed, 54 insertions, 0 deletions
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 e5911db..24b667d 100644 --- a/libstatgrab.spec +++ b/libstatgrab.spec @@ -8,6 +8,7 @@ Summary: A library that provides cross platform access to statistics abou 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 @@ -56,6 +57,7 @@ to develop libstatgrab based applications. %prep %setup -q +%patch0 -p0 %build %configure --with-ncurses --disable-static |