rpms/opengrok/EL-6 import.log, NONE, 1.1 opengrok-0.8.1-manifest-classpath.patch, NONE, 1.1 opengrok-0.9-jflex.patch, NONE, 1.1 opengrok-0.9-nocplib.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 opengrok.spec, 1.9, 1.10 sources, 1.6, 1.7 opengrok-0.6-nochangeset.patch, 1.2, NONE opengrok-0.7-jflex.patch, 1.2, NONE opengrok-0.7-nocplib.patch, 1.1, NONE opengrok-0.8-manifest-classpath.patch, 1.1, NONE

Thu Jul 8 20:46:12 UTC 2010

Author: lkundrak

Update of /cvs/pkgs/rpms/opengrok/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14637/EL-6

Modified Files:
	.cvsignore opengrok.spec sources 
Added Files:
	import.log opengrok-0.8.1-manifest-classpath.patch 
	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 
	opengrok-0.8-manifest-classpath.patch 
Log Message:
Pull from devel


--- NEW FILE import.log ---
opengrok-0_9-1_fc14:EL-6:opengrok-0.9-1.fc14.src.rpm:1278621947

opengrok-0.8.1-manifest-classpath.patch:
 build.xml |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE opengrok-0.8.1-manifest-classpath.patch ---
Disables inclusion of hardcoded classpath in manifest

Lubomir Rintel <lkundrak at v3.sk>

diff -up opengrok-0.8.1-src/build.xml.manifest-classpath opengrok-0.8.1-src/build.xml
--- opengrok-0.8.1-src/build.xml.manifest-classpath	2010-02-17 20:53:59.000000000 +0100
+++ opengrok-0.8.1-src/build.xml	2010-02-17 20:55:24.762613810 +0100
@@ -235,14 +235,16 @@ Use is subject to license terms.
     </target>
 
     
+    
 
-    <target name="-pre-jar" depends="-update-manifest-classpath,-update-build-info"/>
+    <target name="-pre-jar" depends="-update-build-info"/>
 
     <!--
         Copy the jars from lib to dist/lib manually if we don't have

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/EL-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Jul 2009 16:49:11 -0000	1.6
+++ .cvsignore	8 Jul 2010 20:46:10 -0000	1.7
@@ -1 +1 @@
-opengrok-r786-src.tar.gz
+opengrok-0.9-src.tar.gz


Index: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/EL-6/opengrok.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- opengrok.spec	25 Jul 2009 20:47:20 -0000	1.9
+++ opengrok.spec	8 Jul 2010 20:46:11 -0000	1.10
@@ -3,27 +3,23 @@
 %bcond_with webapp
 
 Name:           opengrok
-Version:        0.8
-Release:        0.2.20090712hg%{?dist}
+Version:        0.9
+Release:        1%{?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
-# hg clone -r786 ssh://anon@hg.opensolaris.org/hg/opengrok/trunk opengrok-0.8-src
-# tar czf opengrok-r786-src.tar.gz --exclude .hg opengrok-0.8-src
-Source0:        opengrok-r786-src.tar.gz
+URL:            http://hub.opensolaris.org/bin/view/Project+opengrok/
+Source0:        http://hub.opensolaris.org/bin/download/Project+opengrok/files/%{name}-%{version}-src.tar.gz
 Source1:        opengrok
 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
-Patch3:         opengrok-0.8-manifest-classpath.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
 
@@ -33,6 +29,7 @@ Requires:       ctags
 Requires:       java
 BuildRequires:  %{common_reqs}
 BuildRequires:  jflex >= 1.4
+BuildRequires:  java_cup
 BuildRequires:  ant-nodeps
 # FIXME: As of 0.6-hg275 this should build with java-1.5 again.
 # This is just to prevent GCJ from attempting to build this.
@@ -72,19 +69,17 @@ OpenGrok web application
 
 
 %prep
-%setup -q -n %{name}-0.7-src
-#%setup -q -n %{name}-%{version}-src
+%setup -q -n %{name}-%{version}-src
 %{__unzip} -q ext/jrcs.zip
 %patch0 -p1 -b .jrcs-import
 %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 '
@@ -93,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
@@ -109,7 +104,7 @@ pushd jrcs
 CLASSPATH=$(build-classpath oro) %{ant} -v all
 
 popd
-CLASSPATH=$(build-classpath jflex) %{ant} -v jar javadoc                                           \
+CLASSPATH=$(build-classpath jflex java_cup) %{ant} -v jar javadoc                               \
         -Dfile.reference.org.apache.commons.jrcs.diff.jar=jrcs/lib/org.apache.commons.jrcs.diff.jar \
         -Dfile.reference.org.apache.commons.jrcs.rcs.jar=jrcs/lib/org.apache.commons.jrcs.rcs.jar \
         -Dfile.reference.lucene-core-2.2.0.jar=$(build-classpath lucene)                        \
@@ -231,6 +226,13 @@ 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
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-0.2.20090712hg
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/EL-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Jul 2009 16:49:12 -0000	1.6
+++ sources	8 Jul 2010 20:46:12 -0000	1.7
@@ -1 +1 @@
-8538341be7ec3ef12606d0578ec5ca34  opengrok-r786-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 ---


--- opengrok-0.8-manifest-classpath.patch DELETED ---

