Merge branch 'master' into f20

Conflicts:
	javapackages-tools.spec

.gitignore

@@ -40,3 +40,16 @@
 /javapackages-0.15.0.tar.xz
 /javapackages-2.0.0.tar.xz
 /javapackages-2.0.1.tar.xz
+/javapackages-3.0.0.tar.xz
+/javapackages-3.0.1.tar.xz
+/javapackages-3.0.2.tar.xz
+/javapackages-3.0.3.tar.xz
+/javapackages-3.0.4.tar.xz
+/javapackages-3.1.0.tar.xz
+/javapackages-3.1.1.tar.xz
+/javapackages-3.1.2.tar.xz
+/javapackages-3.2.0.tar.xz
+/javapackages-3.2.1.tar.xz
+/javapackages-3.2.2.tar.xz
+/javapackages-3.2.3.tar.xz
+/javapackages-3.2.4.tar.xz

google-guice-sisu-guice-noaop.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<!-- This depmap file was generated by XMvn -->
+<dependencyMap>
+  <requiresJava>1.5</requiresJava>
+  <skipProvides/>
+  <dependency>
+    <maven>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>3.1.3</version>
+      <classifier>no_aop</classifier>
+    </maven>
+    <jpp>
+      <groupId>JPP/guice</groupId>
+      <artifactId>google-guice</artifactId>
+    </jpp>
+  </dependency>
+  <dependency>
+    <maven>
+      <groupId>org.sonatype.sisu</groupId>
+      <artifactId>sisu-guice</artifactId>
+      <classifier>no_aop</classifier>
+      <version>3.1.3</version>
+    </maven>
+    <jpp>
+      <groupId>JPP/guice</groupId>
+      <artifactId>google-guice</artifactId>
+    </jpp>
+  </dependency>
+  <autoRequires>
+    <groupId>aopalliance</groupId>
+    <artifactId>aopalliance</artifactId>
+  </autoRequires>
+  <autoRequires>
+    <groupId>cglib</groupId>
+    <artifactId>cglib</artifactId>
+  </autoRequires>
+  <autoRequires>
+    <groupId>com.google.guava</groupId>
+    <artifactId>guava</artifactId>
+  </autoRequires>
+  <autoRequires>
+    <groupId>javax.inject</groupId>
+    <artifactId>javax.inject</artifactId>
+  </autoRequires>
+  <autoRequires>
+    <groupId>org.slf4j</groupId>
+    <artifactId>slf4j-api</artifactId>
+  </autoRequires>
+</dependencyMap>

javapackages-tools.spec

@@ -1,23 +1,31 @@
 Name:           javapackages-tools
-Version:        2.0.1
+Version:        3.2.4
-Release:        2%{?dist}
+Release:        1%{?dist}
+
 Summary:        Macros and scripts for Java packaging support
 
 License:        BSD
 URL:            https://fedorahosted.org/javapackages/
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
-BuildArch:      noarch
 
-Patch0001:      0001-Add-depmap-for-sun.jdk-jconsole.patch
+# temporary for rebuild with classifier support
+Source1:        google-guice-sisu-guice-noaop.xml
+
+BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
 BuildRequires:  asciidoc
 BuildRequires:  xmlto
+BuildRequires:  python-lxml
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+BuildRequires:  python-formencode
 
 Requires:       coreutils
 Requires:       libxslt
 Requires:       lua
 Requires:       python
+Requires:       python-javapackages
 
 Provides:       jpackage-utils = %{version}-%{release}
 Obsoletes:      jpackage-utils < %{version}-%{release}
@@ -29,7 +37,7 @@ This package provides macros and scripts to support Java packaging.
 Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       maven
-Requires:       xmvn
+Requires:       xmvn >= 1.0.0-0.1
 # POM files needed by maven itself
 Requires:       apache-commons-parent
 Requires:       apache-parent
@@ -63,30 +71,119 @@ Requires:       maven-surefire-provider-testng
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
 
+%package -n python-javapackages
+Summary:        Module for handling various files for Java packaging
+Requires:       python-lxml
+
+%description -n python-javapackages
+Module for handling, querying and manipulating of various files for Java
+packaging in Linux distributions
+
+%package -n fedora-review-plugin-java
+Summary:        fedora-review plugin for checking Java packaging guidelines
+License:        GPLv2+
+Requires:       fedora-review
+
+%description -n fedora-review-plugin-java
+%{summary}.
+
+
 
 %prep
 %setup -q -n javapackages-%{version}
-%patch0001 -p1
 
 %build
 %configure
 ./build
+pushd python
+%{__python} setup.py build
+popd
 
 %install
 ./install
 sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
 
+pushd python
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+popd
+
+cp %{SOURCE1} %{buildroot}%{_mavendepmapfragdir}/
+
+%check
+pushd python
+%{__python} setup.py test
+popd
+pushd test
+%{__python} -m unittest discover -p '*_test.py'
+popd
+
+
 
 %files -f files-common
 %doc LICENSE
 
 %files -n maven-local -f files-maven
+%{_mavendepmapfragdir}/google-guice-sisu-guice-noaop.xml
+
+%files -n python-javapackages
+%doc LICENSE
+%{python_sitelib}/javapackages*
+
+%files -n fedora-review-plugin-java
+%{_datadir}/fedora-review/plugins/*
 
 
 %changelog
-* Mon Sep 16 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-2
+* Tue Sep 24 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2.4-1
+- Update to upstream version 3.2.4
+
+* Tue Sep 24 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2.3-1
+- Update to upstream version 3.2.3
+
+* Fri Sep 20 2013 Michal Srb <msrb@redhat.com> - 3.2.2-1
+- Update to upstream version 3.2.2
+
+* Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-1
+- Update to upstream version 3.2.1
+
+* Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-1
+- Update to upstream version 3.2.0
+
+* Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-1
+- Update to upstream version 3.1.2
+
+* Thu Sep 19 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.1.1-1
+- Update to upstream version 3.1.1
+
+* Thu Sep 19 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.1.0-1
+- Update to upstream version 3.1.0
+
+* Mon Sep 16 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-2
 - Add depmap for sun.jdk:jconsole
-- Resolves: rhbz#1008363
+
+* Fri Sep 13 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-1
+- Update to upstream version 3.0.4
+
+* Wed Sep 11 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-1
+- Update to upstream version 3.0.3
+
+* Tue Sep 10 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.2-3
+- Fix a typo in temporary depmap
+
+* Tue Sep 10 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.2-2
+- Make sure we do not provide google guice mapping
+
+* Tue Sep 10 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> 3.0.2-1
+- Update to upstream version 3.0.2
+- Add separate python-javapackages subpackage
+- Add separate fedora-review-plugin-java subpackage
+- Enable part of unit tests
+
+* Tue Sep  3 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> 3.0.0-0.2
+- Fix javadoc directory override
+
+* Tue Sep  3 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> 3.0.0-0.1
+- Update to upstream pre-release version 3.0.0
 
 * Fri Jul 26 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-1
 - Update to upstream version 2.0.1

sources

@@ -1 +1 @@
-c46ed5e20dc9a06f5336ac9420d15a3c  javapackages-2.0.1.tar.xz
+b80566ad2f224ca39e7f0d408ec284c6  javapackages-3.2.4.tar.xz