Hello community, here is the log from the commit of package velocity for openSUSE:Factory checked in at 2013-09-12 13:26:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/velocity (Old) and /work/SRC/openSUSE:Factory/.velocity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velocity" Changes: -------- --- /work/SRC/openSUSE:Factory/velocity/velocity.changes 2012-12-19 13:35:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2013-09-12 13:26:37.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 11 08:47:42 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:06:25 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velocity.spec ++++++ --- /var/tmp/diff_new_pack.p1zshh/_old 2013-09-12 13:26:38.000000000 +0200 +++ /var/tmp/diff_new_pack.p1zshh/_new 2013-09-12 13:26:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package velocity # -# 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 @@ -16,8 +16,6 @@ # -%define section free - Name: velocity Version: 1.5 Release: 0 @@ -48,8 +46,8 @@ BuildRequires: commons-lang BuildRequires: hsqldb BuildRequires: java-devel >= 1.6.0 +BuildRequires: javapackages-tools BuildRequires: jdom >= 1.0-1 -BuildRequires: jpackage-utils >= 1.7.4 BuildRequires: junit BuildRequires: log4j >= 1.1 BuildRequires: oro @@ -57,8 +55,8 @@ BuildRequires: fdupes BuildRequires: servletapi4 BuildRequires: werken-xpath -Requires(post): jpackage-utils >= 1.7.4 -Requires(postun): jpackage-utils >= 1.7.4 +Requires(post): javapackages-tools +Requires(postun): javapackages-tools BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -208,36 +206,27 @@ %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -%add_to_maven_depmap org.apache.velocity velocity %{version} JPP %{name} -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # pom -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 +%add_maven_depmap + # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf docs/api # data install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name} %fdupes -s %{buildroot} -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %defattr(0644,root,root,0755) %doc LICENSE NOTICE README.txt %{_javadir}/*.jar -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir} %files manual @@ -246,7 +235,7 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %files demo %defattr(0644,root,root,0755) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
