[jpackage-utils/f17] Rebase to latest javapackages-tools (0.9.0)

[Stanislav Ochotnicky]

commit 78404dc0c379d10e632530b8f60f0454fdaec8f1
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Fri Dec 7 14:04:17 2012 +0100

    Rebase to latest javapackages-tools (0.9.0)
    
    - Keep osgi requires generator disabled

 .gitignore                                         |    1 +
 ...ven-provides-from-fragments-instead-of-po.patch |   86 -----
 ...d-default-parameters-for-add_maven_depmap.patch |   63 ----
 0003-Add-POM-macros-to-macros.fjava.patch          |  373 --------------------
 jpackage-utils.spec                                |   16 +-
 sources                                            |    2 +-
 6 files changed, 10 insertions(+), 531 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 570a901..cc06d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ jpackage-utils-1.7.5.tar.bz2
 /javapackages-0.2.4.tar.xz
 /javapackages-0.2.5.tar.xz
 /javapackages-0.2.6.tar.xz
+/javapackages-0.9.0.tar.xz
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index ff6911b..8142ea0 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -32,13 +32,13 @@
 %global distver 1.7
 %global section free
 
-%global fj_version 0.2.6
+%global fj_version 0.9.0
 
 %global debug_package %{nil}
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        18.1%{?dist}
+Release:        18.2%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -53,9 +53,6 @@ Patch1:         %{name}-own-mavendirs.patch
 Patch2:         %{name}-prefer-jre.patch
 Patch3:         %{name}-set-classpath.patch
 Patch4:         %{name}-jnidir.patch
-Patch5:         0001-Generate-maven-provides-from-fragments-instead-of-po.patch
-Patch6:         0002-Add-default-parameters-for-add_maven_depmap.patch
-Patch7:         0003-Add-POM-macros-to-macros.fjava.patch
 Patch8:         %{name}-build-classpath-symlink-fix.patch
 Group:          Utilities
 
@@ -86,9 +83,8 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
 
 tar xf javapackages-%{fj_version}.tar.xz
 cd javapackages-%{fj_version}
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+# turn off osgi requires generator for older Fedoras
+sed -i '/__osgi_requires/d' depgenerators/fileattrs/osgi.attr
 
 %build
 echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \
@@ -250,6 +246,10 @@ EOF
 
 
 %changelog
+* Fri Dec  7 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-18.2
+- Rebase to latest javapackages-tools (0.9.0)
+- Keep osgi requires generator disabled
+
 * Mon Jul 09 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-18.1
 - Backport macros for pom file modificaiton
 - Fix build-classpath ignoring symlinks in subdirs
diff --git a/sources b/sources
index 879cd72..fef997c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 5039b51d1e80e45da27faf131448eaa8  jpackage-utils-1.7.5.tar.bz2
-eaec9d13b3cf9230cadf973f8fc6c8e6  javapackages-0.2.6.tar.xz
+ee37ccdec3c43cb025a62dbbee7696a8  javapackages-0.9.0.tar.xz