Attachment 295308 Details for Bug 228141 – Diff between lucene-1.9.1-2jpp.5 and lucene-2.3.0-1jpp

[patch] Diff between lucene-1.9.1-2jpp.5 and lucene-2.3.0-1jpp

lucene-1.9.1-2.3.0.diff (text/plain), 8.41 KB, created by Lubomir Kundrak on 2008-02-19 16:44:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Kundrak

Created: 2008-02-19 16:44:57 UTC

Size: 8.41 KB

patch

obsolete

>Binary files lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-1.9.1-src.tar.gz and lucene-2.3.0-1jpp.fc9.src.rpm/lucene-1.9.1-src.tar.gz differ
>diff -Nur lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-1.9-common-build_xml.patch lucene-2.3.0-1jpp.fc9.src.rpm/lucene-1.9-common-build_xml.patch
>--- lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-1.9-common-build_xml.patch	2008-02-19 17:42:12.000000000 +0100
>+++ lucene-2.3.0-1jpp.fc9.src.rpm/lucene-1.9-common-build_xml.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,21 +0,0 @@
>---- common-build.xml.sav	2006-03-02 21:29:01.000000000 +0100
>-+++ common-build.xml	2006-03-29 17:43:24.000000000 +0200
>-@@ -22,7 +22,7 @@
>- 
>-   <property name="name" value="${ant.project.name}"/>
>-   <property name="Name" value="Lucene"/>
>--  <property name="version" value="1.9.2-dev"/>
>-+  <property name="version" value="1.9.1"/>
>-   <property name="year" value="2000-${current.year}"/>
>-   <property name="final.name" value="lucene-${name}-${version}"/>
>- 
>-@@ -186,7 +186,9 @@
>-       </batchtest>
>-     </junit>
>- 
>-+
>-   </target>
>- 
>-   <target name="generate-test-reports" description="Generates test reports">
>diff -Nur lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-1.9-contrib-db-bdb-build_xml.patch lucene-2.3.0-1jpp.fc9.src.rpm/lucene-1.9-contrib-db-bdb-build_xml.patch
>--- lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-1.9-contrib-db-bdb-build_xml.patch	2008-02-19 17:42:12.000000000 +0100
>+++ lucene-2.3.0-1jpp.fc9.src.rpm/lucene-1.9-contrib-db-bdb-build_xml.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,15 +0,0 @@
>---- contrib/db/bdb/build.xml.sav	2006-02-20 19:18:00.000000000 +0100
>-+++ contrib/db/bdb/build.xml	2006-03-29 18:00:25.000000000 +0200
>-@@ -5,10 +5,10 @@
>-     Lucene Berkeley DB integration
>-   </description>
>- 
>--  <property name="db.version" value="4.3.29" />
>-+  <property name="db.version" value="native" />
>- 
>-   <path id="db.jar">
>--    <pathelement location="lib/db-${db.version}.jar" />
>-+    <pathelement location="lib/berkeleydb-${db.version}.jar" />
>-   </path>
>- 
>-   <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
>diff -Nur lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-1.9-contrib-db-bdb-je-build_xml.patch lucene-2.3.0-1jpp.fc9.src.rpm/lucene-1.9-contrib-db-bdb-je-build_xml.patch
>--- lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-1.9-contrib-db-bdb-je-build_xml.patch	2008-02-19 17:42:12.000000000 +0100
>+++ lucene-2.3.0-1jpp.fc9.src.rpm/lucene-1.9-contrib-db-bdb-je-build_xml.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- contrib/db/bdb-je/build.xml.sav	2006-03-29 16:47:36.000000000 +0200
>-+++ contrib/db/bdb-je/build.xml	2006-03-29 16:48:51.000000000 +0200
>-@@ -8,7 +8,7 @@
>-   <property name="je.version" value="2.0.90" />
>- 
>-   <path id="je.jar">
>--    <pathelement location="lib/je-${je.version}/lib/je.jar" />
>-+    <pathelement location="lib/berkeleydb.jar" />
>-   </path>
>- 
>-   <available classname="com.sleepycat.je.Database" property="je.jar.exists">
>diff -Nur lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-2.3.0-db-javadoc.patch lucene-2.3.0-1jpp.fc9.src.rpm/lucene-2.3.0-db-javadoc.patch
>--- lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-2.3.0-db-javadoc.patch	1970-01-01 01:00:00.000000000 +0100
>+++ lucene-2.3.0-1jpp.fc9.src.rpm/lucene-2.3.0-db-javadoc.patch	2008-02-19 17:42:13.000000000 +0100
>@@ -0,0 +1,19 @@
>+Do not attempt to build documentation for db4 stuff,
>+we removed it in %prep
>+
>+Lubomir Kundrak <lkundrak@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/highlighter/src/java"/>
>+           <packageset dir="contrib/lucli/src/java"/>
>+           <packageset dir="contrib/memory/src/java"/>
>Binary files lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-2.3.0-src.tar.gz and lucene-2.3.0-1jpp.fc9.src.rpm/lucene-2.3.0-src.tar.gz differ
>diff -Nur lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-2.3.0-version.patch lucene-2.3.0-1jpp.fc9.src.rpm/lucene-2.3.0-version.patch
>--- lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene-2.3.0-version.patch	1970-01-01 01:00:00.000000000 +0100
>+++ lucene-2.3.0-1jpp.fc9.src.rpm/lucene-2.3.0-version.patch	2008-02-19 17:42:13.000000000 +0100
>@@ -0,0 +1,16 @@
>+Version number is slightly wrong and confuses our SPEC.
>+
>+Lubomir Kundrak <lkundrak@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}"/>
>diff -Nur lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene.spec lucene-2.3.0-1jpp.fc9.src.rpm/lucene.spec
>--- lucene-1.9.1-2jpp.5.fc9.src.rpm/lucene.spec	2008-02-19 17:42:13.000000000 +0100
>+++ lucene-2.3.0-1jpp.fc9.src.rpm/lucene.spec	2008-02-19 17:42:13.000000000 +0100
>@@ -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%{?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
>@@ -157,8 +157,9 @@
> 
> # jars
> install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
>-install -m 0644 build/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>+install -m 0644 build/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar
> install -m 0644 build/%{name}-demos-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-demos-%{version}.jar
>+(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-core-%{version}.jar %{name}-%{version}.jar)
> (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
> 
> # contrib jars
>@@ -215,6 +216,8 @@
> %files
> %defattr(0644,root,root,0755)
> %doc CHANGES.txt LICENSE.txt README.txt
>+%{_javadir}/%{name}-core-%{version}.jar
>+%{_javadir}/%{name}-core.jar
> %{_javadir}/%{name}-%{version}.jar
> %{_javadir}/%{name}.jar
> %{_datadir}/%{name}-%{version}
>@@ -265,6 +268,9 @@
> 
> 
> %changelog
>+* Tue Feb 19 2008 Lubomir Kundrak <lkundrak@redhat.com> - 0:2.3.0-1jpp
>+- 2.3.0
>+
> * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.9.1-2jpp.5
> - Autorebuild for GCC 4.3
>

Actions: View | Diff

Attachments on bug 228141: 295308 | 295416