From 516d6f31bf9f43e38772bb347fc007c2f6141407 Mon Sep 17 00:00:00 2001 From: Levente Farkas Date: Wed, 20 Jun 2012 17:26:33 +0200 Subject: [PATCH] fix maven bug #833786 --- jna.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/jna.spec b/jna.spec index 68aa1b8..bbc0cb4 100644 --- a/jna.spec +++ b/jna.spec @@ -133,11 +133,11 @@ install -m 755 build*/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %if 0%{?fedora} >= 9 || 0%{?rhel} > 5 # install maven pom file install -Dm 644 pom-%{name}.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -install -Dm 644 pom-platform.xml %{buildroot}%{_mavenpomdir}/JPP-platform.pom +install -Dm 644 pom-platform.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-platform.pom # ... and maven depmap -%add_to_maven_depmap net.java.dev.jna %{name} %{version} JPP %{name} -%add_to_maven_depmap net.java.dev.jna platform %{version} JPP platform +%add_maven_depmap JPP-%{name}.pom %{name}.jar +%add_maven_depmap JPP.%{name}-platform.pom -f platform %{name}/platform.jar %endif # javadocs @@ -158,23 +158,13 @@ cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name} rm -rf %{buildroot} -%if 0%{?fedora} >= 9 || 0%{?rhel} > 5 -%post -%update_maven_depmap - - -%postun -%update_maven_depmap -%endif - - %files %defattr(-,root,root,-) %doc LICENSE OTHERS README.md CHANGES.md TODO %{_libdir}/%{name} %{_javadir}/%{name}.jar %if 0%{?fedora} >= 9 || 0%{?rhel} > 5 -%{_mavenpomdir}/*.pom +%{_mavenpomdir}/JPP-%{name}.pom %{_mavendepmapfragdir}/%{name} %endif @@ -188,6 +178,10 @@ rm -rf %{buildroot} %files contrib %defattr(-,root,root,-) %{_javadir}/%{name} +%if 0%{?fedora} >= 9 || 0%{?rhel} > 5 +%{_mavenpomdir}/JPP.%{name}-platform.pom +%{_mavendepmapfragdir}/%{name}-platform +%endif %changelog