[javapackages-tools/jenkins: 32/32] Merge branch 'master' into jenkins

[Michal Srb]

commit 7c41e351e9698dc76e42650d23f6a22347b3a99b
Merge: c361747 d2960d4
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Jan 8 08:35:10 2015 +0100

    Merge branch 'master' into jenkins
    
    Conflicts:
    	build.bash
    	javapackages-tools.spec

 .gitignore                                         |    6 +
 0001-Add-support-for-installing-hpi.patch          |   85 ---------------
 ...rs-Switch-to-require-java-headless-instea.patch |   26 -----
 ...st-Fix-testsuite-for-java-headless-change.patch |   34 ------
 fedora-rawhide-x86_64.cfg                          |   37 -------
 javapackages-tools.spec                            |  109 ++++++++++++++++----
 sources                                            |    2 +-
 7 files changed, 97 insertions(+), 202 deletions(-)
---
diff --cc javapackages-tools.spec
index 86376a7,52ec970..c39583e
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@@ -6,8 -6,8 +6,8 @@@
  %endif
  
  Name:           javapackages-tools
- Version:        4.2.0
- Release:        2%{?dist}
 -Version:        4.3.2
++Version:        4.4.0
+ Release:        1%{?dist}
  
  Summary:        Macros and scripts for Java packaging support
  
@@@ -161,24 -160,13 +160,20 @@@ This package provides non-essential mac
  %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