Attachment 702806 Details for Bug 915725 – spec file patch

[patch] spec file patch

0001-Update-to-latest-upstream-version-2.4.patch (text/plain), 15.86 KB, created by Michal Srb on 2013-02-26 11:35:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Srb

Created: 2013-02-26 11:35:56 UTC

Size: 15.86 KB

patch

obsolete

>From 22d15238dda86131432bdf9186f7cf5e558216ae Mon Sep 17 00:00:00 2001
>From: Michal Srb <msrb@redhat.com>
>Date: Tue, 26 Feb 2013 12:29:34 +0100
>Subject: [PATCH] Update to latest upstream version 2.4
>
>- Remove old depmap and patches
>---
> disable-tck.patch                                 |  11 --
> maven-wagon-migration-to-component-metadata.patch |  28 ---
> maven-wagon.spec                                  |  78 ++++----
> wagon-1.0-jpp-depmap.xml                          | 229 ----------------------
> 4 files changed, 34 insertions(+), 312 deletions(-)
> delete mode 100644 disable-tck.patch
> delete mode 100644 maven-wagon-migration-to-component-metadata.patch
> delete mode 100644 wagon-1.0-jpp-depmap.xml
>
>diff --git a/disable-tck.patch b/disable-tck.patch
>deleted file mode 100644
>index cb90a22..0000000
>--- a/disable-tck.patch
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- pom.xml.sav	2010-11-13 23:20:29.000000000 +0200
>-+++ pom.xml	2010-12-13 19:10:47.319780363 +0200
>-@@ -163,7 +163,7 @@ under the License.
>-     <module>wagon-provider-api</module>
>-     <module>wagon-providers</module>
>-     <module>wagon-provider-test</module>
>--    <module>wagon-tcks</module>
>-+    
>-   </modules>
>- 
>-   <properties>
>diff --git a/maven-wagon-migration-to-component-metadata.patch b/maven-wagon-migration-to-component-metadata.patch
>deleted file mode 100644
>index ea9f4b2..0000000
>--- a/maven-wagon-migration-to-component-metadata.patch
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-diff -Naur wagon-1.0.orig/pom.xml wagon-1.0/pom.xml
>---- wagon-1.0.orig/pom.xml	2011-07-27 12:42:05.000000000 +0200
>-+++ wagon-1.0/pom.xml	2011-07-27 12:59:05.031845442 +0200
>-@@ -226,21 +226,20 @@
>-         </plugin>
>-         <plugin>
>-           <groupId>org.codehaus.plexus</groupId>
>--          <artifactId>plexus-maven-plugin</artifactId>
>-+          <artifactId>plexus-component-metadata</artifactId>
>-           
>--          <version>1.3.5</version>
>-         </plugin>
>-       </plugins>
>-     </pluginManagement>
>-     <plugins>
>-       <plugin>
>-         <groupId>org.codehaus.plexus</groupId>
>--        <artifactId>plexus-maven-plugin</artifactId>
>-+        <artifactId>plexus-component-metadata</artifactId>
>-         <executions>
>-           <execution>
>-             <id>generate</id>
>-             <goals>
>--              <goal>descriptor</goal>
>-+              <goal>generate-metadata</goal>
>-             </goals>
>-           </execution>
>-         </executions>
>diff --git a/maven-wagon.spec b/maven-wagon.spec
>index a31df32..8b03147 100644
>--- a/maven-wagon.spec
>+++ b/maven-wagon.spec
>@@ -31,8 +31,8 @@
> %global bname     wagon
> 
> Name:           maven-%{bname}
>-Version:        1.0
>-Release:        8%{?dist}
>+Version:        2.4
>+Release:        1%{?dist}
> Epoch:          0
> Summary:        Tools to manage artifacts and deployment
> License:        ASL 2.0
>@@ -40,10 +40,6 @@ Group:          Development/Java
> URL:            http://maven.apache.org/wagon
> Source0:        http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip
> 
>-Source1:        wagon-1.0-jpp-depmap.xml
>-Patch1:         disable-tck.patch
>-Patch2:         %{name}-migration-to-component-metadata.patch
>-
> BuildArch:      noarch
> BuildRequires:  jpackage-utils >= 0:1.7.2
> BuildRequires:  ant >= 0:1.6
>@@ -56,6 +52,7 @@ BuildRequires:  maven-javadoc-plugin
> BuildRequires:  maven-project-info-reports-plugin
> BuildRequires:  maven-resources-plugin
> BuildRequires:  maven-site-plugin
>+BuildRequires:  maven-shade-plugin
> BuildRequires:  maven-surefire-plugin
> BuildRequires:  maven-surefire-provider-junit
> BuildRequires:  maven-enforcer-plugin
>@@ -92,6 +89,8 @@ Requires:       xml-commons-apis
> Requires:       nekohtml
> Requires:       xerces-j2
> 
>+Obsoletes:      %{name}-manual < %{epoch}:%{version}-%{release}
>+
> %description
> Maven Wagon is a transport abstraction that is used in Maven's
> artifact and repository handling code. Currently wagon has the
>@@ -110,34 +109,32 @@ Requires:       jpackage-utils
> %description javadoc
> Javadoc for %{name}.
> 
>-%package manual
>-Summary:        Documents for %{name}
>-Group:          Development/Documentation
>-
>-%description manual
>-Documents for %{name}.
> 
> %prep
> %setup -q -n wagon-%{version}
> 
>-#FIXME: have to drop wagon-webdav-jackrabbit until jackrabbit is available
>-sed -i "s|<module>wagon-webdav-jackrabbit</module>||" wagon-providers/pom.xml
>-sed -i "s|org.mortbay.jetty|org.eclipse.jetty|g" wagon-provider-test/pom.xml
>-sed -i "s|>jetty<|>jetty-server<|g" wagon-provider-test/pom.xml
>+%pom_remove_plugin :animal-sniffer-maven-plugin
>+%pom_remove_dep :wagon-tck-http wagon-providers/wagon-http
> 
>-%patch1
>-%patch2 -p1
>+%pom_remove_dep :xercesMinimal wagon-providers/wagon-http-shared
>+%pom_xpath_inject "pom:dependencies" \
>+   "<dependency>
>+      <groupId>xerces</groupId>
>+      <artifactId>xercesImpl</artifactId>
>+    </dependency>" wagon-providers/wagon-http-shared
>+
>+# disable tests, missing dependencies
>+%pom_disable_module wagon-tcks
>+%pom_disable_module wagon-provider-test
>+%pom_disable_module wagon-ssh-common-test wagon-providers/pom.xml
>+
>+# missing dependencies
>+%pom_disable_module wagon-webdav-jackrabbit wagon-providers
> 
>-# To wire out jetty, plexus-avalon-personality and plexus-ftpd requirement
>-rm -f wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
>-rm -f wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonGzipTest.java
>-rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonGzipTest.java
>-rm -f wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
> 
> %build
> mvn-rpmbuild \
>         -e \
>-        -Dmaven.local.depmap.file=%{SOURCE1} \
>         -Dmaven.test.skip=true \
>         install javadoc:aggregate
> 
>@@ -177,6 +174,11 @@ install -m 644 \
> %add_to_maven_depmap org.apache.maven.wagon wagon-http-shared %{version} JPP/%{name} http-shared
> 
> install -m 644 \
>+  wagon-providers/wagon-http-shared4/target/wagon-http-shared4-%{version}.jar \
>+  $RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared4.jar
>+%add_to_maven_depmap org.apache.maven.wagon wagon-http-shared4 %{version} JPP/%{name} http-shared4
>+
>+install -m 644 \
>   wagon-providers/wagon-scm/target/wagon-scm-%{version}.jar \
>   $RPM_BUILD_ROOT%{_javadir}/%{name}/scm.jar
> %add_to_maven_depmap org.apache.maven.wagon wagon-scm %{version} JPP/%{name} scm
>@@ -191,10 +193,6 @@ install -m 644 \
>   $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common.jar
> %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common %{version} JPP/%{name} ssh-common
> 
>-install -m 644 \
>-  wagon-providers/wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common-test %{version} JPP/%{name} ssh-common-test
> 
> install -m 644 \
>   wagon-providers/wagon-ssh-external/target/wagon-ssh-external-%{version}.jar \
>@@ -212,11 +210,6 @@ install -m 644 \
> #  $RPM_BUILD_ROOT%{_javadir}/%{name}/webdav-%{version}.jar
> #%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/%{name} webdav
> 
>-install -m 644 \
>-  wagon-provider-test/target/wagon-provider-test-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-provider-test %{version} JPP/%{name} provider-test
>-
> %add_to_maven_depmap org.apache.maven.wagon wagon %{version} JPP/%{name} wagon
> %add_to_maven_depmap org.apache.maven.wagon wagon-providers %{version} JPP/%{name} providers
> 
>@@ -226,8 +219,6 @@ install -m 644 pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-wagon.pom
> install -m 644 wagon-provider-api/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-provider-api.pom
>-install -m 644 wagon-provider-test/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-provider-test.pom
> install -m 644 wagon-providers/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-providers.pom
> install -m 644 wagon-providers/wagon-file/pom.xml \
>@@ -236,6 +227,8 @@ install -m 644 wagon-providers/wagon-ftp/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ftp.pom
> install -m 644 wagon-providers/wagon-http-shared/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http-shared.pom
>+install -m 644 wagon-providers/wagon-http-shared4/pom.xml \
>+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http-shared4.pom
> install -m 644 wagon-providers/wagon-http-lightweight/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http-lightweight.pom
> install -m 644 wagon-providers/wagon-http/pom.xml \
>@@ -244,8 +237,6 @@ install -m 644 wagon-providers/wagon-scm/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-scm.pom
> install -m 644 wagon-providers/wagon-ssh-common/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-common.pom
>-install -m 644 wagon-providers/wagon-ssh-common-test/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-common-test.pom
> install -m 644 wagon-providers/wagon-ssh-external/pom.xml \
>     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-external.pom
> install -m 644 wagon-providers/wagon-ssh/pom.xml \
>@@ -257,23 +248,22 @@ install -m 644 wagon-providers/wagon-ssh/pom.xml \
> install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
>-# manual
>-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
>-#install -m 644 wagon-provider-api/LICENSE.txt \
>-#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
> 
> %files
> %{_javadir}/*
> %{_mavenpomdir}/*.pom
> %{_mavendepmapfragdir}/*
>+%doc LICENSE NOTICE DEPENDENCIES
> 
> %files javadoc
> %doc %{_javadocdir}/%{name}
>-
>-%files manual
>-%doc %{_docdir}/%{name}-%{version}
>+%doc LICENSE NOTICE DEPENDENCIES
> 
> %changelog
>+* Tue Feb 26 2013 Michal Srb <msrb@redhat.com> - 0:2.4-1
>+- Update to latest upstream version 2.4
>+- Remove old depmap and patches
>+
> * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>diff --git a/wagon-1.0-jpp-depmap.xml b/wagon-1.0-jpp-depmap.xml
>deleted file mode 100644
>index 368327b..0000000
>--- a/wagon-1.0-jpp-depmap.xml
>+++ /dev/null
>@@ -1,229 +0,0 @@
>-<dependencies>
>-  <dependency>
>-	<maven>
>-	  <groupId>org.codehaus.plexus</groupId>
>-	  <artifactId>plexus-ftpd</artifactId>
>-	  <version>1.0-alpha-1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/plexus</groupId>
>-	  <artifactId>ftpd</artifactId>
>-	  <version>1.0-alpha-1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>plexus</groupId>
>-	  <artifactId>plexus-jetty-httpd</artifactId>
>-	  <version>1.0-beta-1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/plexus</groupId>
>-	  <artifactId>jetty-httpd</artifactId>
>-	  <version>1.0-beta-2</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>ch.ethz.ganymed</groupId>
>-	  <artifactId>ganymed-ssh2</artifactId>
>-	  <version>build210</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>ganymed-ssh2</artifactId>
>-	  <version>210</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>commons-httpclient</groupId>
>-	  <artifactId>commons-httpclient</artifactId>
>-	  <version>3.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>commons-httpclient</artifactId>
>-	  <version>3.0.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>it.could</groupId>
>-	  <artifactId>webdav</artifactId>
>-	  <version>0.4</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>it-could-webdav</artifactId>
>-	  <version>0.4</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>avalon</groupId>
>-	  <artifactId>avalon-framework</artifactId>
>-	  <version>4.1.4</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>avalon-framework</artifactId>
>-	  <version>4.3.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-sockets</groupId>
>-	  <artifactId>cornerstone-sockets-api</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-sockets-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-threads</groupId>
>-	  <artifactId>cornerstone-threads-api</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-threads-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-threads</groupId>
>-	  <artifactId>cornerstone-threads-impl</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-threads-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-pool</groupId>
>-	  <artifactId>excalibur-pool-api</artifactId>
>-	  <version>2.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-pool-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-sockets</groupId>
>-	  <artifactId>cornerstone-sockets-impl</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-sockets-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-thread</groupId>
>-	  <artifactId>excalibur-thread-api</artifactId>
>-	  <version>1.1.1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-thread-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>concurrent</groupId>
>-	  <artifactId>concurrent</artifactId>
>-	  <version>1.3.4</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>concurrent</artifactId>
>-	  <version>1.3.4</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-pool</groupId>
>-	  <artifactId>excalibur-pool-impl</artifactId>
>-	  <version>2.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-pool-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-thread</groupId>
>-	  <artifactId>excalibur-thread-impl</artifactId>
>-	  <version>1.1.1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-thread-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-connection</groupId>
>-	  <artifactId>cornerstone-connection-api</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-connection-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-connection</groupId>
>-	  <artifactId>cornerstone-connection-impl</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-connection-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-
>-  <dependency>
>-    <maven>
>-      <artifactId>plexus-ftpd</artifactId>
>-      <groupId>org.codehaus.plexus</groupId>
>-      <version>1.0-alpha-1</version>
>-    </maven>
>-  </dependency>
>-  <dependency>
>-    <maven>
>-      <artifactId>plexus-jetty-httpd</artifactId>
>-      <groupId>plexus</groupId>
>-      <version>1.0-beta-1</version>
>-    </maven>
>-  </dependency>
>-  <dependency>
>-    <maven>
>-      <groupId>slide</groupId>
>-      <artifactId>slide-webdavlib</artifactId>
>-      <version>2.1</version>
>-    </maven>
>-  </dependency>
>-
>-</dependencies>
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 915725: 702806 | 703846 | 703898