Hello community, here is the log from the commit of package lucene for openSUSE:Factory checked in at 2013-09-11 13:39:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lucene (Old) and /work/SRC/openSUSE:Factory/.lucene.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene" Changes: -------- --- /work/SRC/openSUSE:Factory/lucene/lucene.changes 2012-06-28 15:32:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new/lucene.changes 2013-09-11 13:39:46.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 10 14:00:29 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:06:13 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lucene.spec ++++++ --- /var/tmp/diff_new_pack.4Gi31M/_old 2013-09-11 13:39:47.000000000 +0200 +++ /var/tmp/diff_new_pack.4Gi31M/_new 2013-09-11 13:39:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lucene # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,8 +63,8 @@ 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): jpackage-utils >= 1.7.5 -Requires(postun): jpackage-utils >= 1.7.5 +Requires(post): javapackages-tools +Requires(postun): javapackages-tools BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 %if %with db @@ -80,8 +80,8 @@ BuildRequires: java-devel >= 1.5.0 BuildRequires: java-javadoc >= 1.6.0 BuildRequires: javacc +BuildRequires: javapackages-tools BuildRequires: jline -BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: jtidy BuildRequires: junit BuildRequires: log4j @@ -227,70 +227,83 @@ (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}%{_datadir}/maven2/poms -install -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-analyzers.pom -%add_to_maven_depmap org.apache.lucene lucene-analyzers %{version} JPP/%{name}-contrib analyzers -install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-ant.pom -%add_to_maven_depmap org.apache.lucene lucene-ant %{version} JPP/%{name}-contrib ant +install -d -m 0755 %{buildroot}%{_mavenpomdir}/ + +install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-analyzers.pom +%add_maven_depmap JPP.%{name}-contrib-analyzers.pom %{name}-contrib/analyzers.jar + +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}%{_datadir}/maven2/poms/JPP.%{name}-contrib-db-bdb.pom -%add_to_maven_depmap org.apache.lucene lucene-bdb %{version} JPP/%{name}-contrib-db bdb -install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-db-bdb-je.pom -%add_to_maven_depmap org.apache.lucene lucene-bdb-je %{version} JPP/%{name}-contrib-db bdb-je +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}%{_datadir}/maven2/poms/JPP.%{name}-contrib-benchmark-benchmark.pom -%add_to_maven_depmap org.apache.lucene lucene-benchmark %{version} JPP/%{name}-contrib-benchmark benchmark -install -p -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib.pom -%add_to_maven_depmap org.apache.lucene lucene-contrib %{version} JPP/%{name} contrib -install -p -m 0644 %{SOURCE7} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap org.apache.lucene lucene-core %{version} JPP %{name} -install -p -m 0644 %{SOURCE8} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-demos.pom -%add_to_maven_depmap org.apache.lucene lucene-demos %{version} JPP %{name}-demos -install -p -m 0644 %{SOURCE9} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-highlighter.pom -%add_to_maven_depmap org.apache.lucene lucene-highlighter %{version} JPP/%{name}-contrib highlighter -install -p -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-lucli.pom -%add_to_maven_depmap org.apache.lucene lucene-lucli %{version} JPP/%{name}-contrib lucli -install -p -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-memory.pom -%add_to_maven_depmap org.apache.lucene lucene-memory %{version} JPP/%{name}-contrib memory -install -p -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-misc.pom -%add_to_maven_depmap org.apache.lucene lucene-misc %{version} JPP/%{name}-contrib misc -install -p -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-parent.pom -%add_to_maven_depmap org.apache.lucene lucene-parent %{version} JPP/%{name} parent -install -p -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-queries.pom -%add_to_maven_depmap org.apache.lucene lucene-queries %{version} JPP/%{name}-contrib queries -install -p -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-regexp.pom -%add_to_maven_depmap org.apache.lucene lucene-regexp %{version} JPP/%{name}-contrib regexp -install -p -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-snowball.pom -%add_to_maven_depmap org.apache.lucene lucene-snowball %{version} JPP/%{name}-contrib snowball -install -p -m 0644 %{SOURCE17} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-spellchecker.pom -%add_to_maven_depmap org.apache.lucene lucene-spellchecker %{version} JPP/%{name}-contrib spellchecker -install -p -m 0644 %{SOURCE18} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-surround.pom -%add_to_maven_depmap org.apache.lucene lucene-surround %{version} JPP/%{name}-contrib surround -install -p -m 0644 %{SOURCE19} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-swing.pom -%add_to_maven_depmap org.apache.lucene lucene-swing %{version} JPP/%{name}-contrib swing -install -p -m 0644 %{SOURCE21} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-wordnet.pom -%add_to_maven_depmap org.apache.lucene lucene-wordnet %{version} JPP/%{name}-contrib wordnet -install -p -m 0644 %{SOURCE22} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-contrib-xml-query-parser.pom -%add_to_maven_depmap org.apache.lucene lucene-xml-query-parser %{version} JPP/%{name}-contrib xml-query-parser + +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 + +#install -p -m 0644 %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib.pom +# % add_to_maven_depmap org.apache.lucene lucene-contrib %{version} JPP/%{name} contrib + +install -p -m 0644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar + +install -p -m 0644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP-%{name}-demos.pom +%add_maven_depmap JPP-%{name}-demos.pom %{name}-demos.jar + +install -p -m 0644 %{SOURCE9} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-highlighter.pom +%add_maven_depmap JPP.%{name}-contrib-highlighter.pom %{name}-contrib/highlighter.jar + +install -p -m 0644 %{SOURCE10} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-lucli.pom +%add_maven_depmap JPP.%{name}-contrib-lucli.pom %{name}-contrib/lucli.jar + +install -p -m 0644 %{SOURCE11} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-memory.pom +%add_maven_depmap JPP.%{name}-contrib-memory.pom %{name}-contrib/memory.jar + +install -p -m 0644 %{SOURCE12} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-misc.pom +%add_maven_depmap JPP.%{name}-contrib-misc.pom %{name}-contrib/misc.jar + +#install -p -m 0644 %{SOURCE13} %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom +# % add_maven_depmap JPP.%{name}-contrib-misc.pom %{name}-contrib/misc.jar + +install -p -m 0644 %{SOURCE14} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-queries.pom +%add_maven_depmap JPP.%{name}-contrib-queries.pom %{name}-contrib/queries.jar + +install -p -m 0644 %{SOURCE15} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-regex.pom +%add_maven_depmap JPP.%{name}-contrib-regex.pom %{name}-contrib/regex.jar + +install -p -m 0644 %{SOURCE16} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-snowball.pom +%add_maven_depmap JPP.%{name}-contrib-snowball.pom %{name}-contrib/snowball.jar + +install -p -m 0644 %{SOURCE17} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-spellchecker.pom +%add_maven_depmap JPP.%{name}-contrib-spellchecker.pom %{name}-contrib/spellchecker.jar + +install -p -m 0644 %{SOURCE18} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-surround.pom +%add_maven_depmap JPP.%{name}-contrib-surround.pom %{name}-contrib/surround.jar + +install -p -m 0644 %{SOURCE19} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-swing.pom +%add_maven_depmap JPP.%{name}-contrib-swing.pom %{name}-contrib/swing.jar + +install -p -m 0644 %{SOURCE21} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-wordnet.pom +%add_maven_depmap JPP.%{name}-contrib-wordnet.pom %{name}-contrib/wordnet.jar + +install -p -m 0644 %{SOURCE22} %{buildroot}%{_mavenpomdir}/JPP.%{name}-contrib-xml-query-parser.pom +%add_maven_depmap JPP.%{name}-contrib-xml-query-parser.pom %{name}-contrib/xml-query-parser.jar + # javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version} +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* \ - %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} + %{buildroot}%{_javadocdir}/%{name} + # webapp install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version} install -p -m 0644 build/%{oname}web.war \ %{buildroot}%{_datadir}/%{name}-%{version} -%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} - -%clean -rm -rf %{buildroot} - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) @@ -298,12 +311,11 @@ %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %{_datadir}/%{name}-%{version} -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files contrib -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
