[Jpackage-commits] dist/htmlunit-core-js/JPP-6 .cvsignore, 1.4, 1.5 htmlunit-core-js-2.4-build.patch, 1.1, NONE htmlunit-core-js-build.patch, NONE, 1.1 htmlunit-core-js.spec, 1.4, 1.5 rhinoDiff.txt, 1.1, NONE sources, 1.4, 1.5

David Walluck david at ryu.zarb.org
Sat Dec 11 02:35:29 CET 2010


Update of /home/projects/jpackage/cvs/dist/htmlunit-core-js/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv29205

Modified Files:
	.cvsignore htmlunit-core-js.spec sources 
Added Files:
	htmlunit-core-js-build.patch 
Removed Files:
	htmlunit-core-js-2.4-build.patch rhinoDiff.txt 
Log Message:
- 2.8

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/htmlunit-core-js/JPP-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** .cvsignore	12 Mar 2009 16:28:26 -0000	1.4
--- .cvsignore	11 Dec 2010 01:35:27 -0000	1.5
***************
*** 1 ****
! htmlunit-core-js-2.4.tar.bz2
--- 1 ----
! htmlunit-core-js-2.8.tar.bz2

--- NEW FILE: htmlunit-core-js-build.patch ---
--- build.xml.orig	2010-08-02 07:52:55.000000000 -0400
+++ build.xml	2010-12-10 18:48:45.971057957 -0500
@@ -83,22 +83,22 @@
 	</macrodef>
 
 	<target name="checkPatchNeeded" depends="updateRhinoOriginal" description="Checks that the pb are not yet fixed in Rhino and the patches still needed">
-		<mkdir dir="${originalRhino.classes}" />
+	<!--	<mkdir dir="${originalRhino.classes}" />
 		<ant dir="rhino_original/mozilla/js/rhino" antfile="src/build.xml" target="compile">
 			<property name="classes" value="${originalRhino.classes}" />
 		</ant>
-		<runTests rhinoClasses="${originalRhino.classes}" rhinoVersion="original" />
+		<runTests rhinoClasses="${originalRhino.classes}" rhinoVersion="original" />-->
 	</target>
 
 	<target name="updateRhinoOriginal" unless="updateRhinoOriginal.skip">
-		<mkdir dir="rhino_original" />
-		<cvs cvsRoot=":pserver:anonymous:anonymous at cvs-mirror.mozilla.org:/cvsroot" package="mozilla/js/rhino" dest="rhino_original" failonerror="true" />
+	<!--	<mkdir dir="rhino_original" />
+		<cvs cvsRoot=":pserver:anonymous:anonymous at cvs-mirror.mozilla.org:/cvsroot" package="mozilla/js/rhino" dest="rhino_original" failonerror="true" />-->
 	</target>
 
 	<target name="generateRhinoDiff" description="Generates the 'diff' file against Rhino head">
-		<echo message="Generating diff to rhinoDiff.txt against head from trunk on ${rhino.base.date}"/>
+	<!--	<echo message="Generating diff to rhinoDiff.txt against head from trunk on ${rhino.base.date}"/>
 		<cvs command="diff -D ${rhino.base.date} -u -N" output="rhinoDiff.txt" dest="rhino" failonerror="false" />
-		<echo message="Don't forget to clean the generated diff (for instance removing all lines with .svn)"/>
+		<echo message="Don't forget to clean the generated diff (for instance removing all lines with .svn)"/> -->
 	</target>
 
 	<target name="repackage" depends="compile" description="Copy org.mozilla.* to net.sourceforge.htmlunit.corejs and compiles">

--- rhinoDiff.txt DELETED ---

--- htmlunit-core-js-2.4-build.patch DELETED ---

Index: htmlunit-core-js.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/htmlunit-core-js/JPP-6/htmlunit-core-js.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** htmlunit-core-js.spec	12 Mar 2009 16:28:27 -0000	1.4
--- htmlunit-core-js.spec	11 Dec 2010 01:35:27 -0000	1.5
***************
*** 43,48 ****
  
  Name:           htmlunit-core-js
! Version:        2.4
! Release:        2%{?dist}
  Epoch:          0
  Summary:        HtmlUnit adaptation of Mozilla Rhino Javascript engine for Java
--- 43,48 ----
  
  Name:           htmlunit-core-js
! Version:        2.8
! Release:        1%{?dist}
  Epoch:          0
  Summary:        HtmlUnit adaptation of Mozilla Rhino Javascript engine for Java
***************
*** 50,74 ****
  Group:          Development/Libraries/Java
  URL:            http://htmlunit.svn.sourceforge.net/
! # svn -q export https://htmlunit.svn.sourceforge.net/svnroot/htmlunit/tags/core-js-2.4/ htmlunit-core-js-2.4 && tar cjf htmlunit-core-js-2.4.tar.bz2 htmlunit-core-js-2.4/
! Source0:        htmlunit-core-js-2.4.tar.bz2
! Source1:        rhinoDiff.txt
! Patch0:         htmlunit-core-js-2.4-build.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
  BuildRequires:  ant
- %if 0
- BuildRequires:  ant-junit
- %endif
  BuildRequires:  java-devel
  BuildRequires:  jpackage-utils
  BuildRequires:  junit4
- %if 0
- BuildRequires:  maven2
- BuildRequires:  maven2-plugin-install
- BuildRequires:  maven2-plugin-jar
- BuildRequires:  maven2-plugin-javadoc
- BuildRequires:  maven2-plugin-resources
- BuildRequires:  maven2-plugin-surefire
- %endif
  %if %{gcj_support}
  BuildRequires: java-gcj-compat-devel
--- 50,64 ----
  Group:          Development/Libraries/Java
  URL:            http://htmlunit.svn.sourceforge.net/
! # svn -q export https://htmlunit.svn.sourceforge.net/svnroot/htmlunit/tags/core-js-2.8/ htmlunit-core-js-2.8 && tar cjf htmlunit-core-js-2.8.tar.bz2 htmlunit-core-js-2.8/
! # Exported revision 6155.
! Source0:        htmlunit-core-js-2.8.tar.bz2
! Patch0:         htmlunit-core-js-build.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
+ Requires:       jpackage-utils
  BuildRequires:  ant
  BuildRequires:  java-devel
  BuildRequires:  jpackage-utils
  BuildRequires:  junit4
  %if %{gcj_support}
  BuildRequires: java-gcj-compat-devel
***************
*** 85,106 ****
  %prep
  %setup -q
! %{__cp} -p %{SOURCE1} rhinoDiff.txt
! %patch0 -p1
  %{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  
  %build
- export ANT_OPTS=
- %if 0
- export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit`
- %else
  export OPT_JAR_LIST=:
- %endif
  export CLASSPATH=
! %{ant} -Djunit.jar=$(build-classpath junit4) jar-all
! %if 0
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! %{__mkdir_p} ${MAVEN_REPO_LOCAL}
! %{_bindir}/mvn-jpp -Dmaven.test.skip=true -Dmaven.repo.local=${MAVEN_REPO_LOCAL} install javadoc:javadoc
! %endif
  
  %install
--- 75,85 ----
  %prep
  %setup -q
! %patch0 -p0 -b .sav0
  %{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  
  %build
  export OPT_JAR_LIST=:
  export CLASSPATH=
! %{ant} -Djunit.jar=$(%{_bindir}/build-classpath junit4) jar-all
  
  %install
***************
*** 144,149 ****
  %defattr(0644,root,root,0755)
  %doc LICENSE.txt MPL-1.1.html rhinoDiff.txt 
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
  %{_datadir}/maven2/poms/JPP-%{name}.pom
  %{_mavendepmapfragdir}/%{name}
--- 123,128 ----
  %defattr(0644,root,root,0755)
  %doc LICENSE.txt MPL-1.1.html rhinoDiff.txt 
! %{_javadir}*/%{name}-%{version}.jar
! %{_javadir}*/%{name}.jar
  %{_datadir}/maven2/poms/JPP-%{name}.pom
  %{_mavendepmapfragdir}/%{name}
***************
*** 155,158 ****
--- 134,140 ----
  
  %changelog
+ * Fri Dec 10 2010 David Walluck <dwalluck at redhat.com> 0:2.8-1
+ - 2.8
+ 
  * Thu Mar 12 2009 David Walluck <dwalluck at redhat.com> 0:2.4-2
  - fix build

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/htmlunit-core-js/JPP-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** sources	12 Mar 2009 16:28:27 -0000	1.4
--- sources	11 Dec 2010 01:35:27 -0000	1.5
***************
*** 1 ****
! 492ae7b5f07eb8be3755484d2276cdd1  htmlunit-core-js-2.4.tar.bz2
--- 1 ----
! 6403416dbe054379249e4dd9957825c6  htmlunit-core-js-2.8.tar.bz2




More information about the JPackage-commits mailing list