Accepting request 264086 from home:posophe:branches:Java:packages

update and cleanup

OBS-URL: https://build.opensuse.org/request/show/264086
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xpp3?expand=0&rev=8

xpp3-1.1.3_8_src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d2e60a68b9dd70b9edf370acdf335f3ff4b226b86a9e451f849fcf94dec222b
-size 490583

xpp3.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Dec  4 19:34:27 UTC 2014 - p.drouand@gmail.com
+
+- Remove redundant %clean section
+
+-------------------------------------------------------------------
+Thu Dec  4 18:59:47 UTC 2014 - p.drouand@gmail.com
+
+- Update to version 1.1.4c
+  + The changes file doesn't contain an entry for 1.1.4c release
+
 -------------------------------------------------------------------
 Fri Jul 11 13:50:12 UTC 2014 - tchvatal@suse.com
 

xpp3.spec

@@ -17,16 +17,15 @@
 
 
 %define section free
-%define oversion 1.1.3_8
 Summary:        XML Pull Parser
 License:        Apache-1.1
 Group:          Development/Libraries/Java
 
 Name:           xpp3
-Version:        1.1.3.8
+Version:        1.1.4c
 Release:        0
 Url:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
-Source0:        http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tar.bz2
+Source0:        http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{version}_src.tgz
 Requires:       java >= 1.4.2
 Requires:       javapackages-tools
 BuildRequires:  ant >= 1.6
@@ -43,8 +42,6 @@ that is based on ideas from XPP and in particular XPP2 but completely
 revised and rewritten to take best advantage of latest JIT JVMs such as
 Hotspot in JDK 1.4.
 
-
-
 %package minimal
 Summary:        XML Pull Parser
 Group:          Development/Libraries/Java
@@ -55,8 +52,6 @@ that is based on ideas from XPP and in particular XPP2 but completely
 revised and rewritten to take best advantage of latest JIT JVMs such as
 Hotspot in JDK 1.4.
 
-
-
 %package javadoc
 Summary:        XML Pull Parser
 Group:          Development/Libraries/Java
@@ -67,12 +62,12 @@ that is based on ideas from XPP and in particular XPP2 but completely
 revised and rewritten to take best advantage of latest JIT JVMs such as
 Hotspot in JDK 1.4.
 
-
-
 %prep
-%setup -q -n %{name}-%{oversion}
+%setup -q
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
+# "src/java/addons_tests" does not exist
+sed -i 's|depends="junit_main,junit_addons"|depends="junit_main"|' build.xml
 
 %build
 export CLASSPATH=$(build-classpath xml-commons-apis junit)
@@ -81,11 +76,11 @@ ant xpp3 junit apidoc
 %install
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}-%{oversion}.jar \
+cp -p build/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p build/%{name}_min-%{oversion}.jar \
+cp -p build/%{name}_min-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-minimal-%{version}.jar
-cp -p build/%{name}_xpath-%{oversion}.jar \
+cp -p build/%{name}_xpath-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-xpath-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 # javadoc
@@ -93,9 +88,6 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf doc/{build.txt,api}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(0644,root,root,0755)
 %doc README.html LICENSE.txt doc/*