/[packages]/cauldron/maven-shared/current/SPECS/maven-shared.spec
ViewVC logotype

Diff of /cauldron/maven-shared/current/SPECS/maven-shared.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 180389 by gil, Sat Dec 10 00:42:49 2011 UTC revision 180390 by gil, Sat Dec 10 16:27:53 2011 UTC
# Line 81  Patch0:        %{name}-pom.patch Line 81  Patch0:        %{name}-pom.patch
81  Patch1:        %{name}-maven3.patch  Patch1:        %{name}-maven3.patch
82  Patch2:        maven-shared-maven-model-v3-removal.patch  Patch2:        maven-shared-maven-model-v3-removal.patch
83  Patch3:        maven-shared-migration-to-component-metadata.patch  Patch3:        maven-shared-migration-to-component-metadata.patch
84    Patch4:        maven-downloader-qdox.patch
85  Patch6:        maven-runtime-XMLMavenRuntimeVisitor.patch  Patch6:        maven-runtime-XMLMavenRuntimeVisitor.patch
86    
87    
# Line 111  BuildRequires:  maven-test-tools Line 112  BuildRequires:  maven-test-tools
112  BuildRequires:  plexus-containers-component-metadata  BuildRequires:  plexus-containers-component-metadata
113  BuildRequires:  plexus-component-api  BuildRequires:  plexus-component-api
114  BuildRequires:  maven-plugin-cobertura  BuildRequires:  maven-plugin-cobertura
115    BuildRequires:  jmock1
116  BuildRequires:  junit  BuildRequires:  junit
117    BuildRequires:  junit-addons
118  BuildRequires:  saxon  BuildRequires:  saxon
119  BuildRequires:  saxon-scripts  BuildRequires:  saxon-scripts
120  BuildRequires:  plexus-utils  BuildRequires:  plexus-utils
# Line 416  order, and also for a given class within Line 419  order, and also for a given class within
419  %setup -q -n %{name}-components-%{shared_components_version}  %setup -q -n %{name}-components-%{shared_components_version}
420  chmod -R go=u-w *  chmod -R go=u-w *
421  %patch0 -b .sav0  %patch0 -b .sav0
422  %patch1 -p1 -b .sav1  #%patch1 -p1 -b .sav1
423  %patch6 -b .sav6  %patch6 -b .sav6
424  %patch2 -p1  %patch2 -p1
425  %patch3 -p1  %patch3 -p1
426    %patch4 -p0
427  # Fix aqute-bnd dependency  # Fix aqute-bnd dependency
428  sed -i "s|<artifactId>bndlib|<artifactId>bnd|g" maven-osgi/pom.xml  sed -i "s|<artifactId>bndlib|<artifactId>bnd|g" maven-osgi/pom.xml
429    
# Line 429  sed -i "s|<model>|<model xmlns=\"http:// Line 432  sed -i "s|<model>|<model xmlns=\"http://
432    
433  sed -i "s|<groupId>ant|<groupId>org.apache.ant|g" maven-ant/pom.xml  sed -i "s|<groupId>ant|<groupId>org.apache.ant|g" maven-ant/pom.xml
434  # Remove test that needs junit-addons until that makes it into Fedora  # Remove test that needs junit-addons until that makes it into Fedora
435  rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java  #rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
436    
437  # Remove tests that need jmock (for now)  # Remove tests that need jmock (for now)
438  rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/InputStreamConstraint.java  rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/InputStreamConstraint.java
# Line 466  install -p -m 0644 maven-dependency-anal Line 469  install -p -m 0644 maven-dependency-anal
469  install -pm 644 maven-dependency-tree/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom  install -pm 644 maven-dependency-tree/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
470  install -p -m 0644 maven-dependency-tree/target/maven-dependency-tree-%{dependency_tree_version}-SNAPSHOT.jar \  install -p -m 0644 maven-dependency-tree/target/maven-dependency-tree-%{dependency_tree_version}-SNAPSHOT.jar \
471          $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree.jar          $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree.jar
472  %add_maven_depmap -f dependency-tree JPP.%{name}-dependency-tree.pom %{name}/dependency-tree.ja  %add_maven_depmap -f dependency-tree JPP.%{name}-dependency-tree.pom %{name}/dependency-tree.jar
473    
474  install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-verifier.pom  install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-verifier.pom
475  install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar \  install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar \
Legend:
Removed from v.180389  
changed lines
  Added in v.180390
  ViewVC Help
Powered by ViewVC 1.1.30