rpms/opengrok/devel README.Fedora, 1.1, 1.2 configuration.xml, 1.1, 1.2 opengrok, 1.1, 1.2 opengrok.spec, 1.2, 1.3
Lubomir Rintel (lkundrak)
fedora-extras-commits at redhat.com
Thu May 22 12:09:14 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/opengrok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12160/devel
Modified Files:
README.Fedora configuration.xml opengrok opengrok.spec
Log Message:
* 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: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora 18 Apr 2008 19:11:54 -0000 1.1
+++ README.Fedora 22 May 2008 12:08:30 -0000 1.2
@@ -1,85 +1,16 @@
-Setting up an 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:
-
-
Notes
-----
-1.) The sub-package opengrok-tomcat5 contains servlet installed to run with
-tomcat5. Feel free to touch the configuration files to suit your needs:
-
-/var/lib/tomcat5/webapps/source/index_body.html
-/var/lib/tomcat5/webapps/source/WEB-INF/web.xml
-
-Other files will be overwritten on update. Want to customize you OpenGrok
-with a cool theme? Submit it to OpenGrok so it can be included with the
-package!
-
-There's no war package. Create one yourself by zipping the files.
-You won't be able to benefit from the updates. Remember that wars suck.
-Both conflicts and web archives.
-
-
-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.
-
-2.) Configuration file is /etc/opengrok/configuration.xml. It sets the
-Source and Data roots to point to subdirectories of /var/lib/opengrok.
-
-5.) Report bugs at http://bugzilla.redhat.com/. Have fun!
-
-
-Step-by-step configuration
---------------------------
-
-This is what would you do to populate your OpenGrok with files and
-customize it in Fedora:
-
-1.) Install openrok-tomcat5 package, start up tomcat5.
-
-2.) Populate /var/lib/opengrok/data your source files. If you have
-multiple projects, place each in a separate directory.
-
-3.) Generate the index and make configuration changes:
-
-# opengrok -R /etc/opengrok/configuration.xml
-
-Remember to always specify the configuration file, so OpenGrok knows
-where to look for files. Though you can specify the directories on a
-command line, having setting stored in a file makes it possible for the
-web application read the same configuration upon its startup.
-
-If you have multiple projects in separate directories, do not forget to
-specify the -P parameter:
-
-# opengrok -P -U localhost:2424 \
- -R /etc/opengrok/configuration.xml \
- -W /etc/opengrok/configuration.xml
-
-Also, when you modify anything in configuration (other than regenerating
-the index), save the modified configuration into the file (-W) so that it
-can be used by the webapp upon startup.
-
-Opengrok by default listens on port 2424 bind to loopback interface for
-configuration updates. Specify the -U parameter, so that you don't have
-to restart your webapp when you do a configuration change.
+This version of OpenGrok RPM package does not contain the Web application,
+as the Java Web Application Guidelines [1] are not yet finished.
-4.) Other changes are done in a similar fashion. When you don't update
-the index, specify -n.
+[1] https://fedoraproject.org/wiki/PackagingDrafts/JavaWebApps
-# opengrok -n -U localhost:2424 \
- -R /etc/opengrok/configuration.xml \
- -W /etc/opengrok/configuration.xml \
- -L polished
+You can generate the Web application package from the source you can
+check out with the following -- login with your Fedora account key:
-This switches the visual skin to "polished".
+hg clone ssh://fedorapeople.org//home/fedora/lkundrak/repo/opengrok
---------------------------------------------------------------------------
-This text was written by Lubomir Kundrak <lkundrak at redhat.com>
+This text was written by Lubomir Rintel <lkundrak at v3.sk>
Should you find a problem in it, report at https://bugzilla.redhat.com/
Index: configuration.xml
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/configuration.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configuration.xml 18 Apr 2008 19:11:54 -0000 1.1
+++ configuration.xml 22 May 2008 12:08:30 -0000 1.2
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- $Id$
-
Fedora OpenGrok Configuration file
- See @DOCDIR@/@NAME at -@VERSION@/README.Fedora
+ See /usr/share/doc/opengrok-*/README.Fedora
-->
<java class="java.beans.XMLDecoder">
<object class="org.opensolaris.opengrok.configuration.Configuration">
<void property="dataRoot">
- <string>@LOCALSTATEDIR@/lib/@NAME@/data</string>
+ <string>/var/lib/opengrok/data</string>
</void>
<void property="sourceRoot">
- <string>@LOCALSTATEDIR@/lib/@NAME@/src</string>
+ <string>/var/lib/opengrok/src</string>
</void>
</object>
</java>
Index: opengrok
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengrok 18 Apr 2008 19:11:54 -0000 1.1
+++ opengrok 22 May 2008 12:08:30 -0000 1.2
@@ -26,8 +26,10 @@
MAIN_CLASS=org.opensolaris.opengrok.index.Indexer
# Attempt to load Subversion support only if it's available
-build-classpath svn-javahl >/dev/null 2>&1 &&
- BASE_JARS="$BASE_JARS svn-javahl.jar"
+# 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"
Index: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opengrok.spec 19 May 2008 13:48:11 -0000 1.2
+++ opengrok.spec 22 May 2008 12:08:30 -0000 1.3
@@ -1,6 +1,6 @@
Name: opengrok
Version: 0.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Source browser and indexer
Group: Development/Tools
@@ -86,10 +86,12 @@
CLASSPATH=$(build-classpath oro) %{ant} -v all
popd
+# The javahl line works around the wrong location of the subversion jar file in RHEL5,
+# and some build-classpath weirdness in a kind of, yeah, stupid way
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) \
+ -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) \
@@ -155,14 +157,8 @@
cp -pR dist/javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pR jrcs/doc/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jrcs
-# Configuration file
-sed '
- s, at NAME@,%{name},;
- s, at VERSION@,%{version},;
- s, at RELEASE@,%{release},;
- s, at DOCDIR@,%{_docdir},;
- s, at LOCALSTATEDIR@,%{_localstatedir},;
-' %{SOURCE2} >$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/configuration.xml
+# Configuration file configuration.xml
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
# Menu entry
install conf/default/img/icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/opengrok.png
@@ -193,6 +189,10 @@
%changelog
+* 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
+
* Mon May 19 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.6.1-1
- New upstream release, dropping snapshot patch
More information about the scm-commits
mailing list