From a055ae1236fb62bbac1ff518cf9bb4f134f5a326183d07af4504894f5f9a6215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Sep 2013 11:56:45 +0000 Subject: [PATCH 1/3] Replace jpackage-utils by javapackages-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/javahelp2?expand=0&rev=5 --- javahelp2.changes | 5 +++++ javahelp2.spec | 22 +++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/javahelp2.changes b/javahelp2.changes index 1c7befe..4942e11 100644 --- a/javahelp2.changes +++ b/javahelp2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 11:05:55 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + ------------------------------------------------------------------- Sun Nov 4 14:08:32 CEST 2011 - fschuett@gymnasium-himmelsthuer.de diff --git a/javahelp2.spec b/javahelp2.spec index 6a71b10..1583029 100644 --- a/javahelp2.spec +++ b/javahelp2.spec @@ -1,7 +1,7 @@ # -# spec file for package javahelp2 (Version 2.0.05) +# spec file for package javahelp2 # -# Copyright (c) 2009 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 @@ -21,11 +21,11 @@ Name: javahelp2 Version: 2.0.05 -Release: 3 +Release: 0 Summary: Java online help system License: GPL-2.0+ -Url: https://javahelp.dev.java.net/ 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 @@ -33,15 +33,15 @@ Source2: %{name}-jhsearch.sh Source3: %{oname}-%{version}.pom Source4: https://javahelp.dev.java.net/license.txt BuildArch: noarch -PreReq: jpackage-utils >= 1.7.4 +PreReq: javapackages-tools Requires: geronimo-jsp-2_0-api Requires: geronimo-servlet-2_4-api -BuildRequires: jpackage-utils >= 1.7.4 -BuildRequires: java-devel >= 1.5.0 BuildRequires: ant >= 1.6.5 BuildRequires: ant-nodeps BuildRequires: geronimo-jsp-2_0-api BuildRequires: geronimo-servlet-2_4-api +BuildRequires: java-devel >= 1.5.0 +BuildRequires: javapackages-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,7 +54,6 @@ documentation for the Web and corporate Intranet. %package manual -License: GPL-2.0+ Summary: Java online help system Group: Development/Libraries/Java @@ -68,7 +67,6 @@ documentation for the Web and corporate Intranet. %package javadoc -License: GPL-2.0+ Summary: Java online help system Group: Development/Libraries/Java @@ -156,9 +154,3 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name}-%{version} %changelog -* Mon May 18 2009 mvyskocil@suse.cz -- fixed bnc#503327: Confirm licenses of javahelp2 - * used clean source code from javahelp.dev.java.net - * added a license.txt from this site -* Wed May 06 2009 mvyskocil@suse.cz -- Initial SUSE packaging of 2.0.05 (from jpp 5.0) From 35ddbbe826cea88caf932f3dad8aa9186a88078def5cd9dd01ea18784fba9337 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 10 Sep 2013 11:34:36 +0000 Subject: [PATCH 2/3] - use add_maven_depmap from javapackages-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/javahelp2?expand=0&rev=6 --- javahelp2.changes | 5 +++++ javahelp2.spec | 39 ++++++++++++++------------------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/javahelp2.changes b/javahelp2.changes index 4942e11..fef76fe 100644 --- a/javahelp2.changes +++ b/javahelp2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 10 11:34:03 UTC 2013 - mvyskocil@suse.com + +- use add_maven_depmap from javapackages-tools + ------------------------------------------------------------------- Mon Sep 9 11:05:55 UTC 2013 - tchvatal@suse.com diff --git a/javahelp2.spec b/javahelp2.spec index 1583029..9dcb525 100644 --- a/javahelp2.spec +++ b/javahelp2.spec @@ -108,37 +108,26 @@ ant \ release javadoc %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -install -d -m 755 $RPM_BUILD_ROOT%{_bindir} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/jh2indexer -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/jh2search -install -m 644 javahelp_nbproject/dist/lib/jhall.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -#cp -pr jhMaster/JavaHelp/doc/public-spec/dtd $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -pr javahelp_nbproject/dist/lib/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -# create unversioned symlinks -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) -%add_to_maven_depmap javax.help %{oname} %{version} JPP %{name} +install -d -m 755 %{buildroot}%{_javadir} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +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} +cp -pr javahelp_nbproject/dist/lib/javadoc/* %{buildroot}%{_javadocdir}/%{name} + # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap + %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap %files %defattr(0644,root,root,0755) %doc license.txt %attr(0755,root,root) %{_bindir}/* -%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar #%dir %{_datadir}/%{name} #%{_datadir}/%{name}/dtd @@ -151,6 +140,6 @@ rm -rf $RPM_BUILD_ROOT %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %changelog From 46f962850a152c4744391fe37f93a71e2e0b8a95b276091eef9dd8a5dd48680c Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 10 Sep 2013 11:49:55 +0000 Subject: [PATCH 3/3] fix few typos in speC OBS-URL: https://build.opensuse.org/package/show/Java:packages/javahelp2?expand=0&rev=7 --- javahelp2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javahelp2.spec b/javahelp2.spec index 9dcb525..fc58fce 100644 --- a/javahelp2.spec +++ b/javahelp2.spec @@ -109,7 +109,7 @@ ant \ %install install -d -m 755 %{buildroot}%{_javadir} -install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +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 @@ -131,7 +131,7 @@ install -pm 644 %{SOURCE3} \ %{_javadir}/%{name}.jar #%dir %{_datadir}/%{name} #%{_datadir}/%{name}/dtd -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir} %files manual