SPECS: ant.spec - do not modify $RPM_BUILD_ROOT in %install. It breaks ./re...

pawelz pawelz at pld-linux.org
Thu Oct 23 00:21:51 CEST 2008


Author: pawelz                       Date: Wed Oct 22 22:21:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- do not modify $RPM_BUILD_ROOT in %install. It breaks ./repackage.sh.

---- Files affected:
SPECS:
   ant.spec (1.95 -> 1.96) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.95 SPECS/ant.spec:1.96
--- SPECS/ant.spec:1.95	Thu Oct 23 00:08:01 2008
+++ SPECS/ant.spec	Thu Oct 23 00:21:45 2008
@@ -539,6 +539,9 @@
 	src/main/org/apache/tools/ant/taskdefs/Exec.java \
 	src/main/org/apache/tools/ant/taskdefs/Execute.java
 
+# fix link between manual and javadoc
+ln -sf %{_javadocdir}/%{name}-%{version} docs/manual/api
+
 %build
 export JAVA_HOME="%{java_home}"
 
@@ -682,11 +685,6 @@
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-# fix link between manual and javadoc
-cd docs/manual
-ln -sf %{_javadocdir}/%{name}-%{version} api
-cd ..
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -890,6 +888,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.96  2008/10/22 22:21:45  pawelz
+- do not modify $RPM_BUILD_ROOT in %install. It breaks ./repackage.sh.
+
 Revision 1.95  2008/10/22 22:08:01  pawelz
 - create %ghost symlink in %post
 - now I do understand how to package %ghosted file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ant.spec?r1=1.95&r2=1.96&f=u



More information about the pld-cvs-commit mailing list