From 312839e256d0231582f7300ab74f7750057d73d6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 6 Jan 2014 23:18:10 +0100
Subject: [PATCH] Fix usage of %add_maven_depmap for zip files

- Resolves: rhbz#1004310
---
 tycho.spec | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/tycho.spec b/tycho.spec
index b7175b2..0d87a76 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
 
 Name:           tycho
 Version:        0.19.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -246,8 +246,7 @@ done
 pushd tycho-bundles/tycho-bundles-external
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
 install -m 644 target/tycho-bundles-external-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-bundles-external.zip
-ln -s tycho-bundles-external.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-bundles-external.jar
-%add_maven_depmap -f zip JPP.%{name}-tycho-bundles-external.pom %{name}/tycho-bundles-external.jar -a "org.eclipse.tycho:tycho-bundles-external,org.sonatype.tycho:tycho-bundles-external"
+%add_maven_depmap JPP.%{name}-tycho-bundles-external.pom %{name}/tycho-bundles-external.zip -a "org.eclipse.tycho:tycho-bundles-external,org.sonatype.tycho:tycho-bundles-external"
 popd
 
 # main
@@ -257,10 +256,9 @@ install -pm 644 pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-main.pom
 # standalone p2 director
 pushd .m2/org/eclipse/tycho/tycho-standalone-p2-director/%{version}*/
 install -m 644 tycho-standalone-p2-director-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-standalone-p2-director.zip
-ln -s tycho-standalone-p2-director.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-standalone-p2-director.jar
 install -pm 644 tycho-standalone-p2-director-%{version}*.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-standalone-p2-director.pom
 popd
-%add_maven_depmap -f zip JPP.%{name}-tycho-standalone-p2-director.pom tycho/tycho-standalone-p2-director.jar -a "org.eclipse.tycho:tycho-standalone-p2-director,org.sonatype.tycho:tycho-standalone-p2-director"
+%add_maven_depmap JPP.%{name}-tycho-standalone-p2-director.pom tycho/tycho-standalone-p2-director.zip -a "org.eclipse.tycho:tycho-standalone-p2-director,org.sonatype.tycho:tycho-standalone-p2-director"
 
 # javadoc
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -288,16 +286,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
 %add_maven_depmap JPP.%{name}-osgi.pom %{name}/osgi.jar -a "org.eclipse.tycho:org.eclipse.osgi"
 %endif
 
-# This is a temporary workaround for rhbz#1004310.  This is a hack,
-# but it is needed to make tycho work until this bug is fixed
-# properly.
-sed -i 's|<maven>|&<extension>zip</extension>|' \
-    $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name}-zip
-
 %files
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/%{name}
-%{_mavendepmapfragdir}/%{name}-zip
 %{_javadir}/%{name}/
 %doc README.md
 
@@ -305,6 +296,10 @@ sed -i 's|<maven>|&<extension>zip</extension>|' \
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jan  6 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.19.0-6
+- Fix usage of %%add_maven_depmap for zip files
+- Resolves: rhbz#1004310
+
 * Mon Dec 9 2013 Alexander Kurtakov <akurtako@redhat.com> 0.19.0-5
 - Switch to using %%mvn_build.
 - Update BR/R names.