packages: java-xom/java-xom.spec - cosmetics, better error detect

[glen]

Author: glen                         Date: Sun Oct 23 17:38:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics, better error detect

---- Files affected:
packages/java-xom:
   java-xom.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/java-xom/java-xom.spec
diff -u packages/java-xom/java-xom.spec:1.9 packages/java-xom/java-xom.spec:1.10
--- packages/java-xom/java-xom.spec:1.9	Sun May 16 13:36:33 2010
+++ packages/java-xom/java-xom.spec	Sun Oct 23 19:38:25 2011
@@ -10,7 +10,7 @@
 Summary:	Yet another API for processing XML
 Name:		java-xom
 Version:	1.1
-Release:	3
+Release:	4
 License:	LGPL v2.1, BSD-like
 Group:		Libraries/Java
 Source0:	http://www.cafeconleche.org/XOM/xom-%{version}-src.tar.gz
@@ -38,25 +38,25 @@
 order.
 
 %package javadoc
-Summary:	Online manual for %{srcname}
-Summary(pl.UTF-8):	Dokumentacja online do %{srcname}
+Summary:	Online manual for XOM
+Summary(pl.UTF-8):	Dokumentacja online do XOM
 Group:		Documentation
 Requires:	jpackage-utils
 
 %description javadoc
-Documentation for %{srcname}.
+Documentation for XOM.
 
 %description javadoc -l pl.UTF-8
-Dokumentacja do %{srcname}.
+Dokumentacja do XOM.
 
 %description javadoc -l fr.UTF-8
-Javadoc pour %{srcname}.
+Javadoc pour XOM.
 
 %package examples
-Summary:	Examples for %{srcname}
-Summary(pl.UTF-8):	Przykłady dla pakietu %{srcname}
+Summary:	Examples for XOM
+Summary(pl.UTF-8):	Przykłady dla pakietu XOM
 Group:		Documentation
-Requires:	java-xom = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description examples
 Demonstrations and samples for %{srcname}.
@@ -65,14 +65,11 @@
 Pliki demonstracyjne i przykłady dla pakietu %{srcname}.
 
 %prep
-%setup -q -n XOM
+%setup -q -n XOM -a1
 %patch0 -p1
 
-mkdir build
-cd build
-tar zxf %{SOURCE1}
-mv jaxen-%{jaxenver} jaxen
-cd ..
+install -d build
+mv jaxen-%{jaxenver} build/jaxen
 
 cat > build.properties << EOF
 xml-apis.jar=$(find-jar xml-apis)
@@ -82,11 +79,13 @@
 junit.jar=$(find-jar junit.jar)
 EOF
 
+# do not allow empty jars
+grep '=$' build.properties && exit 1
+
 # We do not need these jars. We want to use system libs.
-rm -rf lib
+find -name '*.jar' | xargs rm -v
 
 %build
-
 ANT_OPTS=-Xss64M %ant -propertyfile build.properties minimal jar
 %if %{with javadoc}
 %ant javadoc
@@ -142,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2011/10/23 17:38:25  glen
+- cosmetics, better error detect
+
 Revision 1.9  2010/05/16 11:36:33  sparky
 - BR: ant
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xom/java-xom.spec?r1=1.9&r2=1.10&f=u