Update to upstream version 4.3.1

.gitignore

@@ -63,3 +63,4 @@
 /javapackages-4.1.0.tar.xz
 /javapackages-4.2.0.tar.xz
 /javapackages-4.3.0.tar.xz
+/javapackages-4.3.1.tar.xz

javapackages-tools.spec

@@ -1,4 +1,4 @@
-%if 0%{?fedora} > 12
+%if 0%{?fedora} > 21
 %global with_python3 1
 %else
 %{!?__python2: %global __python2 /usr/bin/python2}
@@ -6,7 +6,7 @@
 %endif
 
 Name:           javapackages-tools
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
@@ -22,14 +22,12 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-lxml
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-nose
-BuildRequires:  python3-six
 BuildRequires:  python3-PyXB = 1.2.4
 %else
 BuildRequires:  python2-devel
 BuildRequires:  python-lxml
 BuildRequires:  python-setuptools
 BuildRequires:  python-nose
-BuildRequires:  python-six
 BuildRequires:  PyXB = 1.2.4
 %endif
 BuildRequires:  asciidoc
@@ -116,7 +114,6 @@ artifact resolution using XMvn resolver.
 Summary:        Module for handling various files for Java packaging
 Requires:       python3-PyXB = 1.2.4
 Requires:       python3-lxml
-Requires:       python3-six
 Obsoletes:      python-javapackages < %{version}-%{release}
 
 %description -n python3-javapackages
@@ -128,7 +125,6 @@ packaging in Linux distributions
 Summary:        Module for handling various files for Java packaging
 Requires:       PyXB = 1.2.4
 Requires:       python-lxml
-Requires:       python-six
 Obsoletes:      python3-javapackages < %{version}-%{release}
 
 %description -n python-javapackages
@@ -164,24 +160,13 @@ This package provides non-essential macros and scripts to support Java packaging
 %prep
 %setup -q -n javapackages-%{version}
 
-%if 0%{?with_python3}
-find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
-find ./depgenerators -name '*.req' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
-find ./depgenerators -name '*.prov' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
-%endif # with_python3
-
-
 %build
-%configure
-./build
-
-pushd python
 %if 0%{?with_python3}
-  %{__python3} setup.py build
+%configure --pyinterpreter=%{__python3}
 %else
-%{__python2} setup.py build
+%configure --pyinterpreter=%{__python2}
 %endif
-popd
+./build
 
 %install
 ./install
@@ -196,11 +181,7 @@ pushd python
 popd
 
 %check
-%if 0%{?with_python3}
+./check
-./check 3
-%else
-./check 2
-%endif
 
 %files -f files-common
 %doc LICENSE
@@ -228,6 +209,9 @@ popd
 %doc LICENSE
 
 %changelog
+* Tue Dec 23 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.1-1
+- Update to upstream version 4.3.1
+
 * Sun Dec 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.0-1
 - Update to upstream version 4.3.0
 

sources

@@ -1 +1 @@
-e928cf74c80905529cb0ecfcb0ceef0a  javapackages-4.3.0.tar.xz
+76aa1bc751e4667f3de6067d1df9c3e3  javapackages-4.3.1.tar.xz