[Jpackage-commits] dist/htmlunit2/JPP-6 htmlunit2-jpp-depmap.xml, 1.3, 1.4 htmlunit2-no-sign-artifacts.patch, NONE, 1.1 htmlunit2.spec, 1.8, 1.9

David Walluck david at ryu.zarb.org
Tue Dec 14 10:41:14 CET 2010


Update of /home/projects/jpackage/cvs/dist/htmlunit2/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv19376

Modified Files:
	htmlunit2-jpp-depmap.xml htmlunit2.spec 
Added Files:
	htmlunit2-no-sign-artifacts.patch 
Log Message:
- fix build

Index: htmlunit2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/htmlunit2/JPP-6/htmlunit2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** htmlunit2.spec	11 Dec 2010 11:06:38 -0000	1.8
--- htmlunit2.spec	14 Dec 2010 09:41:11 -0000	1.9
***************
*** 62,65 ****
--- 62,66 ----
  Patch2:         htmlunit2-apache-james.patch
  Patch3:         htmlunit2-compile.patch
+ Patch4:         htmlunit2-no-sign-artifacts.patch
  Requires(post): jpackage-utils >= 0:1.7.3
  Requires(postun): jpackage-utils >= 0:1.7.3
***************
*** 87,91 ****
--- 88,94 ----
  # XXX: should provide commons-logging
  BuildRequires:  jakarta-commons-logging >= 0:1.1.1
+ BuildRequires:  james-project
  BuildRequires:  cssparser >= 0:0.9.5
+ BuildRequires:  hc-project
  BuildRequires:  hc-httpclient >= 0:4.0.1
  BuildRequires:  htmlunit-core-js >= 0:%{version}
***************
*** 164,167 ****
--- 167,171 ----
  %patch2 -p0 -b .sav2
  %patch3 -p0 -b .sav3
+ %patch4 -p0 -b .sav4
  %{_bindir}/find -type f -name "*.jar"  | %{_bindir}/xargs -t %{__rm}
  

Index: htmlunit2-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/htmlunit2/JPP-6/htmlunit2-jpp-depmap.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** htmlunit2-jpp-depmap.xml	11 Dec 2010 11:23:53 -0000	1.3
--- htmlunit2-jpp-depmap.xml	14 Dec 2010 09:41:11 -0000	1.4
***************
*** 24,38 ****
      </jpp>
    </dependency>
-   <dependency>
-     <maven>
-       <groupId>org.apache.james</groupId>
-       <artifactId>james-project</artifactId>
-       <version>1.2</version>
-     </maven>
-     <!--<jpp>
-       <groupId>JPP</groupId>
-       <artifactId></artifactId>
-       <version></version>
-     </jpp>-->
-   </dependency>
  </dependencies>
--- 24,26 ----

--- NEW FILE: htmlunit2-no-sign-artifacts.patch ---
--- pom.xml~	2010-12-14 04:36:02.000000000 -0500
+++ pom.xml	2010-12-14 04:37:06.062630646 -0500
@@ -159,7 +159,7 @@
                     <downloadJavadocs>true</downloadJavadocs>
                 </configuration>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
                 <executions>
@@ -171,7 +171,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
     <profiles>




More information about the JPackage-commits mailing list