Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javahelp2 for openSUSE:Factory checked in at 2022-04-01 21:36:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javahelp2 (Old) and /work/SRC/openSUSE:Factory/.javahelp2.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javahelp2" Fri Apr 1 21:36:04 2022 rev:21 rq:966367 version:2.0.05 Changes: -------- --- /work/SRC/openSUSE:Factory/javahelp2/javahelp2.changes 2022-03-20 20:56:53.122641865 +0100 +++ /work/SRC/openSUSE:Factory/.javahelp2.new.1900/javahelp2.changes 2022-04-01 21:37:20.552683312 +0200 @@ -1,0 +2,6 @@ +Fri Apr 1 08:37:27 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Do not depend on the geronimo-specs +- Clean-up the spec file and fetch sources by source service + +------------------------------------------------------------------- Old: ---- javahelp-2.0.05.pom javahelp2-jhindexer.sh javahelp2-jhsearch.sh javahelp2-src-2.0.05.tar.bz2 license.txt New: ---- _service javahelp-2.0.05.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javahelp2.spec ++++++ --- /var/tmp/diff_new_pack.t0G9Rr/_old 2022-04-01 21:37:21.052677828 +0200 +++ /var/tmp/diff_new_pack.t0G9Rr/_new 2022-04-01 21:37:21.056677784 +0200 @@ -23,22 +23,16 @@ Summary: Java online help system License: GPL-2.0-or-later Group: Development/Libraries/Java -URL: https://javahelp.dev.java.net/ -Source0: %{name}-src-%{version}.tar.bz2 -# svn export -r 59 https://javahelp.dev.java.net/svn/javahelp/trunk javahelp2-2.0.05 --username guest -Source1: %{name}-jhindexer.sh -Source2: %{name}-jhsearch.sh -Source3: %{oname}-%{version}.pom -Source4: https://javahelp.dev.java.net/license.txt +URL: https://github.com/javaee/javahelp +Source0: %{oname}-%{version}.tar.xz BuildRequires: ant >= 1.6.5 BuildRequires: fdupes -BuildRequires: geronimo-jsp-2_0-api -BuildRequires: geronimo-servlet-2_4-api +BuildRequires: glassfish-jsp-api +BuildRequires: glassfish-servlet-api BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools -Requires: geronimo-jsp-2_0-api -Requires: geronimo-servlet-2_4-api +Requires: glassfish-jsp-api +Requires: glassfish-servlet-api BuildArch: noarch %description @@ -71,22 +65,21 @@ documentation for the Web and corporate Intranet. %prep -%setup -q +%setup -q -n %{oname}-%{version} + # fix files perms chmod -R go=u-w * + # remove windows files find . -type f -name .bat | xargs rm -f -# + # This class provides native browser integration and would require -# JDIC project to be present. Currently there is no such jpackage.org -# package, so deleting the class. When JDIC package is created, -# add BuildProvides and remove the "rm" call. -# +# JDIC project to be present. rm jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java + mkdir javahelp_nbproject/lib -ln -s $(build-classpath geronimo-jsp-2.0-api) javahelp_nbproject/lib/jsp-api.jar -ln -s $(build-classpath geronimo-servlet-2.4-api) javahelp_nbproject/lib/servlet-api.jar -cp %{SOURCE4} . +ln -s $(build-classpath glassfish-jsp-api) javahelp_nbproject/lib/jsp-api.jar +ln -s $(build-classpath glassfish-servlet-api) javahelp_nbproject/lib/servlet-api.jar %build ant \ @@ -99,25 +92,26 @@ release javadoc %install +# jar install -d -m 755 %{buildroot}%{_javadir} -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -install -d -m 755 %{buildroot}%{_bindir} -install -d -m 755 %{buildroot}%{_datadir}/%{name} -install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/jh2indexer -install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/jh2search install -m 644 javahelp_nbproject/dist/lib/jhall.jar %{buildroot}%{_javadir}/%{name}.jar -#cp -pr jhMaster/JavaHelp/doc/public-spec/dtd %{buildroot}%{_datadir}/%{name} + +# maven artifact +%add_maven_depmap javax.help:javahelp:%{version} %{name}.jar + +# scripts +%jpackage_script com.sun.java.help.search.Indexer "" "" javahelp2 jh2indexer true +%jpackage_script com.sun.java.help.search.QueryEngine "" "" javahelp2 jh2search true +#install -d -m 755 %{buildroot}%{_bindir} +#install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/jh2indexer +#install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/jh2search + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr javahelp_nbproject/dist/lib/javadoc/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} -# pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE3} \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap - %files -f .mfiles -%doc license.txt %attr(0755,root,root) %{_bindir}/* %files manual ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/javaee/javahelp.git</param> <param name="revision">2.0_05</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">(.*)_(.*)</param> <param name="versionrewrite-replacement">\1.\2</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
