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

[Michal Srb]

commit f4e7893b6c3fc7db67871ddf4a31a89cec9c2e08
Merge: 99625ae 06282ff
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Mar 23 13:28:28 2015 +0100

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

 .gitignore              |  1 +
 javapackages-tools.spec | 50 ++++++++++++++++++++++++++++++++++++++++++-------
 sources                 |  2 +-
 3 files changed, 45 insertions(+), 8 deletions(-)
---
diff --cc javapackages-tools.spec
index c39583e,7d59873..c579a04
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@@ -160,13 -176,8 +176,6 @@@ 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
- 
 -%patch0 -p1
--
  %build
  %if 0%{?with_python3}
  %configure --pyinterpreter=%{__python3}