rpms/lucene/devel lucene.spec, 1.33, 1.34 lucene-2.3.0-version.patch, 1.1, NONE

Lubomir Rintel (lkundrak) fedora-extras-commits at redhat.com
Mon May 5 10:13:09 UTC 2008


Author: lkundrak

Update of /cvs/pkgs/rpms/lucene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25068

Modified Files:
	lucene.spec 
Removed Files:
	lucene-2.3.0-version.patch 
Log Message:
* Mon May 5 2008 Lubomir Rintel <lkundrak at v3.sk> - 0:2.3.1-2jpp.0
- Unbreak build by repacing the version patch with and -Dversion



Index: lucene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lucene.spec	5 May 2008 08:21:13 -0000	1.33
+++ lucene.spec	5 May 2008 10:12:30 -0000	1.34
@@ -34,7 +34,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        2.3.1
-Release:        1jpp.0%{?dist}
+Release:        2jpp.0%{?dist}
 Epoch:          0
 License:        Apache Software License
 URL:            http://lucene.apache.org/
@@ -42,7 +42,6 @@
 Source0:        http://www.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
 Source1:	lucene-1.9-OSGi-MANIFEST.MF
 Source2:	lucene-1.9-analysis-OSGi-MANIFEST.MF
-Patch3:         lucene-2.3.0-version.patch
 Patch4:         lucene-2.3.0-db-javadoc.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
@@ -114,7 +113,6 @@
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
-%patch3 -p1 -b .version
 %patch4 -p1 -b .db-javadoc
 
 %build
@@ -143,6 +141,7 @@
   -Djavacc.jar=%{_javadir}/javacc.jar \
   -Djavacc.jar.dir=%{_javadir} \
   -Djavadoc.link=%{_javadocdir}/java \
+  -Dversion=%{version} \
   package
 #  package test generate-test-reports
 
@@ -265,6 +264,9 @@
 
 
 %changelog
+* Mon May 5 2008 Lubomir Rintel <lkundrak at v3.sk> - 0:2.3.1-2jpp.0
+- Unbreak build by repacing the version patch with and -Dversion
+
 * Mon May 5 2008 Lubomir Rintel <lkundrak at v3.sk> - 0:2.3.1-1jpp.0
 - 2.3.1, bugfixes only
 


--- lucene-2.3.0-version.patch DELETED ---




More information about the scm-commits mailing list