[Jpackage-commits] dist/jflex/JPP-6 jflex-bootwith-1.4.2.patch, NONE, 1.1 jflex.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Wed Dec 8 11:07:50 CET 2010


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

Modified Files:
	jflex.spec 
Added Files:
	jflex-bootwith-1.4.2.patch 
Log Message:
Provide post patch for bootstrapping 1.4.3 with 1.4.2

Index: jflex.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jflex/JPP-6/jflex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** jflex.spec	8 Dec 2010 09:30:41 -0000	1.2
--- jflex.spec	8 Dec 2010 10:07:48 -0000	1.3
***************
*** 52,64 ****
  Source2:        jflex-settings.xml
  Source3:        jflex-1.4.3.pom
! Requires:       java >= 0:1.6.0
! Requires:       java_cup
! Requires:       jpackage-utils >= 0:1.7.5
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  junit
  BuildRequires:  ant
  BuildRequires:  java_cup
--- 52,59 ----
  Source2:        jflex-settings.xml
  Source3:        jflex-1.4.3.pom
! Patch0:         jflex-bootwith-1.4.2.patch
  
! Requires:       java_cup
! Requires:       jpackage-utils
  BuildRequires:  ant
  BuildRequires:  java_cup
***************
*** 66,69 ****
--- 61,66 ----
  BuildRequires:  jflex
  %endif
+ BuildRequires:  java-devel
+ BuildRequires:  junit
  
  BuildRequires:  maven2 >= 2.0.8
***************
*** 111,114 ****
--- 108,112 ----
  %prep
  %setup -q
+ #%patch0 -b .sav0
  cp -p %{SOURCE2} settings.xml
  
***************
*** 126,129 ****
--- 124,128 ----
  %ant jflex
  popd
+ %patch0 -b .sav0
  %endif
  
***************
*** 144,147 ****
--- 143,148 ----
  mkdir -p  $MAVEN_REPO_LOCAL/JPP
  cp jflex/lib/JFlex.jar $MAVEN_REPO_LOCAL/JPP/jflex.jar
+ mkdir -p $MAVEN_REPO_LOCAL/de/jflex/jflex/%{version}/
+ cp jflex/lib/JFlex.jar $MAVEN_REPO_LOCAL/de/jflex/jflex/%{version}/jflex-%{version}.jar
  
  pushd maven-jflex-plugin
***************
*** 152,155 ****
--- 153,159 ----
          install javadoc:javadoc
  
+ #       -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+ #       -Dmaven.test.failure.ignore=true \
+ 
  popd
  
***************
*** 189,195 ****
  %{__rm} -rf %{_builddir}/jflex
  
- %post
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 193,198 ----
  %{__rm} -rf %{_builddir}/jflex
  
  %if %{gcj_support}
+ %post
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 198,204 ****
  %endif
  
- %postun
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 201,206 ----
  %endif
  
  %if %{gcj_support}
+ %postun
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 232,236 ****
  
  %changelog
! * Wed Dec 08 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4.3-1
  - 1.4.3 for JPP-6
  
--- 234,238 ----
  
  %changelog
! * Tue Dec 07 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4.3-1
  - 1.4.3 for JPP-6
  

--- NEW FILE: jflex-bootwith-1.4.2.patch ---
--- jflex/src/JFlex/LexScan.java.sav	2010-12-08 10:53:07.000000000 +0100
+++ jflex/src/JFlex/LexScan.java	2010-12-08 10:53:23.000000000 +0100
@@ -1642,9 +1642,6 @@
     }
   }
 
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-
   /* user code: */
   int balance = 0;
   int commentbalance = 0;




More information about the JPackage-commits mailing list