rpms/opengrok/devel opengrok-0.9-jflex.patch, NONE, 1.1 opengrok-0.9-nocplib.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 opengrok.spec, 1.12, 1.13 sources, 1.7, 1.8 opengrok-0.6-nochangeset.patch, 1.2, NONE opengrok-0.7-jflex.patch, 1.2, NONE opengrok-0.7-nocplib.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/opengrok/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4067

Modified Files:
	.cvsignore opengrok.spec sources 
Added Files:
	opengrok-0.9-jflex.patch opengrok-0.9-nocplib.patch 
Removed Files:
	opengrok-0.6-nochangeset.patch opengrok-0.7-jflex.patch 
	opengrok-0.7-nocplib.patch 
Log Message:
* Mon May 31 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.9-1
- Update to later upstream release


opengrok-0.9-jflex.patch:
 build.xml |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE opengrok-0.9-jflex.patch ---
>From c7939e318b842e5eb2f6371f3207972605eb0f87 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 31 May 2010 10:36:23 +0200
Subject: [PATCH 2/2] We include jflex differently.

---
 build.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/build.xml b/build.xml
index 7029a28..af4c89c 100644
--- a/build.xml
+++ b/build.xml
@@ -136,10 +136,12 @@ Use is subject to license terms.
         <pathelement path="lib/pmd/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;../lib/JFlex.jar"/>    
     <target name="jflex">
-- 
1.7.0.1


opengrok-0.9-nocplib.patch:
 build.xml |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE opengrok-0.9-nocplib.patch ---
>From 4547e5f7923c0e465e3083d37d42dabd35b01cd8 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 31 May 2010 10:25:09 +0200
Subject: [PATCH 1/2] Do not copy libraries

During our build we remove everything from lib,
so don't attempt to copy it.
---
 build.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build.xml b/build.xml
index eb857e0..7029a28 100644
--- a/build.xml
+++ b/build.xml
@@ -281,7 +281,7 @@ Use is subject to license terms.
 	<war destfile="${dist.war}" webxml="web/WEB-INF/web.xml">
             <fileset dir="web" excludes="META-INF/context.xml"/>
             <lib dir="${dist.dir}" includes="opengrok.jar"/>
-            <lib dir="${dist.dir}/lib" includes="*.jar" excludes="servlet-api.jar"/>
+            <!-- <lib dir="${dist.dir}/lib" includes="*.jar" excludes="servlet-api.jar"/> -->
         </war>
         <echo message="Generating man page.."/>
         <java classname="org.opensolaris.opengrok.index.CommandLineOptions" 
-- 
1.7.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Feb 2010 19:22:38 -0000	1.7
+++ .cvsignore	31 May 2010 08:47:25 -0000	1.8
@@ -1 +1 @@
-opengrok-0.8.1-src.tar.gz
+opengrok-0.9-src.tar.gz


Index: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- opengrok.spec	17 Feb 2010 19:59:35 -0000	1.12
+++ opengrok.spec	31 May 2010 08:47:25 -0000	1.13
@@ -3,7 +3,7 @@
 %bcond_with webapp
 
 Name:           opengrok
-Version:        0.8.1
+Version:        0.9
 Release:        1%{?dist}
 Summary:        Source browser and indexer
 
@@ -16,11 +16,10 @@ Source2:        configuration.xml
 Source3:        opengrok-README.Fedora.webapp
 Source4:        opengrok-README.Fedora.nowebapp
 Patch0:         opengrok-0.5-jrcs-import.patch
-Patch1:         opengrok-0.7-nocplib.patch
+Patch1:         opengrok-0.9-nocplib.patch
 Patch3:         opengrok-0.8.1-manifest-classpath.patch
 Patch4:         opengrok-0.6-nooverview.patch
-Patch5:         opengrok-0.6-nochangeset.patch
-Patch6:         opengrok-0.7-jflex.patch
+Patch6:         opengrok-0.9-jflex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -76,12 +75,11 @@ OpenGrok web application
 %patch1 -p1 -b .nocplib
 %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
-find -name '*.jar' -o -name '*.class' -o -name '*.war' -exec rm -f '{}' \;
+find -name '*.jar' -o -name '*.class' -o -name '*.war' -delete
 
 # jrcs' javacc directory
 sed '
@@ -90,8 +88,8 @@ sed '
 ' -i jrcs/build.xml
 
 # Default war configuration
-sed 's,/opengrok/configuration.xml,%{_sysconfdir}/%{name}/configuration.xml,' \
-        -i conf/web.xml
+sed 's,/var/opengrok/etc/configuration.xml,%{_sysconfdir}/%{name}/configuration.xml,' \
+        -i web/WEB-INF/web.xml
 
 # README.Fedora
 %if %with webapp
@@ -228,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 31 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.9-1
+- Update to later upstream release
+
 * Wed Feb 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.8.1-1
 - Fix build
 - Update to later upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Feb 2010 19:22:38 -0000	1.7
+++ sources	31 May 2010 08:47:26 -0000	1.8
@@ -1 +1 @@
-8c678b3bf8746b040ce7836dca4513f4  opengrok-0.8.1-src.tar.gz
+9ea28e6182f11ade75510c053518e685  opengrok-0.9-src.tar.gz


--- opengrok-0.6-nochangeset.patch DELETED ---


--- opengrok-0.7-jflex.patch DELETED ---


--- opengrok-0.7-nocplib.patch DELETED ---