SPECS: xml-commons.spec - update java build; rel 2

glen glen at pld-linux.org
Tue Jan 23 00:43:56 CET 2007


Author: glen                         Date: Mon Jan 22 23:43:56 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update java build; rel 2

---- Files affected:
SPECS:
   xml-commons.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/xml-commons.spec
diff -u SPECS/xml-commons.spec:1.9 SPECS/xml-commons.spec:1.10
--- SPECS/xml-commons.spec:1.9	Sun Jan  7 16:37:26 2007
+++ SPECS/xml-commons.spec	Tue Jan 23 00:43:51 2007
@@ -1,18 +1,21 @@
 # $Revision$, $Date$
+%define		_beta	b2
+%define		_rel	2
 Summary:	Common code for XML projects
 Summary(pl):	Wspólny kod dla projektów XML
 Name:		xml-commons
 Version:	1.0
-%define		beta	b2
 Release:	0.%{beta}.1
 License:	Apache Software License
 Group:		Development/Languages/Java
-Source0:	http://www.apache.org/dist/xml/commons/%{name}-%{version}.%{beta}.tar.gz
+Source0:	http://www.apache.org/dist/xml/commons/%{name}-%{version}.%{_beta}.tar.gz
 # Source0-md5:	6c6551ece56948ee535d5f5014489b8d
 Patch0:		%{name}.build.patch
 Patch1:		%{name}.manifest.patch
 URL:		http://xml.apache.org/commons/
 BuildRequires:	ant
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,15 +37,16 @@
 związanych z XML-em - rzeczy takich jak DOM, SAX oraz interfejsy JAXP.
 
 %prep
-%setup -q -n %{name}-%{version}.%{beta}
+%setup -q -n %{name}-%{version}.%{_beta}
 %patch0 -p1
 %patch1 -p1
+
 # remove all binary libs and prebuilt javadocs
-rm -rf `find . -name "*.jar" -o -name "*.gz"`
+find -name "*.jar" -o -name "*.gz" | xargs rm -rf
 rm -rf java/build java/external/build/docs/javadoc
 
 %build
-ant jars
+%ant jars
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/01/22 23:43:51  glen
+- update java build; rel 2
+
 Revision 1.9  2007/01/07 15:37:26  qboosh
 - working Source0 URL
 
@@ -78,7 +85,7 @@
 - unification: use install
 
 Revision 1.6  2004/07/15 11:54:40  pluto
-- use %%{_javadir}.
+- use %{_javadir}.
 
 Revision 1.5  2004/02/24 01:11:56  ankry
 - pl fixes, cosmetics
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xml-commons.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list