[packages/molly-guard] drop fakeroot requirement; fix double gzip

glen glen at pld-linux.org
Thu Mar 6 20:46:43 CET 2014


commit f43237d132d9f033ec58129068c36cc789ab4e32
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Mar 6 21:46:26 2014 +0200

    drop fakeroot requirement; fix double gzip

 molly-guard.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/molly-guard.spec b/molly-guard.spec
index 73e1904..ac4f12f 100644
--- a/molly-guard.spec
+++ b/molly-guard.spec
@@ -1,7 +1,7 @@
 Summary:	protects machines from accidental shutdowns/reboots
 Name:		molly-guard
 Version:	0.4.5
-Release:	0.3
+Release:	1
 License:	Artistic Licence 2.0
 Group:		Applications/System
 Source0:	http://ftp.debian.org/debian/pool/main/m/molly-guard/%{name}_%{version}.orig.tar.gz
@@ -12,7 +12,8 @@ Patch1:		docbook.patch
 Patch2:		doubleslashes.patch
 URL:		http://ftp.debian.org/debian/pool/main/m/molly-guard
 BuildRequires:	docbook-style-xsl
-BuildRequires:	libxslt
+BuildRequires:	libxslt-progs
+BuildRequires:	sed >= 4.0
 Requires:	procps
 Requires:	rc-scripts >= 0.4.8
 BuildArch:	noarch
@@ -38,16 +39,18 @@ non-interactively, or locally.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%{__sed} -i -e '/install/ s/-oroot -[og]root//' Makefile
+%{__sed} -i -e '/chown/ s/root.root/%(id -un)/' Makefile
 
 %build
-%{__make} all \
+%{__make} shutdown \
 	etc_prefix=/ \
 	prefix=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT
-fakeroot %{__make} install \
+%{__make} install \
 	etc_prefix=/ \
 	prefix=%{_prefix} \
 	DEST=$RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/molly-guard.git/commitdiff/f43237d132d9f033ec58129068c36cc789ab4e32



More information about the pld-cvs-commit mailing list