[jetty-version-maven-plugin] Fix backport-util-concurrent dependency
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Feb 19 12:53:14 UTC 2013
commit 1a2421a1dfc60a373b7174de3d8243ca9e2d9ca1
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Feb 19 13:49:41 2013 +0100
Fix backport-util-concurrent dependency
- Use file lists
jetty-version-maven-plugin.spec | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/jetty-version-maven-plugin.spec b/jetty-version-maven-plugin.spec
index ca9cf35..0f0a6b2 100644
--- a/jetty-version-maven-plugin.spec
+++ b/jetty-version-maven-plugin.spec
@@ -39,6 +39,11 @@ Requires: jpackage-utils
%setup -q
cp -p jetty-distribution-remote-resources/src/main/resources/* .
+# we have java.util stuff in JVM directly now
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=401163
+sed -i 's|edu.emory.mathcs.backport.||' \
+ jetty-version-maven-plugin/src/main/java/org/eclipse/jetty/toolchain/version/Release.java
+
%build
pushd %{name}
# skip tests because we don't have jetty-test-helper (yet)
@@ -60,17 +65,18 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
popd
-%files
+%files -f %{name}/.mfiles
%doc LICENSE-APACHE-2.0.txt LICENSE-ECLIPSE-1.0.html notice.html
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_javadir}/%{name}.jar
-%{_mavendepmapfragdir}/%{name}
%files javadoc
%doc LICENSE-APACHE-2.0.txt LICENSE-ECLIPSE-1.0.html notice.html
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Feb 19 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0.7-7
+- Fix backport-util-concurrent dependency
+- Use file lists
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -92,4 +98,3 @@ popd
* Thu Nov 3 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0.7-1
- Initial version of the package
-
More information about the scm-commits
mailing list