rpms/opengrok/devel opengrok-0.8-manifest-classpath.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 opengrok-0.6-nochangeset.patch, 1.1, 1.2 opengrok-0.7-jflex.patch, 1.1, 1.2 opengrok.spec, 1.7, 1.8 sources, 1.5, 1.6 opengrok-0.5-manifest-classpath.patch, 1.1, NONE

Sun Jul 12 16:49:12 UTC 2009

Author: lkundrak

Update of /cvs/pkgs/rpms/opengrok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16432

Modified Files:
	.cvsignore opengrok-0.6-nochangeset.patch 
	opengrok-0.7-jflex.patch opengrok.spec sources 
Added Files:
	opengrok-0.8-manifest-classpath.patch 
Removed Files:
	opengrok-0.5-manifest-classpath.patch 
Log Message:
* Sun Jul 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-0.1.20090712hg
- Update to latest Mercurial snapshot
- bconds are nice, use them


opengrok-0.8-manifest-classpath.patch:

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

Lubomir Rintel <lkundrak at v3.sk>

diff -up opengrok-0.7-src/build.xml.manifest-classpath opengrok-0.7-src/build.xml
--- opengrok-0.7-src/build.xml.manifest-classpath	2009-07-12 18:17:35.472550073 +0200
+++ opengrok-0.7-src/build.xml	2009-07-12 18:18:05.048557806 +0200
@@ -238,14 +238,16 @@ Use is subject to license terms.
     </target>
 
     <!-- Update the manifest file with a classpath attribute -->
+    <!--
     <target name="-update-manifest-classpath">
       <manifest file="${manifest.file}" mode="update">
         <attribute name="Class-Path"
                    value="${opengrok.lib.files} lib/derby.jar"/>
       </manifest>
     </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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Oct 2008 16:55:28 -0000	1.5
+++ .cvsignore	12 Jul 2009 16:49:11 -0000	1.6
@@ -1 +1 @@
-opengrok-r617-src.tar.gz
+opengrok-r786-src.tar.gz

opengrok-0.6-nochangeset.patch:

Index: opengrok-0.6-nochangeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok-0.6-nochangeset.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opengrok-0.6-nochangeset.patch	18 Apr 2008 19:11:54 -0000	1.1
+++ opengrok-0.6-nochangeset.patch	12 Jul 2009 16:49:12 -0000	1.2
@@ -1,5 +1,7 @@
 Do not call home to get the changeset. It won't succeed anyways.
 
+Lubomir Rintel <lkundrak at v3.sk>
+
 diff -urp opengrok-0.6-src.orig/build.xml opengrok-0.6-src/build.xml
 --- opengrok-0.6-src.orig/build.xml	2008-04-16 00:15:23.000000000 +0200
 +++ opengrok-0.6-src/build.xml	2008-04-16 00:20:52.000000000 +0200

opengrok-0.7-jflex.patch:

Index: opengrok-0.7-jflex.patch
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok-0.7-jflex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opengrok-0.7-jflex.patch	16 Oct 2008 19:12:34 -0000	1.1
+++ opengrok-0.7-jflex.patch	12 Jul 2009 16:49:12 -0000	1.2
@@ -1,3 +1,7 @@
+We include jflex differently.
+
+Lubomir Rintel <lkundrak at v3.sk>
+
 --- 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 @@


Index: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- opengrok.spec	26 Feb 2009 08:29:43 -0000	1.7
+++ opengrok.spec	12 Jul 2009 16:49:12 -0000	1.8
@@ -1,30 +1,26 @@
 # Webapp is disabled, since Fedora does not have the Java Webapp guidelines
-# finished yet
-%if %{?fedora}0
-%define webapp %{?_with_webapp:1} %{!?_with_webapp:0}
-%else
-%define webapp %{?!_without_webapp:1} %{?_without_webapp:0}
-%endif
+# finished yet: http://fedoraproject.org/wiki/PackagingDrafts/JavaWebApps
+%bcond_with webapp
 
 Name:           opengrok
-Version:        0.7
-Release:        0.3.20081016hg%{?dist}
+Version:        0.8
+Release:        0.1.20090712hg%{?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 -r617 ssh://anon@hg.opensolaris.org/hg/opengrok/trunk opengrok-0.7-src
-# tar czf opengrok-r617-src.tar.gz --exclude .hg opengrok-0.7-src
-Source0:        opengrok-r617-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
 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.5-manifest-classpath.patch
+Patch3:         opengrok-0.8-manifest-classpath.patch
 Patch4:         opengrok-0.6-nooverview.patch
 Patch5:         opengrok-0.6-nochangeset.patch
 Patch6:         opengrok-0.7-jflex.patch
@@ -42,7 +38,6 @@ BuildRequires:  ant-nodeps
 # This is just to prevent GCJ from attempting to build this.
 # ant scripts from both jrcs and opengrok need to be fixed somehow
 BuildRequires:  java-devel >= 1.6
-BuildRequires:  subversion-javahl
 BuildRequires:  unzip
 BuildRequires:  junit4
 BuildRequires:  ant-junit
@@ -65,7 +60,7 @@ Requires:       jpackage-utils
 %{summary}.
 
 
-%if %{webapp}
+%if %with webapp
 %package tomcat5
 Summary:        Source browser web application
 Group:          Development/Tools
@@ -77,7 +72,8 @@ OpenGrok web application
 
 
 %prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n %{name}-0.7-src
+#%setup -q -n %{name}-%{version}-src
 %{__unzip} -q ext/jrcs.zip
 %patch0 -p1 -b .jrcs-import
 %patch1 -p1 -b .nocplib
@@ -101,7 +97,7 @@ sed 's,/opengrok/configuration.xml,%{_sy
         -i conf/web.xml
 
 # README.Fedora
-%if %{webapp}
+%if %with webapp
 cp %{SOURCE3} README.Fedora
 %else
 cp %{SOURCE4} README.Fedora
@@ -113,8 +109,6 @@ pushd jrcs
 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 \
@@ -147,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # directories
 
-%if %{webapp}
+%if %with webapp
 %define webappdir %{_localstatedir}/lib/tomcat5/webapps/source
 install -d $RPM_BUILD_ROOT%{webappdir}/WEB-INF/lib
 %endif
@@ -192,7 +186,7 @@ cp -pR jrcs/doc/api/. $RPM_BUILD_ROOT%{_
 # Configuration file configuration.xml
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
-%if %{webapp}
+%if %with webapp
 # Make love, not war!
 unzip -q dist/source.war -d $RPM_BUILD_ROOT%{webappdir}
 (IFS=:; for file in $(build-classpath                   \
@@ -227,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 
-%if %{webapp}
+%if %with webapp
 %files tomcat5
 %defattr(-,root,root,-)
 %{webappdir}
@@ -237,6 +231,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-0.1.20090712hg
+- Update to latest Mercurial snapshot
+- bconds are nice, use them
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-0.3.20081016hg
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Oct 2008 16:55:29 -0000	1.5
+++ sources	12 Jul 2009 16:49:12 -0000	1.6
@@ -1 +1 @@
-98b6dd34a7f3645a64e04f0f8ad17f31  opengrok-r617-src.tar.gz
+8538341be7ec3ef12606d0578ec5ca34  opengrok-r786-src.tar.gz


--- opengrok-0.5-manifest-classpath.patch DELETED ---


