[maven-shared] Remove plexus-registry from BR/R

Stanislav Ochotnicky sochotni at fedoraproject.org
Thu Sep 16 07:43:39 UTC 2010


commit 108050966aed5c55fecc2700e8bc738aed9acff3
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Sep 16 09:17:48 2010 +0200

    Remove plexus-registry from BR/R

 maven-shared.spec |  151 +++++++++++++++++++++++++++--------------------------
 1 files changed, 77 insertions(+), 74 deletions(-)
---
diff --git a/maven-shared.spec b/maven-shared.spec
index 552b669..1575777 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -28,46 +28,46 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define shared_components_version 15
-%define file_management_version 1.2.2
-%define ant_version 1.0
+%global shared_components_version 15
+%global file_management_version 1.2.2
+%global ant_version 1.0
 
-%define artifact_resolver_version 1.1
+%global artifact_resolver_version 1.1
 
-%define common_artifact_filters_version 1.3
-%define dependency_analyzer_version 1.2
-%define dependency_tree_version 1.3
-%define downloader_version 1.2
+%global common_artifact_filters_version 1.3
+%global dependency_analyzer_version 1.2
+%global dependency_tree_version 1.3
+%global downloader_version 1.2
 
-%define filtering_version 1.0
+%global filtering_version 1.0
 
-%define invoker_version 2.0.12
-%define model_converter_version 2.3
-%define osgi_version 0.3.0
+%global invoker_version 2.0.12
+%global model_converter_version 2.3
+%global osgi_version 0.3.0
 
 #this model is not included in parent pom
-%define reporting_api_version 3.0
+%global reporting_api_version 3.0
 
-%define reporting_impl_version 2.1
-%define repository_builder_version 1.0
+%global reporting_impl_version 2.1
+%global repository_builder_version 1.0
 
-%define runtime_version 1.0
+%global runtime_version 1.0
 
-%define io_version 1.2
-%define jar_version 1.1
-%define monitor_version 1.0
+%global io_version 1.2
+%global jar_version 1.1
+%global monitor_version 1.0
 ### disabled by pom.xml default
-#%define script_ant_version 2.1
-#%define script_beanshell_version 2.1
-#%define test_tools_version 1.0
-#%define toolchain_version 1.0
-%define verifier_version 1.3
-                                                                                
+#%global script_ant_version 2.1
+#%global script_beanshell_version 2.1
+#%global test_tools_version 1.0
+#%global toolchain_version 1.0
+%global verifier_version 1.3
+
 Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        15
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -113,7 +113,6 @@ BuildRequires:  junit
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
 BuildRequires:  plexus-utils
-BuildRequires:  plexus-registry
 BuildRequires:  plexus-digest
 BuildRequires:  modello-maven-plugin
 BuildRequires:  tomcat5-servlet-2.4-api
@@ -131,7 +130,6 @@ Requires:       plexus-utils
 Requires:       saxon
 Requires:       saxon-scripts
 Requires:       plexus-utils
-Requires:       plexus-registry
 Requires:       plexus-digest
 Requires:       objectweb-asm
 Requires:       dom4j
@@ -159,7 +157,7 @@ Requires:  plexus-container-default
 Requires:  plexus-utils
 
 %description file-management
-API to collect files from a given directory using 
+API to collect files from a given directory using
 several include/exclude rules.
 
 %package osgi
@@ -217,7 +215,7 @@ Requires:  %{name} = 0:%{shared_components_version}-%{release}
 Requires:  maven2 >= 0:2.0.7
 
 %description downloader
-Provide a super simple interface for downloading a 
+Provide a super simple interface for downloading a
 single artifact.
 
 %package dependency-analyzer
@@ -301,8 +299,8 @@ Requires:  %{name} = 0:%{shared_components_version}-%{release}
 Requires:  maven2 >= 0:2.0.7
 
 %description jar
-Utilities that help identify the contents of a JAR, 
-including Java class analysis and Maven metadata 
+Utilities that help identify the contents of a JAR,
+including Java class analysis and Maven metadata
 analysis.
 
 %package monitor
@@ -423,13 +421,13 @@ mvn-jpp \
 rm -rf $RPM_BUILD_ROOT
 # main package infrastructure
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-shared
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
 
 # poms and jars
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-components-parent.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-components-parent.pom
 %add_to_maven_depmap org.apache.maven.shared maven-shared-components %{shared_components_version} JPP/maven-shared components-parent
 
-install -pm 644 maven-downloader/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-downloader.pom
+install -pm 644 maven-downloader/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-downloader.pom
 %add_to_maven_depmap org.apache.maven.shared maven-downloader %{downloader_version} JPP/maven-shared downloader
 install -p -m 0644 maven-downloader/target/maven-downloader-%{downloader_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/downloader-%{downloader_version}.jar
@@ -437,7 +435,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf downloader-%{downloader_version}.jar downloader.jar
 popd
 
-install -pm 644 maven-dependency-analyzer/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-dependency-analyzer.pom
+install -pm 644 maven-dependency-analyzer/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-analyzer.pom
 %add_to_maven_depmap org.apache.maven.shared maven-dependency-analyzer %{dependency_analyzer_version} JPP/maven-shared dependency-analyzer
 install -p -m 0644 maven-dependency-analyzer/target/maven-dependency-analyzer-%{dependency_analyzer_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-analyzer-%{dependency_analyzer_version}.jar
@@ -445,7 +443,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf dependency-analyzer-%{dependency_analyzer_version}.jar dependency-analyzer.jar
 popd
 
-install -pm 644 maven-dependency-tree/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-dependency-tree.pom
+install -pm 644 maven-dependency-tree/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
 %add_to_maven_depmap org.apache.maven.shared maven-dependency-tree %{dependency_tree_version} JPP/maven-shared dependency-tree
 install -p -m 0644 maven-dependency-tree/target/maven-dependency-tree-%{dependency_tree_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree-%{dependency_tree_version}.jar
@@ -453,7 +451,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf dependency-tree-%{dependency_tree_version}.jar dependency-tree.jar
 popd
 
-install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-verifier.pom
+install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-verifier.pom
 %add_to_maven_depmap org.apache.maven.shared maven-verifier %{verifier_version} JPP/maven-shared verifier
 install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/verifier-%{verifier_version}.jar
@@ -461,7 +459,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf verifier-%{verifier_version}.jar verifier.jar
 popd
 
-install -pm 644 maven-shared-monitor/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-monitor.pom
+install -pm 644 maven-shared-monitor/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-monitor.pom
 %add_to_maven_depmap org.apache.maven.shared maven-shared-monitor %{monitor_version} JPP/maven-shared monitor
 install -p -m 0644 maven-shared-monitor/target/maven-shared-monitor-%{monitor_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/monitor-%{monitor_version}.jar
@@ -469,7 +467,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf monitor-%{monitor_version}.jar monitor.jar
 popd
 
-install -pm 644 maven-shared-io/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-io.pom
+install -pm 644 maven-shared-io/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-io.pom
 %add_to_maven_depmap org.apache.maven.shared maven-shared-io %{io_version} JPP/maven-shared io
 install -p -m 0644 maven-shared-io/target/maven-shared-io-%{io_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/io-%{io_version}.jar
@@ -477,7 +475,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf io-%{io_version}.jar io.jar
 popd
 
-install -pm 644 maven-shared-jar/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-jar.pom
+install -pm 644 maven-shared-jar/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-jar.pom
 %add_to_maven_depmap org.apache.maven.shared maven-shared-jar %{jar_version} JPP/maven-shared jar
 install -p -m 0644 maven-shared-jar/target/maven-shared-jar-%{jar_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/jar-%{jar_version}.jar
@@ -485,7 +483,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf jar-%{jar_version}.jar jar.jar
 popd
 
-install -pm 644 maven-repository-builder/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-repository-builder.pom
+install -pm 644 maven-repository-builder/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-repository-builder.pom
 %add_to_maven_depmap org.apache.maven.shared maven-repository-builder %{repository_builder_version} JPP/maven-shared repository-builder
 install -p -m 0644 maven-repository-builder/target/maven-repository-builder-%{repository_builder_version}-alpha-3-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/repository-builder-%{repository_builder_version}.jar
@@ -493,7 +491,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf repository-builder-%{repository_builder_version}.jar repository-builder.jar
 popd
 
-install -pm 644 maven-reporting-impl/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-reporting-impl.pom
+install -pm 644 maven-reporting-impl/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-impl.pom
 %add_to_maven_depmap org.apache.maven.reporting maven-reporting-impl %{reporting_impl_version} JPP/maven-shared reporting-impl
 install -p -m 0644 maven-reporting-impl/target/maven-reporting-impl-%{reporting_impl_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-impl-%{reporting_impl_version}.jar
@@ -501,7 +499,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf reporting-impl-%{reporting_impl_version}.jar reporting-impl.jar
 popd
 
-install -pm 644 maven-model-converter/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-model-converter.pom
+install -pm 644 maven-model-converter/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
 %add_to_maven_depmap org.apache.maven.shared maven-model-converter %{model_converter_version} JPP/maven-shared model-converter
 install -p -m 0644 maven-model-converter/target/maven-model-converter-%{model_converter_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/model-converter-%{model_converter_version}.jar
@@ -509,7 +507,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf model-converter-%{model_converter_version}.jar model-converter.jar
 popd
 
-install -pm 644 maven-invoker/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-invoker.pom
+install -pm 644 maven-invoker/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-invoker.pom
 %add_to_maven_depmap org.apache.maven.shared maven-invoker %{invoker_version} JPP/maven-shared invoker
 install -p -m 0644 maven-invoker/target/maven-invoker-%{invoker_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker-%{invoker_version}.jar
@@ -517,7 +515,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf invoker-%{invoker_version}.jar invoker.jar
 popd
 
-install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-common-artifact-filters.pom
+install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
 %add_to_maven_depmap org.apache.maven.shared maven-common-artifact-filters %{common_artifact_filters_version} JPP/maven-shared common-artifact-filters
 install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters-%{common_artifact_filters_version}.jar
@@ -525,7 +523,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf common-artifact-filters-%{common_artifact_filters_version}.jar common-artifact-filters.jar
 popd
 
-install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-ant.pom
+install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-ant.pom
 %add_to_maven_depmap org.apache.maven.shared maven-ant %{ant_version} JPP/maven-shared ant
 install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/ant-%{ant_version}.jar
@@ -533,7 +531,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf ant-%{ant_version}.jar ant.jar
 popd
 
-install -pm 644 maven-osgi/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-osgi.pom
+install -pm 644 maven-osgi/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-osgi.pom
 %add_to_maven_depmap org.apache.maven.shared maven-osgi %{osgi_version} JPP/maven-shared osgi
 install -p -m 0644 maven-osgi/target/maven-osgi-%{osgi_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/osgi-%{osgi_version}.jar
@@ -541,7 +539,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf osgi-%{osgi_version}.jar osgi.jar
 popd
 
-install -pm 644 file-management/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-file-management.pom
+install -pm 644 file-management/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-file-management.pom
 %add_to_maven_depmap org.apache.maven.shared file-management %{file_management_version} JPP/maven-shared file-management
 install -p -m 0644 file-management/target/file-management-%{file_management_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/file-management-%{file_management_version}.jar
@@ -549,7 +547,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   ln -sf file-management-%{file_management_version}.jar file-management.jar
 popd
 
-install -pm 644 maven-artifact-resolver/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-artifact-resolver.pom
+install -pm 644 maven-artifact-resolver/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/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/artifact-resolver-%{artifact_resolver_version}.jar
@@ -557,7 +555,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   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
+install -pm 644 maven-filtering/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/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/filtering-%{filtering_version}.jar
@@ -565,7 +563,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   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
+install -pm 644 maven-reporting-api/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/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/reporting-api-%{reporting_api_version}.jar
@@ -573,7 +571,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
   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
+install -pm 644 maven-runtime/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/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/runtime-%{runtime_version}.jar
@@ -600,105 +598,105 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %dir %{_javadir}/maven-shared
-%dir %{_datadir}/maven2/poms
-%{_datadir}/maven2/poms/JPP.maven-shared-components-parent.pom
+%dir %{_mavenpomdir}
+%{_mavenpomdir}/JPP.maven-shared-components-parent.pom
 %{_mavendepmapfragdir}
 
 %files file-management
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/file-management*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-file-management.pom
+%{_mavenpomdir}/JPP.maven-shared-file-management.pom
 
 %files osgi
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/osgi*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-osgi.pom
+%{_mavenpomdir}/JPP.maven-shared-osgi.pom
 
 %files ant
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/ant*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-ant.pom
+%{_mavenpomdir}/JPP.maven-shared-ant.pom
 
 %files common-artifact-filters
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/common-artifact-filters*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-common-artifact-filters.pom
+%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
 
 %files dependency-analyzer
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/dependency-analyzer*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-dependency-analyzer.pom
+%{_mavenpomdir}/JPP.maven-shared-dependency-analyzer.pom
 
 %files dependency-tree
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/dependency-tree*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-dependency-tree.pom
+%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
 
 %files downloader
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/downloader*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-downloader.pom
+%{_mavenpomdir}/JPP.maven-shared-downloader.pom
 
 %files invoker
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/invoker*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-invoker.pom
+%{_mavenpomdir}/JPP.maven-shared-invoker.pom
 
 %files model-converter
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/model-converter*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-model-converter.pom
+%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
 
 
 %files reporting-impl
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/reporting-impl*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-reporting-impl.pom
+%{_mavenpomdir}/JPP.maven-shared-reporting-impl.pom
 
 %files repository-builder
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/repository-builder*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-repository-builder.pom
+%{_mavenpomdir}/JPP.maven-shared-repository-builder.pom
 
 %files io
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/io*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-io.pom
+%{_mavenpomdir}/JPP.maven-shared-io.pom
 
 %files jar
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/jar*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-jar.pom
+%{_mavenpomdir}/JPP.maven-shared-jar.pom
 
 %files monitor
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/monitor*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-monitor.pom
+%{_mavenpomdir}/JPP.maven-shared-monitor.pom
 
 %files verifier
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/verifier*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-verifier.pom
+%{_mavenpomdir}/JPP.maven-shared-verifier.pom
 
 %files artifact-resolver
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/artifact-resolver*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-artifact-resolver.pom
+%{_mavenpomdir}/JPP.maven-shared-artifact-resolver.pom
 
 %files filtering
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/filtering*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-filtering.pom
+%{_mavenpomdir}/JPP.maven-shared-filtering.pom
 
 %files reporting-api
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/reporting-api*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-reporting-api.pom
+%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
 
 %files runtime
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/runtime*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-runtime.pom
+%{_mavenpomdir}/JPP.maven-shared-runtime.pom
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -706,6 +704,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 16 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 15-12
+- Use %%global instead of %%define
+- Use %%{_mavenpomdir}
+- Remove plexus-registry from BR/R
+
 * Tue Jun 01 2010 Yong Yang <yyang at redhat.com> 15-11
 - Rebuld with maven221
 - Add patches


More information about the scm-commits mailing list