[packages/opengrok] can't seem to find a way to fix prefix, change default in code

glen glen at pld-linux.org
Mon Sep 1 07:58:42 CEST 2014


commit f39700c92b8f70bc0f2367f17f7c39cce3331aca
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Sep 1 07:58:13 2014 +0300

    can't seem to find a way to fix prefix, change default in code

 opengrok.spec |  8 +++-----
 path.patch    | 11 +++++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/opengrok.spec b/opengrok.spec
index a2beda7..18f1a1e 100644
--- a/opengrok.spec
+++ b/opengrok.spec
@@ -8,7 +8,7 @@
 Summary:	Source browser and indexer
 Name:		opengrok
 Version:	0.11.1
-Release:	0.5
+Release:	0.6
 License:	CDDL
 Group:		Development/Tools
 Source0:	https://java.net/projects/opengrok/downloads/download/archive/%{name}-%{version}-src.tar.gz
@@ -18,6 +18,7 @@ Source2:	configuration.xml
 Source3:	tomcat-context.xml
 Patch0:		lucene35.patch
 Patch1:		jflex.patch
+Patch2:		path.patch
 URL:		http://opengrok.github.io/OpenGrok/
 BuildRequires:	ant
 BuildRequires:	docbook-dtd42-sgml
@@ -60,6 +61,7 @@ grok (profoundly understand) the open source, hence the name OpenGrok.
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # nuke prebuilt stuff
 mv lib nolibs
@@ -72,10 +74,6 @@ sed 's,/var/opengrok/etc/configuration.xml,%{_sysconfdir}/%{name}/configuration.
 %build
 export JAVA_HOME="%{java_home}"
 
-# TODO: patch build.xml to use jflex from CLASSPATH
-#jflex_jar=$(find-jar jflex)
-#ln -sf $jflex_jar lib/JFlex.jar
-
 required_jars="jflex cup junit"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
diff --git a/path.patch b/path.patch
new file mode 100644
index 0000000..7566973
--- /dev/null
+++ b/path.patch
@@ -0,0 +1,11 @@
+--- opengrok-0.11.1-src/src/org/opensolaris/opengrok/configuration/Configuration.java~	2012-03-30 16:36:59.000000000 +0300
++++ opengrok-0.11.1-src/src/org/opensolaris/opengrok/configuration/Configuration.java	2014-09-01 07:56:52.366279201 +0300
+@@ -148,7 +148,7 @@
+         setHistoryCacheInDB(false);
+         setProjects(new ArrayList<Project>());
+         setRepositories(new ArrayList<RepositoryInfo>());
+-        setUrlPrefix("/source/s?");
++        setUrlPrefix("/opengrok/s?");
+         //setUrlPrefix("../s?"); // TODO generate relative search paths, get rid of -w <webapp> option to indexer !
+         setCtags(System.getProperty("org.opensolaris.opengrok.analysis.Ctags", "ctags"));
+         //below can cause an outofmemory error, since it is defaulting to NO LIMIT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opengrok.git/commitdiff/f39700c92b8f70bc0f2367f17f7c39cce3331aca



More information about the pld-cvs-commit mailing list