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 1.2-11 +- Fix install locations (bug 988561) + * Sat Aug 03 2013 Fedora Release Engineering - 1.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild