From dbaea4800704bf2ffa58dc358d7ed1ac707d7cf2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Aug 15 2013 17:56:03 +0000 Subject: Another attempt at fixing the install --- diff --git a/ant-antunit.spec b/ant-antunit.spec index cda4a36..6724018 100644 --- a/ant-antunit.spec +++ b/ant-antunit.spec @@ -2,7 +2,7 @@ Name: ant-%{base_name} Version: 1.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Provide antunit ant task Group: Development/Libraries License: ASL 2.0 @@ -55,6 +55,8 @@ ant package # jars install -d -m 0755 %{buildroot}%{_javadir}/ant install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/%{name}.jar +install -d -m 0755 %{buildroot}%{_datadir}/ant/lib +ln -s ../../java/ant/%{name}.jar %{buildroot}%{_datadir}/ant/lib # pom install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -67,12 +69,13 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}/ # OPT_JAR_LIST fragments mkdir -p %{buildroot}%{_sysconfdir}/ant.d -echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/ant.d/antunit +echo "%{base_name} ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name} %files -f .mfiles %doc CONTRIBUTORS LICENSE NOTICE README README.html WHATSNEW -%config(noreplace) %{_sysconfdir}/ant.d/antunit +%config(noreplace) %{_sysconfdir}/ant.d/%{base_name} +%{_datadir}/ant/lib/%{name}.jar %files javadoc %doc LICENSE @@ -80,6 +83,9 @@ echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/ant.d/antunit %changelog +* Thu Aug 15 2013 Orion Poplawski 1.2-12 +- Another attempt at fixing the install + * Thu Aug 15 2013 Orion Poplawski 1.2-11 - Fix install locations (bug 988561)