SPECS: xml-commons.spec - undos ant build files (ARRRRGH!!! WHY THIS STUPID...

pawelz pawelz at pld-linux.org
Tue Jan 27 17:11:36 CET 2009


Author: pawelz                       Date: Tue Jan 27 16:11:36 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- undos ant build files (ARRRRGH!!! WHY THIS STUPID CVS UNDOS PATCHES!!!)
- do not remove built files manually. Use ant clean.

---- Files affected:
SPECS:
   xml-commons.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/xml-commons.spec
diff -u SPECS/xml-commons.spec:1.17 SPECS/xml-commons.spec:1.18
--- SPECS/xml-commons.spec:1.17	Sat Feb  9 22:00:47 2008
+++ SPECS/xml-commons.spec	Tue Jan 27 17:11:31 2009
@@ -18,6 +18,7 @@
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	sed >= 4.0
 Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,12 +54,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}.%{_beta}
+
+%{__sed} -i -e 's,\r$,,' build.xml
+%{__sed} -i -e 's,\r$,,' java/which.xml
+%{__sed} -i -e 's,\r$,,' java/external/build.xml
+
 %patch0 -p1
 %patch1 -p1
 
 # remove all binary libs and prebuilt javadocs
-find -name "*.jar" -o -name "*.gz" | xargs rm -rf
-rm -rf java/build java/external/build/docs/javadoc
+# find -name "*.jar" -o -name "*.gz" | xargs rm -rf
+# rm -rf java/build java/external/build/docs/javadoc
 
 %build
 %ant jars
@@ -100,6 +106,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2009/01/27 16:11:31  pawelz
+- undos ant build files (ARRRRGH!!! WHY THIS STUPID CVS UNDOS PATCHES!!!)
+- do not remove built files manually. Use ant clean.
+
 Revision 1.17  2008/02/09 21:00:47  qboosh
 - unified License format
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xml-commons.spec?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list