[ant-antunit] Fix install locations (bug 988561)

Orion Poplawski orion at fedoraproject.org
Thu Aug 15 14:34:06 UTC 2013


commit 0c9039bad7eaa036e5febefaaff38e5f6a1b572e
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Aug 15 08:33:56 2013 -0600

    Fix install locations (bug 988561)

 ant-antunit.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/ant-antunit.spec b/ant-antunit.spec
index acc7bb9..cda4a36 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
 
 Name:             ant-%{base_name}
 Version:          1.2
-Release:          10%{?dist}
+Release:          11%{?dist}
 Summary:          Provide antunit ant task
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -53,26 +53,26 @@ ant package
 
 %install
 # jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -d -m 0755 %{buildroot}%{_javadir}/ant
+install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.ant-%{name}.pom
+%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}/
 
 # OPT_JAR_LIST fragments
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
-echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/%{name}.d/antunit
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/ant.d/antunit
 
 
 %files -f .mfiles
 %doc CONTRIBUTORS LICENSE NOTICE README README.html WHATSNEW
-%config(noreplace) %{_sysconfdir}/%{name}.d/antunit
+%config(noreplace) %{_sysconfdir}/ant.d/antunit
 
 %files javadoc
 %doc LICENSE
@@ -80,6 +80,9 @@ echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/%{name}.d/antunit
 
 
 %changelog
+* Thu Aug 15 2013 Orion Poplawski <orion at cora.nwra.com> 1.2-11
+- Fix install locations (bug 988561)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list