rpms/maven-shared/devel maven-shared.spec,1.21,1.22

[Yang Yong]

Author: yyang

Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31678

Modified Files:
	maven-shared.spec 
Log Message:
Fix installed jar name of artifact-resolver, filtering, reporting-api, runtime


Index: maven-shared.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- maven-shared.spec	31 May 2010 18:46:49 -0000	1.21
+++ maven-shared.spec	1 Jun 2010 02:43:08 -0000	1.22
@@ -67,7 +67,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        15
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -533,33 +533,33 @@ popd
 install -pm 644 maven-artifact-resolver/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-artifact-resolver.pom
 %add_to_maven_depmap org.apache.maven.shared maven-artifact-resolver %{artifact_resolver_version} JPP/maven-shared artifact-resolver
 install -p -m 0644 maven-artifact-resolver/target/maven-artifact-resolver-%{artifact_resolver_version}-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-artifact-resolver-%{artifact_resolver_version}.jar
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/artifact-resolver-%{artifact_resolver_version}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-  ln -sf maven-artifact-resolver-%{artifact_resolver_version}.jar maven-artifact-resolver.jar
+  ln -sf artifact-resolver-%{artifact_resolver_version}.jar artifact-resolver.jar
 popd
 
 install -pm 644 maven-filtering/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-filtering.pom
 %add_to_maven_depmap org.apache.maven.shared maven-filtering %{filtering_version} JPP/maven-shared filtering
 install -p -m 0644 maven-filtering/target/maven-filtering-%{filtering_version}-beta-4-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-filtering-%{filtering_version}.jar
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering-%{filtering_version}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-  ln -sf maven-filtering-%{filtering_version}.jar maven-filtering.jar
+  ln -sf filtering-%{filtering_version}.jar filtering.jar
 popd
 
 install -pm 644 maven-reporting-api/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-reporting-api.pom
 %add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version} JPP/maven-shared reporting-api
 install -p -m 0644 maven-reporting-api/target/maven-reporting-api-%{reporting_api_version}-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-reporting-api-%{reporting_api_version}.jar
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-api-%{reporting_api_version}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-  ln -sf maven-reporting-api-%{reporting_api_version}.jar maven-reporting-api.jar
+  ln -sf reporting-api-%{reporting_api_version}.jar reporting-api.jar
 popd
 
 install -pm 644 maven-runtime/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-runtime.pom
 %add_to_maven_depmap org.apache.maven.shared maven-runtime %{runtime_version} JPP/maven-shared runtime
 install -p -m 0644 maven-runtime/target/maven-runtime-%{runtime_version}-alpha-3-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-runtime-%{runtime_version}.jar
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/runtime-%{runtime_version}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-  ln -sf maven-runtime-%{runtime_version}.jar maven-runtime.jar
+  ln -sf runtime-%{runtime_version}.jar runtime.jar
 popd
 
 # javadoc
@@ -723,22 +723,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files artifact-resolver
 %defattr(-,root,root,-)
-%{_javadir}/maven-shared/maven-artifact-resolver*.jar
+%{_javadir}/maven-shared/artifact-resolver*.jar
 %{_datadir}/maven2/poms/JPP.maven-shared-artifact-resolver.pom
 
 %files filtering
 %defattr(-,root,root,-)
-%{_javadir}/maven-shared/maven-filtering*.jar
+%{_javadir}/maven-shared/filtering*.jar
 %{_datadir}/maven2/poms/JPP.maven-shared-filtering.pom
 
 %files reporting-api
 %defattr(-,root,root,-)
-%{_javadir}/maven-shared/maven-reporting-api*.jar
+%{_javadir}/maven-shared/reporting-api*.jar
 %{_datadir}/maven2/poms/JPP.maven-shared-reporting-api.pom
 
 %files runtime
 %defattr(-,root,root,-)
-%{_javadir}/maven-shared/maven-runtime*.jar
+%{_javadir}/maven-shared/runtime*.jar
 %{_datadir}/maven2/poms/JPP.maven-shared-runtime.pom
 
 %files javadoc
@@ -747,6 +747,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 01 2010 Yong Yang <yyang at redhat.com> 15-10
+- Fix installed jar name of artifact-resolver, filtering, reporting-api, runtime
+
 * Mon May 31 2010 Alexander Kurtakov <akurtako at redhat.com> 15-9
 - Reenable reporting api.
 - Fix groups.