From cd716b4b79534a71238f0d41941bf2d980bde38e008f1da006ef4ae8d7982bab Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 31 Oct 2012 08:28:33 +0000 Subject: [PATCH] - remove the symlink madness - jar and javadoc are not versioned anymore OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-commons?expand=0&rev=12 --- xmlgraphics-commons.changes | 5 +++++ xmlgraphics-commons.spec | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xmlgraphics-commons.changes b/xmlgraphics-commons.changes index e1f13de..ca30ce7 100644 --- a/xmlgraphics-commons.changes +++ b/xmlgraphics-commons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 31 08:28:00 UTC 2012 - mvyskocil@suse.com + +- remove the symlink madness - jar and javadoc are not versioned anymore + ------------------------------------------------------------------- Wed Oct 24 10:13:01 UTC 2012 - mvyskocil@suse.com diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index b713e98..f98b6d1 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -79,8 +79,8 @@ ant package javadocs maven-artifacts %install install -Dpm 644 build/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + # %add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name} # pom @@ -89,7 +89,6 @@ install -pm 644 build/maven/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-% install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -105,13 +104,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) %doc LICENSE -%{_javadir}/*.jar +%{_javadir}/%{name}.jar %{_datadir}/maven2/* %{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %changelog