Hello community, here is the log from the commit of package bsh for openSUSE:Factory checked in at 2013-09-11 13:39:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh (Old) and /work/SRC/openSUSE:Factory/.bsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh" Changes: -------- --- /work/SRC/openSUSE:Factory/bsh/bsh.changes 2011-09-23 11:42:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bsh.new/bsh.changes 2013-09-11 13:39:24.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 9 11:05:34 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Wed Aug 28 09:47:50 UTC 2013 - [email protected] + +- use new add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh.spec ++++++ --- /var/tmp/diff_new_pack.sFRbOY/_old 2013-09-11 13:39:25.000000000 +0200 +++ /var/tmp/diff_new_pack.sFRbOY/_new 2013-09-11 13:39:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bsh # -# Copyright (c) 2011 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 @@ -14,21 +14,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # icecream 0 -Name: bsh %define name bsh %define Name BeanShell %define version 1.3.0 %define fversion 1.3.0 %define release 6jpp %define section free + +Name: bsh Version: 1.3.0 -Release: 340 +Release: 0 Summary: Lightweight Scripting for Java License: LGPL-2.1+ +Group: Development/Libraries/Java Source0: %{name}-%{fversion}-src.tar.bz2 Source1: bsh-1.3.0.pom Source2: bsh-bsf-1.3.0.pom @@ -36,17 +37,16 @@ Patch2: %{name}-java14compat.patch BuildRequires: ant-trax BuildRequires: bsf -BuildRequires: perl -BuildRequires: jpackage-utils >= 1.7.2 +BuildRequires: fdupes BuildRequires: java-devel +BuildRequires: javapackages-tools +BuildRequires: perl BuildRequires: servletapi5 -BuildRequires: fdupes BuildRequires: xalan-j2 PreReq: coreutils Requires: bsf -Requires: jpackage-utils >= 1.5 +Requires: javapackages-tools Url: http://www.beanshell.org/ -Group: Development/Libraries/Java BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,7 +72,6 @@ %package manual -License: LGPL-2.1+ Summary: Manual for bsh Group: Development/Libraries/Java @@ -85,7 +84,6 @@ %package javadoc -License: LGPL-2.1+ PreReq: coreutils Summary: Javadoc for bsh Group: Development/Libraries/Java @@ -99,7 +97,6 @@ %package demo -License: LGPL-2.1+ Summary: Demonstration and sample files for bsh Group: Development/Libraries/Java AutoReqProv: no @@ -150,14 +147,17 @@ install -m 644 dist/%{name}-util-%{version}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}-util-%{version}.jar (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} -%add_to_maven_depmap %{name} %{name}-bsf %{version} JPP %{name}-bsf + # poms -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom install -pm 644 %{SOURCE2} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsf.pom + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-bsf.pom + +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.beanshell:%{name} +%add_maven_depmap JPP-%{name}-bsf.pom %{name}-bsf.jar + # manual find docs -name ".cvswrappers" -exec rm -f {} \; find docs -name "*.xml" -exec rm -f {} \; @@ -167,8 +167,8 @@ (cd docs/manual && rm -rf html) (cd docs/manual && rm -rf xsl) # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # demo for i in `find tests -name \*.bsh`; do perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i @@ -236,21 +236,6 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc %fdupes ${RPM_BUILD_ROOT}/usr -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %defattr(-,root,root) %doc src/Changes.html src/License.txt src/README.txt @@ -260,10 +245,8 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name} %{_datadir}/%{name}/webapps -%{_datadir}/maven2 -%{_datadir}/maven2/poms -%{_datadir}/maven2/poms/* %{_mavendepmapfragdir} +%{_mavenpomdir}/* %exclude %{_datadir}/%{name}/tests %files manual @@ -272,7 +255,7 @@ %files javadoc %defattr(-,root,root) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %files demo %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
