[jpackage-utils/f15] Add fedora specific extension macros including depgenerators

[Stanislav Ochotnicky]

commit 9477bd1de546ecd0f7bbc1334739ecb31d70de80
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Jun 6 10:39:50 2011 +0200

    Add fedora specific extension macros including depgenerators
    
    - Guidelines fixes (buildroot def, cleaning etc)
    - Added osgi/maven provides from rawhide
    - Added custom macros from rawhide (add_maven_depmap)
    
    Conflicts:
    
    	jpackage-utils.spec

 jpackage-utils.spec |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 deletions(-)
---
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 08b0910..921df1a 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -32,9 +32,11 @@
 %global distver 1.7
 %global section free
 
+%global fj_version 0.2.3
+
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        4.12%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -43,8 +45,8 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-README
 Source2:        abs2rel.sh
 Source3:        abs2rel.lua
-Source4:        maven.prov
-Source5:        maven.attr
+# fedora specific macros
+Source8:        https://fedorahosted.org/released/javapackages/javapackages-%{fj_version}.tar.xz
 Patch1:         %{name}-own-mavendirs.patch
 Patch2:         %{name}-prefer-jre.patch
 Patch3:         %{name}-set-classpath.patch
@@ -53,13 +55,14 @@ Group:          Utilities
 BuildArch:      noarch
 
 Requires:       coreutils
+Requires:       python
 
 %description
 Utilities for the JPackage Project <http://www.jpackage.org/>.
 
 It contains also the License, man pages, documentation, XSL files of general
-use with maven2, a header file for spec files, etc. Please See 
-the %{_docdir}/%{name}-%{version}/%{name}-README file for more 
+use with maven2, a header file for spec files, etc. Please See
+the %{_docdir}/%{name}-%{version}/%{name}-README file for more
 information.
 
 %prep
@@ -68,7 +71,9 @@ information.
 %patch2 -p1
 %patch3 -p1
 
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
+
+tar xf javapackages-%{fj_version}.tar.xz
 
 %build
 echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \
@@ -165,10 +170,21 @@ install -pm 644 man/* ${RPM_BUILD_ROOT}%{_mandir}/man1
 %{__mkdir_p} ${RPM_BUILD_ROOT}${_javadir}-utils/xml
 install -pm 644 xml/* ${RPM_BUILD_ROOT}${_javadir}-utils/xml
 
+
+# fedora-specific extensions
+pushd javapackages-%{fj_version}
 # Add the provides script
-install -m0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/maven.prov
+install -m0755 -D depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/maven.prov
+install -m0755 -D depgenerators/osgi.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/osgi.prov
 # Add the maven poms file attribute entry (rpm >= 4.9.0)
-install -m0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/maven.attr
+install -m0644 -D depgenerators/fileattrs/maven.attr \
+                  $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/maven.attr
+install -m0644 -D depgenerators/fileattrs/osgi.attr \
+                  $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/osgi.attr
+
+install -pm 644 macros.fjava ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+install -pm 644 scripts/maven_depmap.py ${RPM_BUILD_ROOT}${_javadir}-utils
+popd
 
 cat <<EOF > %{name}-%{version}.files
 %{_bindir}/*
@@ -197,24 +213,36 @@ cat <<EOF > %{name}-%{version}.files
 %dir ${_mavendepmapfragdir}
 ${_javadir}-utils/*
 %{_rpmconfigdir}/maven.prov
+%{_rpmconfigdir}/osgi.prov
 %{_rpmconfigdir}/fileattrs/maven.attr
+%{_rpmconfigdir}/fileattrs/osgi.attr
 %config %{_sysconfdir}/java/jpackage-release
 %config(noreplace) %{_sysconfdir}/java/java.conf
 %config(noreplace) %{_sysconfdir}/java/font.properties
 %config(noreplace) %{_sysconfdir}/rpm/macros.jpackage
+%config(noreplace) %{_sysconfdir}/rpm/macros.fjava
 %config(noreplace) ${_mavendepmapdir}/maven2-depmap.xml
 EOF
 
 %files -f %{name}-%{version}.files
-%defattr(-,root,root,-)
 %doc %{name}-README LICENSE.txt HEADER.JPP doc/* etc/httpd-javadoc.conf
 
 
 %changelog
+* Fri Jun  3 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-5
+- Guidelines fixes (buildroot def, cleaning etc)
+- Add fedora specific extension macros including depgenerators
+
+* Tue May 31 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.7.5-4.14
+- Proper osgi attr file.
+
+* Tue May 31 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.7.5-4.13
+- Add OSGi provides generator.
+
 * Fri Apr 15 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.7.5-4.12
 - Update to current guidelines.
 - Drop patch enabling gcj_support macro by default.
-- Don't install ${_javadir}-{1.3.1,1.4.0,1.4.1,1.4.2} and ${_jnidir}-{1.3.1,1.4.0,1.4.1,1.4.2}. 
+- Don't install ${_javadir}-{1.3.1,1.4.0,1.4.1,1.4.2} and ${_jnidir}-{1.3.1,1.4.0,1.4.1,1.4.2}.
 - Add mvn(groupId:artifactId) provides generator.
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7.5-4.11
@@ -232,7 +260,7 @@ EOF
 * Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 0:1.7.5-3.8
 - Add Requires: coreutils because we provide scripts that are being executed
   in rpm %%post scriptlets that require it.
- 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7.5-3.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild