rpms/opengrok/devel opengrok-0.7-jflex.patch, NONE, 1.1 opengrok, 1.2, 1.3 opengrok-0.6-nooverview.patch, 1.1, 1.2 opengrok-README.Fedora.webapp, 1.1, 1.2 opengrok.spec, 1.5, 1.6 opengrok-0.6.1-jflex.patch, 1.1, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Oct 16 19:13:04 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/opengrok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21601
Modified Files:
opengrok opengrok-0.6-nooverview.patch
opengrok-README.Fedora.webapp opengrok.spec
Added Files:
opengrok-0.7-jflex.patch
Removed Files:
opengrok-0.6.1-jflex.patch
Log Message:
* Thu Oct 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.7-0.2-20081016hg
- Fix servlet classpath
- Do not depend on subversion-javahl now that svn tool is used
- Rediff jflex patch for zero fuzz
opengrok-0.7-jflex.patch:
--- NEW FILE opengrok-0.7-jflex.patch ---
--- opengrok-0.7-src/build.xml.jflex 2008-10-16 21:04:05.000000000 +0200
+++ opengrok-0.7-src/build.xml 2008-10-16 21:04:05.000000000 +0200
@@ -137,10 +137,12 @@
<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"/>
<property name="gensrcdir" value="generatedsrc"/>
Index: opengrok
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opengrok 22 May 2008 12:08:30 -0000 1.2
+++ opengrok 16 Oct 2008 19:12:34 -0000 1.3
@@ -1,8 +1,7 @@
#!/bin/sh
#
# OpenGrok script
-# Lubomir Kundrak <lkundrak at redhat.com>
-# $Id$
+# Lubomir Rintel <lkundrak at v3.sk>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
@@ -25,19 +24,13 @@
# Rest of the configuration
MAIN_CLASS=org.opensolaris.opengrok.index.Indexer
-# Attempt to load Subversion support only if it's available
-# taking the wrongly located jar file in RHEL5 into account
-SVNJAR=$(/usr/bin/build-classpath svn-javahl 2>/dev/null)
-[ -z "$SVNJAR" ] && SVNJAR=$(rpm --eval %_libdir)/svn-javahl/svn-javahl.jar
-[ -f "$SVNJAR" ] && CLASSPATH="$SVNJAR"
-
BASE_JARS="$BASE_JARS lucene.jar"
BASE_JARS="$BASE_JARS lucene-contrib/lucene-spellchecker.jar"
BASE_JARS="$BASE_JARS jakarta-oro.jar"
BASE_JARS="$BASE_JARS opengrok-jrcs/org.apache.commons.jrcs.rcs.jar"
BASE_JARS="$BASE_JARS opengrok-jrcs/org.apache.commons.jrcs.diff.jar"
BASE_JARS="$BASE_JARS bcel.jar"
-BASE_JARS="$BASE_JARS servletapi5.jar"
+BASE_JARS="$BASE_JARS servlet.jar"
BASE_JARS="$BASE_JARS ant.jar"
BASE_JARS="$BASE_JARS swing-layout.jar"
BASE_JARS="$BASE_JARS opengrok.jar"
opengrok-0.6-nooverview.patch:
Index: opengrok-0.6-nooverview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok-0.6-nooverview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengrok-0.6-nooverview.patch 18 Apr 2008 19:11:54 -0000 1.1
+++ opengrok-0.6-nooverview.patch 16 Oct 2008 19:12:34 -0000 1.2
@@ -1,4 +1,6 @@
-This fixes the warning about missing gile during build of javadoc for jrcs.
+This fixes the warning about missing file during build of javadoc for jrcs.
+
+Lubomir Rintel <lkundrak at v3.sk>
diff -urp opengrok-0.6-src.orig/jrcs/build.xml opengrok-0.6-src/jrcs/build.xml
--- opengrok-0.6-src.orig/jrcs/build.xml 2008-04-16 00:15:23.000000000 +0200
Index: opengrok-README.Fedora.webapp
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok-README.Fedora.webapp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengrok-README.Fedora.webapp 16 Oct 2008 16:55:29 -0000 1.1
+++ opengrok-README.Fedora.webapp 16 Oct 2008 19:12:34 -0000 1.2
@@ -1,8 +1,6 @@
Setting up OpenGrok server on Fedora
------------------------------------
-$Id$
-
See README.txt for general information on setting up OpenGrok.
Some of the notes below are more or less specific to Fedora:
@@ -27,7 +25,7 @@
4.) OpenGrok package doesn't depend on mercurial on subversion. If you
intend to use mercurial backend install mercurial package. For
-subversion, you need the subversion-javahl package.
+subversion, you need the subversion package.
2.) Configuration file is /etc/opengrok/configuration.xml. It sets the
Source and Data roots to point to subdirectories of /var/lib/opengrok.
Index: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- opengrok.spec 16 Oct 2008 16:55:29 -0000 1.5
+++ opengrok.spec 16 Oct 2008 19:12:34 -0000 1.6
@@ -1,5 +1,3 @@
-%define _default_patch_fuzz 2
-
# Webapp is disabled, since Fedora does not have the Java Webapp guidelines
# finished yet
%if %{?fedora}0
@@ -10,7 +8,7 @@
Name: opengrok
Version: 0.7
-Release: 0.1.20081016hg%{?dist}
+Release: 0.2.20081016hg%{?dist}
Summary: Source browser and indexer
Group: Development/Tools
@@ -29,7 +27,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
+Patch6: opengrok-0.7-jflex.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -120,13 +118,12 @@
CLASSPATH=$(build-classpath jflex) %{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.svn-javahl.jar=$(build-classpath svn-javahl.jar |grep . || echo %{_libdir}/svn-javahl/svn-javahl.jar) \
-Dfile.reference.lucene-core-2.2.0.jar=$(build-classpath lucene) \
-Dfile.reference.lucene-spellchecker-2.2.0.jar=$(build-classpath lucene-contrib/lucene-spellchecker) \
-Dfile.reference.ant.jar=$(build-classpath ant) \
-Dfile.reference.bcel-5.1.jar=$(build-classpath bcel) \
-Dfile.reference.jakarta-oro-2.0.8.jar=$(build-classpath jakarta-oro) \
- -Dfile.reference.servlet-api.jar=$(build-classpath servletapi5) \
+ -Dfile.reference.servlet-api.jar=$(build-classpath servlet) \
-Dfile.reference.swing-layout-0.9.jar=$(build-classpath swing-layout)
# SolBook is more-or-less DocBook subset, so this can be done safely
@@ -201,7 +198,6 @@
(IFS=:; for file in $(build-classpath \
bcel jakarta-oro swing-layout \
lucene lucene-contrib/lucene-spellchecker) \
- $(build-classpath svn-javahl.jar || echo %{_libdir}/svn-javahl/svn-javahl.jar) \
%{_javadir}/opengrok.jar \
%{_javadir}/opengrok-jrcs/org.apache.commons.jrcs.diff.jar \
%{_javadir}/opengrok-jrcs/org.apache.commons.jrcs.rcs.jar
@@ -241,6 +237,11 @@
%changelog
+* Thu Oct 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.7-0.2-20081016hg
+- Fix servlet classpath
+- Do not depend on subversion-javahl now that svn tool is used
+- Rediff jflex patch for zero fuzz
+
* Thu Oct 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.7-0.1-20081016hg
- Update to post-0.7rc1
- Disable JUnit tests
--- opengrok-0.6.1-jflex.patch DELETED ---
More information about the fedora-extras-commits
mailing list