Accepting request 672491 from Java:packages

install compatibility symlink of the jar file + clean-up a bit the spec file

OBS-URL: https://build.opensuse.org/request/show/672491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-ivy?expand=0&rev=15

apache-ivy.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  7 14:48:24 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Add apache-ivy/ivy.jar symlink
+
 -------------------------------------------------------------------
 Mon Nov 26 10:25:21 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 

apache-ivy.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -89,8 +89,9 @@ ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc
 
 %install
 # Code
-install -d %{buildroot}%{_javadir}
+install -d %{buildroot}%{_javadir}/%{name}
 install -p -m644 build/artifact/jars/ivy.jar %{buildroot}%{_javadir}/ivy.jar
+ln -sf ../ivy.jar %{buildroot}%{_javadir}/%{name}/ivy.jar
 
 install -d -m 0755 %{buildroot}/%{_mavenpomdir}/
 install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom
@@ -113,15 +114,13 @@ echo "ivy" > %{buildroot}%{_sysconfdir}/ant.d/%{name}
 install -d %{buildroot}%{_mandir}/man1
 install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1
 
-%files
+%files -f .mfiles
-%license LICENSE
+%license LICENSE NOTICE
-%doc NOTICE README
+%doc README
 %config %{_sysconfdir}/ant.d/%{name}
-%{_javadir}/ivy.jar
+%{_javadir}/%{name}
 %attr(755,root,root) %{_bindir}/*
 %attr(644,root,root) %{_mandir}/man1/*
-%{_mavenpomdir}/JPP-ivy.pom
-%{_datadir}/maven-metadata/%{name}.xml
 
 %files javadoc
 %{_javadocdir}/*