rpms/opengrok/devel opengrok-0.6.1-jflex.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 opengrok.spec, 1.3, 1.4 sources, 1.3, 1.4

[Lubomir Rintel (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/opengrok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22215

Modified Files:
	.cvsignore opengrok.spec sources 
Added Files:
	opengrok-0.6.1-jflex.patch 
Log Message:
* Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.6.1-3.20080810hg
- Update to a Mercurial snapshot to adress excessive memory usage bug
- Specify fuzz for patches explicitely for now (see #458577)


opengrok-0.6.1-jflex.patch:

--- NEW FILE opengrok-0.6.1-jflex.patch ---
diff -up opengrok-0.6.1-src/build.xml.jflex opengrok-0.6.1-src/build.xml
--- opengrok-0.6.1-src/build.xml.jflex	2008-08-10 10:14:36.000000000 +0200
+++ opengrok-0.6.1-src/build.xml	2008-08-10 10:15:36.000000000 +0200
@@ -105,10 +105,12 @@ Use is subject to license terms.
         <pathelement path="lib/findbugs/lib/"/>
     </path>
 
+    <!-- it's called jflex.jar, and we add it to classpath by ourselves
     <available file="JFlex.jar" type="file" property="JFlex.present">
         <filepath refid="lib.search.path"/>
     </available>
     <fail unless="JFlex.present" message="Please download JFlex (http://jflex.de/) and put JFlex.jar it into ./lib directory (or in ant classpath)."/>
+    -->
     
     <taskdef classname="JFlex.anttask.JFlexTask" name="jflex" classpath="lib/JFlex.jar"/>    
     <property name="gensrcdir" value="generatedsrc"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 May 2008 13:48:11 -0000	1.3
+++ .cvsignore	10 Aug 2008 08:46:09 -0000	1.4
@@ -1 +1 @@
-opengrok-0.6.1-src.tar.gz
+opengrok-r358-src.tar.gz


Index: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opengrok.spec	22 May 2008 12:08:30 -0000	1.3
+++ opengrok.spec	10 Aug 2008 08:46:09 -0000	1.4
@@ -1,12 +1,17 @@
+%define _default_patch_fuzz 2
+
 Name:           opengrok
 Version:        0.6.1
-Release:        2%{?dist}
+Release:        3.20080810hg%{?dist}
 Summary:        Source browser and indexer
 
 Group:          Development/Tools
 License:        CDDL
 URL:            http://www.opensolaris.org/os/project/opengrok/
-Source0:        http://www.opensolaris.org/os/project/opengrok/files/%{name}-%{version}-src.tar.gz
+#Source0:        http://www.opensolaris.org/os/project/opengrok/files/%{name}-%{version}-src.tar.gz
+# hg clone -r358 ssh://anon@hg.opensolaris.org/hg/opengrok/trunk opengrok-0.6.1-src
+# tar czf opengrok-r358-src.tar.gz --exclude .hg opengrok-0.6.1-src
+Source0:        opengrok-r358-src.tar.gz
 Source1:        opengrok
 Source2:        configuration.xml
 Source3:        opengrok.desktop
@@ -16,6 +21,7 @@
 Patch3:         opengrok-0.5-manifest-classpath.patch
 Patch4:         opengrok-0.6-nooverview.patch
 Patch5:         opengrok-0.6-nochangeset.patch
+Patch6:         opengrok-0.6.1-jflex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -62,6 +68,7 @@
 %patch3 -p1 -b .manifest-classpath
 %patch4 -p1 -b .nooverview
 %patch5 -p1 -b .nochangeset
+%patch6 -p1 -b .jflex
 
 # This is not strictly needed, but to nuke prebuilt stuff
 # makes us feel warmer while building
@@ -189,6 +196,10 @@
 
 
 %changelog
+* Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.6.1-3.20080810hg
+- Update to a Mercurial snapshot to adress excessive memory usage bug
+- Specify fuzz for patches explicitely for now (see #458577)
+
 * Thu May 22 2008 Lubomir Rintel <lkundrak at v3.sk> 0.6.1-2
 - Tolerate svn-javahl not being in correct directory, in RHEL5
 - Replace sed-mungled configuration with hardcoded, so that stamps don't change


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 May 2008 13:48:11 -0000	1.3
+++ sources	10 Aug 2008 08:46:09 -0000	1.4
@@ -1 +1 @@
-d3e79d7180b09a31f4e92940e06d301b  opengrok-0.6.1-src.tar.gz
+14c497f78c12072ff5b40d059449b5ed  opengrok-r358-src.tar.gz