Hello community, here is the log from the commit of package lucene for openSUSE:Factory checked in at 2017-05-22 10:47:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lucene (Old) and /work/SRC/openSUSE:Factory/.lucene.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene" Mon May 22 10:47:37 2017 rev:19 rq:496759 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lucene/lucene.changes 2015-04-02 15:58:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new/lucene.changes 2017-05-22 10:48:42.958491258 +0200 @@ -1,0 +2,5 @@ +Fri May 19 09:11:42 UTC 2017 - [email protected] + +- New build dependency: javapackages-local + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lucene.spec ++++++ --- /var/tmp/diff_new_pack.Cj6t5p/_old 2017-05-22 10:48:44.430283816 +0200 +++ /var/tmp/diff_new_pack.Cj6t5p/_new 2017-05-22 10:48:44.430283816 +0200 @@ -1,7 +1,7 @@ # # spec file for package lucene # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,6 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -%define with_db 1 -%bcond_with db -%define section free -%define oname lucene - Name: lucene Version: 2.4.1 Release: 0 @@ -58,20 +49,13 @@ Source19: http://repo1.maven.org/maven2/org/apache/lucene/lucene-swing/2.4.0/lucene-swing-2.4.0.pom Source21: http://repo1.maven.org/maven2/org/apache/lucene/lucene-wordnet/2.4.0/lucene-wordnet-2.4.0.pom Source22: http://repo1.maven.org/maven2/org/apache/lucene/lucene-xml-query-parser/2.4.0/lucene-xml-query-parser-2.4.0.pom +Source100: lucene-1.9-OSGi-MANIFEST.MF +Source200: lucene-1.9-analysis-OSGi-MANIFEST.MF Patch0: lucene-no-classpath-in-manifest.patch Patch1: lucene-no-get.patch Patch4: lucene-2.3.0-db-javadoc.patch -Source100: lucene-1.9-OSGi-MANIFEST.MF -Source200: lucene-1.9-analysis-OSGi-MANIFEST.MF -Requires(post): javapackages-tools -Requires(postun): javapackages-tools BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 -%if %with db -BuildRequires: berkeleydb >= 2.0.90 -BuildRequires: geronimo-j2ee-connector-1_5-api -BuildRequires: libdb_java-4_5 -%endif BuildRequires: fdupes BuildRequires: jakarta-commons-beanutils BuildRequires: jakarta-commons-collections @@ -79,6 +63,7 @@ BuildRequires: jakarta-commons-logging BuildRequires: java-devel >= 1.5.0 BuildRequires: javacc +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jline BuildRequires: jtidy @@ -87,15 +72,12 @@ BuildRequires: regexp BuildRequires: zip BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform. - - %package javadoc Summary: High-performance, full-featured text search engine Group: Development/Libraries/Java @@ -105,8 +87,6 @@ written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform. - - %package demo Summary: High-performance, full-featured text search engine Group: Development/Libraries/Java @@ -117,8 +97,6 @@ written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform. - - %package contrib Summary: High-performance, full-featured text search engine Group: Development/Libraries/Java @@ -130,8 +108,6 @@ written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform. - - %package contrib-benchmark Summary: High-performance, full-featured text search engine Group: Development/Libraries/Java @@ -148,42 +124,15 @@ written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform. - - -%if %with db - -%package contrib-db -Summary: High-performance, full-featured text search engine -Group: Development/Libraries/Java -Requires: %{name} = %{version} -Requires: berkeleydb >= 2.0.90 -Requires: libdb_java-4_5 - -%description contrib-db -Jakarta Lucene is a high-performance, full-featured text search engine -written entirely in Java. It is a technology suitable for nearly any -application that requires full-text search, especially cross-platform. - - - -%endif - %prep -%setup -q -n %{oname}-%{version} -%patch0 -p0 -%patch1 -p0 +%setup -q -n %{name}-%{version} +%patch0 +%patch1 %patch4 -p1 -%if %without db rm -r contrib/db -%endif %build -export CLASSPATH=$(build-classpath \ -%if %with db -berkeleydb \ -db \ -%endif -commons-digester jline jtidy junit regexp) +export CLASSPATH=$(build-classpath commons-digester jline jtidy junit regexp) export OPT_JAR_LIST=: ant \ -Djavacc.home=%{_bindir}/javacc \ @@ -201,30 +150,21 @@ %install # jars install -d -m 0755 %{buildroot}%{_javadir} -install -p -m 0644 build/%{oname}-core-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -install -p -m 0644 build/%{oname}-demos-%{version}.jar %{buildroot}%{_javadir}/%{name}-demos-%{version}.jar +install -p -m 0644 build/%{name}-core-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +install -p -m 0644 build/%{name}-demos-%{version}.jar %{buildroot}%{_javadir}/%{name}-demos-%{version}.jar (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # contrib jars install -d -m 0755 %{buildroot}%{_javadir}/%{name}-contrib for c in analyzers ant benchmark highlighter lucli memory misc queries regex similarity snowball spellchecker surround swing wikipedia wordnet xml-query-parser; do - install -p -m 0644 build/contrib/$c/%{oname}-${c}-%{version}.jar \ + install -p -m 0644 build/contrib/$c/%{name}-${c}-%{version}.jar \ %{buildroot}%{_javadir}/%{name}-contrib/${c}-%{version}.jar done (cd %{buildroot}%{_javadir}/%{name}-contrib && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # benchmark contrib jars install -d -m 0755 %{buildroot}%{_javadir}/%{name}-contrib-benchmark -install -p -m 0644 build/contrib/benchmark/%{oname}-benchmark-%{version}.jar \ +install -p -m 0644 build/contrib/benchmark/%{name}-benchmark-%{version}.jar \ %{buildroot}%{_javadir}/%{name}-contrib-benchmark/benchmark-%{version}.jar (cd %{buildroot}%{_javadir}/%{name}-contrib-benchmark && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%if %with db -# bdb contrib jars -install -d -m 0755 %{buildroot}%{_javadir}/%{name}-contrib-db -install -p -m 0644 build/contrib/db/bdb/%{oname}-bdb-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-contrib-db/bdb-%{version}.jar -install -p -m 0644 build/contrib/db/bdb-je/%{oname}-bdb-je-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-contrib-db/bdb-je-%{version}.jar -(cd %{buildroot}%{_javadir}/%{name}-contrib-db && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%endif # poms install -d -m 0755 %{buildroot}%{_mavenpomdir}/ @@ -234,14 +174,6 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-ant.pom %add_maven_depmap JPP.%{name}-contrib-ant.pom %{name}-contrib/ant.jar -%if %with db -install -p -m 0644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-db-bdb.pom -%add_maven_depmap JPP.%{name}-contrib-db-bdb.pom %{name}-contrib-db/bdb.jar - -install -p -m 0644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-db-bdb-je.pom -%add_maven_depmap JPP.%{name}-contrib-db-bdb-je.pom %{name}-contrib-db/bdb-je.jar -%endif - install -p -m 0644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-benchmark-benchmark.pom %add_maven_depmap JPP.%{name}-contrib-benchmark-benchmark.pom %{name}-contrib-benchmark/benchmark.jar @@ -300,7 +232,7 @@ # webapp install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version} -install -p -m 0644 build/%{oname}web.war \ +install -p -m 0644 build/%{name}web.war \ %{buildroot}%{_datadir}/%{name}-%{version} %fdupes -s %{buildroot}%{_javadocdir}/%{name} @@ -358,12 +290,6 @@ %files contrib-benchmark %defattr(0644,root,root,0755) %{_javadir}/%{name}-contrib-benchmark -%if %with db - -%files contrib-db -%defattr(0644,root,root,0755) -%{_javadir}/%{name}-contrib-db -%endif %files demo %defattr(0644,root,root,0755)
