[maven2] Create dangling symlinks during install (Resolves rhbz#613866)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Mon Sep 20 14:50:32 UTC 2010
commit 297de44d6fc978e19600deac208a83c569826aa9
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon Sep 20 16:50:19 2010 +0200
Create dangling symlinks during install (Resolves rhbz#613866)
maven2.spec | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 287e022..dce04d1 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -455,28 +455,26 @@ install -m 644 maven-reporting/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/J
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven.pom
%add_to_maven_depmap org.apache.maven maven %{version} JPP/%{name} maven
-%post
-%update_maven_depmap
-(cd %{_datadir}/%{name}/lib
+# create dangling symlinks but fix bz#613866
+(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
build-jar-repository -s -p . jdom
)
-(cd %{_datadir}/%{name}/boot
+(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/boot
build-jar-repository -s -p . classworlds
)
%if ! %{bootstrap}
-(cd %{_datadir}/%{name}/lib
+(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
build-jar-repository -s -p . backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-shared/reporting-api maven-doxia/logging-api maven-doxia/sink-api maven-wagon/file maven-wagon/http maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external plexus/container-default plexus/interactivity-api plexus/interpolation plexus/utils slf4j/jcl-over-slf4j slf4j/api slf4j/jdk14 slf4j/nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2
)
%endif
-%postun
+%post
%update_maven_depmap
-%preun
-rm -f %{_datadir}/%{name}/lib/*jar
-rm -f %{_datadir}/%{name}/boot/classworlds.jar
+%postun
+%update_maven_depmap
%clean
rm -rf $RPM_BUILD_ROOT
@@ -504,6 +502,9 @@ rm -rf $RPM_BUILD_ROOT
%doc
%changelog
+* Mon Sep 20 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-13
+- Create dangling symlinks during install (Resolves rhbz#613866)
+
* Fri Sep 17 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-12
- Update JPackageRepositoryLayout to handle "signature" packaging
More information about the scm-commits
mailing list