rpms/e2tools/devel e2tools.spec,1.1,1.2

[Hans Ulrich Niedermann (ndim)]

Author: ndim

Update of /cvs/pkgs/rpms/e2tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1130

Modified Files:
	e2tools.spec 
Log Message:
* Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-6
- Cowardly avoid compiling with -Werror on alpha.
- Install files preserving timestamps where possible.
- Use RPM macros for shell commands where possible.



Index: e2tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2tools/devel/e2tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2tools.spec	1 Nov 2006 13:51:56 -0000	1.1
+++ e2tools.spec	8 Dec 2007 20:43:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           e2tools
 Version:        0.0.16
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Manipulate files in unmounted ext2/ext3 filesystems
 
 Group:          Applications/System
@@ -45,22 +45,25 @@
 
 %build
 %configure
-make %{?_smp_mflags} CPPFLAGS="-Wall -Werror"
+%ifnarch alpha
+error=" -Werror"
+%endif
+%{__make} %{?_smp_mflags} CPPFLAGS="-Wall${error}"
 
 
 %check
 # Run tests
 for e in e2ln e2ls e2mkdir e2mv e2rm e2tail; do
-    ln -s e2cp $e
+    %{__ln_s} e2cp $e
 done
 sh %{SOURCE1}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1/
-%{__install} \
+%{__install} -p \
     %{SOURCE2} \
     %{SOURCE3} \
     %{SOURCE4} \
@@ -69,11 +72,11 @@
     %{SOURCE7} \
     %{SOURCE8} \
     $RPM_BUILD_ROOT%{_mandir}/man1/
-%{__install} -D %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/e2tools.7
+%{__install} -p -D %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/e2tools.7
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -97,6 +100,11 @@
 
 
 %changelog
+* Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-6
+- Cowardly avoid compiling with -Werror on alpha.
+- Install files preserving timestamps where possible.
+- Use RPM macros for shell commands where possible.
+
 * Mon Jul 31 2006 Andreas Thienemann <andreas at bawue.net> - 0.0.16-5
 - fix broken cast in rm.c:248 (exhibited on x86_64, but buggy everywhere) from Hans Ulrich Niedermann