rpms/lucene/devel lucene-2.3.0-db-javadoc.patch, NONE, 1.1 lucene-2.3.0-version.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 lucene.spec, 1.31, 1.32 sources, 1.3, 1.4 lucene-1.9-common-build_xml.patch, 1.1, NONE lucene-1.9-contrib-db-bdb-build_xml.patch, 1.1, NONE lucene-1.9-contrib-db-bdb-je-build_xml.patch, 1.1, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Wed Feb 20 15:58:45 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/lucene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16906/devel
Modified Files:
.cvsignore lucene.spec sources
Added Files:
lucene-2.3.0-db-javadoc.patch lucene-2.3.0-version.patch
Removed Files:
lucene-1.9-common-build_xml.patch
lucene-1.9-contrib-db-bdb-build_xml.patch
lucene-1.9-contrib-db-bdb-je-build_xml.patch
Log Message:
2.3.0 (#228141)
lucene-2.3.0-db-javadoc.patch:
--- NEW FILE lucene-2.3.0-db-javadoc.patch ---
Do not attempt to build documentation for db4 stuff,
we removed it in %prep
Lubomir Kundrak <lkundrak at redhat.com>
diff -urp lucene-2.3.0.orig/build.xml lucene-2.3.0/build.xml
--- lucene-2.3.0.orig/build.xml 2008-01-21 02:29:41.000000000 +0100
+++ lucene-2.3.0/build.xml 2008-02-19 16:52:14.000000000 +0100
@@ -237,8 +237,8 @@
<packageset dir="contrib/analyzers/src/java"/>
<packageset dir="contrib/ant/src/java"/>
<packageset dir="contrib/benchmark/src/java"/>
- <packageset dir="contrib/db/bdb-je/src/java"/>
- <packageset dir="contrib/db/bdb/src/java"/>
+ <!-- <packageset dir="contrib/db/bdb-je/src/java"/> -->
+ <!-- <packageset dir="contrib/db/bdb/src/java"/> -->
<packageset dir="contrib/highlighter/src/java"/>
<packageset dir="contrib/lucli/src/java"/>
<packageset dir="contrib/memory/src/java"/>
lucene-2.3.0-version.patch:
--- NEW FILE lucene-2.3.0-version.patch ---
Version number is slightly wrong and confuses our SPEC.
Lubomir Kundrak <lkundrak at redhat.com>
diff -urp lucene-2.3.0.orig/common-build.xml lucene-2.3.0/common-build.xml
--- lucene-2.3.0.orig/common-build.xml 2008-01-21 02:29:41.000000000 +0100
+++ lucene-2.3.0/common-build.xml 2008-02-19 16:34:04.000000000 +0100
@@ -40,7 +40,7 @@
<property name="name" value="${ant.project.name}"/>
<property name="Name" value="Lucene"/>
- <property name="version" value="2.3"/>
+ <property name="version" value="2.3.0"/>
<property name="spec.version" value="${version}"/>
<property name="year" value="2000-${current.year}"/>
<property name="final.name" value="lucene-${name}-${version}"/>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 18 Jul 2007 18:41:05 -0000 1.3
+++ .cvsignore 20 Feb 2008 15:58:06 -0000 1.4
@@ -1,2 +1 @@
-lucene-1.4.3-src.tar.gz
-lucene-1.9.1-src.tar.gz
+lucene-2.3.0-src.tar.gz
Index: lucene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lucene.spec 19 Feb 2008 00:44:41 -0000 1.31
+++ lucene.spec 20 Feb 2008 15:58:06 -0000 1.32
@@ -33,18 +33,17 @@
Summary: High-performance, full-featured text search engine
Name: lucene
-Version: 1.9.1
-Release: 2jpp.5%{?dist}
+Version: 2.3.0
+Release: 1jpp.0%{?dist}
Epoch: 0
License: Apache Software License
URL: http://lucene.apache.org/
Group: Internet/WWW/Indexing/Search
-Source0: http://www.apache.org/dist/lucene/java/lucene-1.9.1-src.tar.gz
+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
-Patch0: lucene-1.9-common-build_xml.patch
-Patch1: lucene-1.9-contrib-db-bdb-build_xml.patch
-Patch2: lucene-1.9-contrib-db-bdb-je-build_xml.patch
+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
BuildRequires: ant-junit >= 0:1.6
@@ -56,6 +55,8 @@
BuildRequires: jline
BuildRequires: jtidy
BuildRequires: regexp
+BuildRequires: commons-digester
+Provides: lucene-core = %{epoch}:%{version}-%{release}
# previously used by eclipse but no longer needed
Obsoletes: lucene-devel < %{version}
%if %{gcj_support}
@@ -113,15 +114,14 @@
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
-%patch0 -b .sav
-#%patch1 -b .sav
-#%patch2 -b .sav
+%patch3 -p1 -b .version
+%patch4 -p1 -b .db-javadoc
%build
mkdir -p docs
mkdir -p lib
export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=$(build-classpath jline jtidy regexp)
+export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester)
#pushd contrib/db/bdb/lib
#ln -sf $(build-classpath berkeleydb-native) .
#popd
@@ -265,6 +265,9 @@
%changelog
+* Tue Feb 19 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0:2.3.0-1jpp.0
+- 2.3.0 (#228141)
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.9.1-2jpp.5
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 18 Jul 2007 18:41:05 -0000 1.3
+++ sources 20 Feb 2008 15:58:06 -0000 1.4
@@ -1 +1 @@
-0cea69522b45674493e7ffd40a913cf4 lucene-1.9.1-src.tar.gz
+6739a647ef39336dd2c0d1edc52df3da lucene-2.3.0-src.tar.gz
--- lucene-1.9-common-build_xml.patch DELETED ---
--- lucene-1.9-contrib-db-bdb-build_xml.patch DELETED ---
--- lucene-1.9-contrib-db-bdb-je-build_xml.patch DELETED ---
More information about the fedora-extras-commits
mailing list