rpms/opengrok/devel opengrok-0.8.1-manifest-classpath.patch, NONE, 1.1 opengrok.spec, 1.11, 1.12 opengrok-0.8-manifest-classpath.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	opengrok.spec 
Added Files:
	opengrok-0.8.1-manifest-classpath.patch 
Removed Files:
	opengrok-0.8-manifest-classpath.patch 
Log Message:
Really fix the build now

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>
 
     <!-- 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/derbyclient.jar 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: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- opengrok.spec	17 Feb 2010 19:27:08 -0000	1.11
+++ opengrok.spec	17 Feb 2010 19:59:35 -0000	1.12
@@ -17,7 +17,7 @@ Source3:        opengrok-README.Fedora.w
 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
+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
@@ -70,8 +70,7 @@ 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


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