[maven-license-plugin: 2/2] fix FTBFS
Guido Grazioli
guidograzioli at fedoraproject.org
Fri Jun 24 03:23:34 UTC 2011
commit 271e94798a81bbd56a4f5b5747387739569fe3fa
Merge: a5e7375 a653687
Author: Guido Grazioli <guido.grazioli at gmail.com>
Date: Fri Jun 24 05:23:12 2011 +0200
fix FTBFS
maven-license-plugin.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --cc maven-license-plugin.spec
index 4c72924,e88621a..0bd3c05
--- a/maven-license-plugin.spec
+++ b/maven-license-plugin.spec
@@@ -1,6 -1,6 +1,6 @@@
Name: maven-license-plugin
Version: 1.8.0
--Release: 3%{?dist}
++Release: 4%{?dist}
Summary: Maven plugin to update header licenses of source files
Group: Development/Libraries
@@@ -92,19 -102,18 +92,18 @@@ mvn-local -Dmaven.test.skip=true instal
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
+
+# jar
install -Dp -m 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-%{version}.jar %{name}.jar)
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp target/site/apidocs/ \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+# javadoc
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
--install -pm 644 pom.xml \
-- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
++install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap com.mycila.maven-license-plugin %{name} %{version} JPP %{name}
@@@ -132,13 -142,10 +131,16 @@@ rm -rf $RPM_BUILD_ROO
%postun
%update_maven_depmap
+
%changelog
- * Fri Jun 24 2011 Guido Grazioli <guido.grazioli at gmail.com> - 1.8.0-3
++* Fri Jun 24 2011 Guido Grazioli <guido.grazioli at gmail.com> - 1.8.0-4
+- Fix FTBFS
+- Update to maven 3
+- Adapt to current guidelines
+
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Sun Oct 17 2010 Guido Grazioli <guido.grazioli at gmail.com> - 1.8.0-2
- Add missing Requires and update BuildRequires
- Fix macro usage
More information about the scm-commits
mailing list