[jcommon/f21] Update to upstream 1.0.23 (using github sources).

[jerboaa]

commit da0f32718f86dbbfe5e9008645ef342f5f3ca42d
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Tue Sep 2 12:59:09 2014 +0200

    Update to upstream 1.0.23 (using github sources).
    
    - Switch to building with xmvn.

 .gitignore     |    1 +
 bnd.properties |    3 --
 getsources.sh  |   17 +++++++++++++
 jcommon.spec   |   71 ++++++++++++++++++++++++++-----------------------------
 sources        |    2 +-
 5 files changed, 53 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 278fa00..048ed77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ jcommon-1.0.16.tar.gz
 jcommon-1.0.17.tar.gz
 /jcommon-1.0.18.tar.gz
 /jcommon-1.0.19.tar.gz
+/jcommon-1.0.23.tar.gz
diff --git a/getsources.sh b/getsources.sh
new file mode 100644
index 0000000..d4e8204
--- /dev/null
+++ b/getsources.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+revision=$1
+version=$2
+if [ $# -lt 2 ]; then
+  echo "usage: $0 <git-revision> <jcommon-version-number>" >&2
+  echo "" >&2
+  echo "example: $0 1ea10aa82e30e0d60f57e1c562281a3ac7dd5cdd 1.0.23" >&2
+  exit 1
+fi
+  
+git clone git://github.com/jfree/jcommon.git jcommon-git-master
+pushd jcommon-git-master/
+git archive --prefix jcommon-${version}/ --output=../jcommon-${version}.tar ${revision}
+popd
+rm -rf jcommon-git-master
+gzip jcommon-${version}.tar 
+exit 0
diff --git a/jcommon.spec b/jcommon.spec
index 60b9eef..c187b8d 100644
--- a/jcommon.spec
+++ b/jcommon.spec
@@ -1,15 +1,18 @@
 Name: jcommon
-Version: 1.0.19
+Version: 1.0.23
 Release: 1%{?dist}
 Summary: JFree Java utility classes
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreechart/%{name}-%{version}.tar.gz
-Source2: bnd.properties
+# Github: https://github.com/jfree/jcommon
+# There are no tags which we can use to get sources. See:
+#   https://github.com/jfree/jcommon/issues/1
+# Source retrieved via:
+#  bash getsources.sh 1ea10aa82e30e0d60f57e1c562281a3ac7dd5cdd 1.0.23
+Source: %{name}-%{version}.tar.gz
 URL: http://www.jfree.org/jcommon
-BuildRequires: ant, java-devel, jpackage-utils
-# Required for converting jars to OSGi bundles
-BuildRequires:  aqute-bnd
+BuildRequires: maven-local
+BuildRequires: maven-plugin-bundle
 Requires: java-headless, jpackage-utils
 BuildArch: noarch
 
@@ -26,50 +29,44 @@ Requires: jpackage-utils
 %description javadoc
 Javadoc for %{name}.
 
-%package xml
-Summary: JFree XML utility classes
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: java, jpackage-utils
-
-%description xml
-Optional XML utility classes.
-
 %prep
 %setup -q
 find . -name "*.jar" -exec rm -f {} \;
+MVN_BUNDLE_PLUGIN_EXTRA_XML="<extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>org.jfree.jcommon</Bundle-SymbolicName>
+            <Bundle-Vendor>Fedora Project</Bundle-Vendor>
+            <Bundle-Version>%{version}</Bundle-Version>
+            <!-- Do not autogenerate uses clauses in Manifests -->
+            <_nouses>true</_nouses>
+          </instructions>
+        </configuration>"
+%pom_remove_plugin :maven-gpg-plugin
+%pom_remove_plugin :nexus-staging-maven-plugin
+%pom_remove_plugin :cobertura-maven-plugin
+%pom_remove_plugin :maven-site-plugin
+%pom_add_plugin org.apache.felix:maven-bundle-plugin . "$MVN_BUNDLE_PLUGIN_EXTRA_XML"
+# Change to packaging type bundle so as to be able to use it
+# as an OSGi bundle.
+%pom_xpath_set "pom:packaging" "bundle"
 
 %build
-pushd ant
-ant compile compile-xml javadoc
-popd
-# Convert to OSGi bundle
-java -Djcommon.bundle.version="%{version}" \
-     -jar $(build-classpath aqute-bnd) wrap -output %{name}-%{version}.bar -properties %{SOURCE2} %{name}-%{version}.jar
+%mvn_build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p %{name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-cp -p %{name}-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
 
 %files -f .mfiles
 %doc LICENSE README.md
 
-%files xml
-%{_javadir}/%{name}-xml.jar
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Sep 02 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.23-1
+- Update to upstream 1.0.23 (using github sources).
+- Switch to building with xmvn.
+
 * Tue Sep 02 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.19-1
 - Update to upstream 1.0.19 release.
 
diff --git a/sources b/sources
index 236610c..2f95e24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a02816e30596e20c5a386fd7dbe13feb  jcommon-1.0.19.tar.gz
+871d74b812dd5c54220e743fdd4d3298  jcommon-1.0.23.tar.gz