[kxml] Clean up tarball

[Michal Srb]

commit 7375323ac8a9237388aa345934669a4618213040
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Jul 24 13:46:02 2013 +0200

    Clean up tarball
    
    - Drop group tag
    - Fix R

 .gitignore        |    1 +
 create-tarball.sh |   21 +++++++++++++++++++++
 kxml.spec         |   27 +++++++++++++--------------
 sources           |    2 +-
 4 files changed, 36 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9066d1f..3b88ca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 kxml2-src-2.2.2.zip
 /kxml2-src-2.3.0.zip
 /kxml2-2.3.0.pom
+/kxml-2.3.0-clean.tar.gz
diff --git a/create-tarball.sh b/create-tarball.sh
new file mode 100755
index 0000000..f67f6a5
--- /dev/null
+++ b/create-tarball.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+    echo "Usage: ./create-tarball VERSION"
+    exit 1
+fi
+
+VERSION=${1}
+NAME="kxml"
+
+wget http://downloads.sourceforge.net/sourceforge/${NAME}/${NAME}2-src-${VERSION}.zip
+unzip -d ${NAME}-${VERSION} ${NAME}2-src-${VERSION}.zip
+rm ${NAME}2-src-${VERSION}.zip
+
+( cd ${NAME}-${VERSION}
+  find . -name "*.jar" -delete
+  rm -Rf bin/ dist/* www/ samples_midp/ samples/ contrib/
+)
+
+tar czvf ${NAME}-${VERSION}-clean.tar.gz ./${NAME}-${VERSION}
+
diff --git a/kxml.spec b/kxml.spec
index 5bd3afc..d83bdae 100644
--- a/kxml.spec
+++ b/kxml.spec
@@ -30,20 +30,19 @@
 
 Name:           kxml
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Small XML pull parser
 License:        MIT
 URL:            http://kxml.sourceforge.net/
-Group:          Development/Libraries
-Source0:        http://downloads.sourceforge.net/sourceforge/kxml/kxml2-src-%{version}.zip
+# ./create-tarball %%{version}
+Source0:        kxml-2.3.0-clean.tar.gz
 Source1:        http://repo1.maven.org/maven2/net/sf/kxml/kxml2/%{version}/kxml2-%{version}.pom
-BuildRequires:  jpackage-utils >= 0:1.7.4
-BuildRequires:  java-devel >= 0:1.5.0
+BuildRequires:  java-devel
 BuildRequires:  ant >= 0:1.6.5
 BuildRequires:  xpp3 >= 0:1.1.3.1
-Requires:  java >= 0:1.5.0
-Requires:  jpackage-utils
-Requires:  xpp3
+Requires:       java
+Requires:       xpp3 >= 0:1.1.3.1
+
 BuildArch:      noarch
 
 %description
@@ -52,17 +51,12 @@ environments such as Applets, Personal Java or MIDP devices.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description    javadoc
 API documentation for %{name}.
 
 %prep
-%setup -q -c
-for j in $(find . -name "*.jar"); do
-    mv $j $j.no
-done
+%setup -q
 ln -sf $(build-classpath xpp3) lib/xmlpull_1_1_3_1.jar
 
 %build
@@ -98,6 +92,11 @@ cp -pr www/kxml2/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 24 2013 Michal Srb <msrb at redhat.com> - 2.3.0-2
+- Clean up tarball
+- Drop group tag
+- Fix R
+
 * Thu Jan 24 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.0-1
 - Update to upstream version 2.3.0
 
diff --git a/sources b/sources
index 5a0b480..f9e586a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cb830720148bad0c555a02b27e1e7f9a  kxml2-src-2.3.0.zip
 41fb11a39f42403ea23a990a1f77100a  kxml2-2.3.0.pom
+68e791ece77c4935f9744b3570057d9b  kxml-2.3.0-clean.tar.gz