[javapackages-tools] Update to upstream version 3.0.2
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Sep 10 11:35:57 UTC 2013
commit cf7d1ede3bd35cb1ae29915a203f4d243e985e02
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon Sep 9 13:35:35 2013 +0200
Update to upstream version 3.0.2
- Add separate python-javapackages subpackage
- Add separate fedora-review-plugin-java subpackage
- Enable part of unit tests
.gitignore | 3 ++
javapackages-tools.spec | 63 +++++++++++++++++++++++++++++++++++++++++++++-
sources | 2 +-
3 files changed, 65 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e2d9aa..667a0fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@
/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
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 10737b8..208d613 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,21 +1,29 @@
Name: javapackages-tools
-Version: 2.0.1
+Version: 3.0.2
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
+
+# 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
Requires: coreutils
Requires: libxslt
Requires: lua
Requires: python
+Requires: python-javapackages
Provides: jpackage-utils = %{version}-%{release}
Obsoletes: jpackage-utils < %{version}-%{release}
@@ -27,7 +35,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
@@ -61,6 +69,23 @@ 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}
@@ -68,19 +93,53 @@ This package provides macros and scripts to support packaging Maven artifacts.
%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
+
%files -f files-common
%doc LICENSE
%files -n maven-local -f files-maven
+%{_mavendepmapfragdir}/*xml
+
+%files -n python-javapackages
+%doc LICENSE
+%{python_sitelib}/javapackages*
+
+%files -n fedora-review-plugin-java
+%{_datadir}/fedora-review/plugins/*
%changelog
+* Tue Sep 10 2013 Stanislav Ochotnicky <sochotnicky at 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 at redhat.com> 3.0.0-0.2
+- Fix javadoc directory override
+
+* Tue Sep 3 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> 3.0.0-0.1
+- Update to upstream pre-release version 3.0.0
+
* Fri Jul 26 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.0.1-1
- Update to upstream version 2.0.1
- Fix creation of artifact aliases, resolves: rhbz#988462
diff --git a/sources b/sources
index dc334cb..8ec1cad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c46ed5e20dc9a06f5336ac9420d15a3c javapackages-2.0.1.tar.xz
+89a466cee0ad19a6b5ea02fc796f1e33 javapackages-3.0.2.tar.xz
More information about the scm-commits
mailing list