Hello community, here is the log from the commit of package javahelp2 for openSUSE:Factory checked in at 2013-09-11 13:38:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javahelp2 (Old) and /work/SRC/openSUSE:Factory/.javahelp2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javahelp2" Changes: -------- --- /work/SRC/openSUSE:Factory/javahelp2/javahelp2.changes 2012-11-08 21:50:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.javahelp2.new/javahelp2.changes 2013-09-11 13:38:47.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 10 11:34:03 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:05:55 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javahelp2.spec ++++++ --- /var/tmp/diff_new_pack.xK9lTG/_old 2013-09-11 13:38:47.000000000 +0200 +++ /var/tmp/diff_new_pack.xK9lTG/_new 2013-09-11 13:38:47.000000000 +0200 @@ -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 @@ 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 @@ %package manual -License: GPL-2.0+ Summary: Java online help system Group: Development/Libraries/Java @@ -68,7 +67,6 @@ %package javadoc -License: GPL-2.0+ Summary: Java online help system Group: Development/Libraries/Java @@ -110,41 +108,30 @@ 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} +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 -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir} %files manual @@ -153,6 +140,6 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
