Hello community, here is the log from the commit of package jmock for openSUSE:Factory checked in at 2013-09-11 13:38:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jmock (Old) and /work/SRC/openSUSE:Factory/.jmock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jmock" Changes: -------- --- /work/SRC/openSUSE:Factory/jmock/jmock.changes 2012-06-25 12:32:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jmock.new/jmock.changes 2013-09-11 13:38:28.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 10 11:58:59 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:06:05 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jmock.spec ++++++ --- /var/tmp/diff_new_pack.gd9ZNB/_old 2013-09-11 13:38:29.000000000 +0200 +++ /var/tmp/diff_new_pack.gd9ZNB/_new 2013-09-11 13:38:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jmock # -# 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 @@ -34,7 +34,7 @@ BuildArch: noarch BuildRequires: ant >= 1.6 BuildRequires: ant-junit -BuildRequires: jpackage-utils >= 1.7.2 +BuildRequires: javapackages-tools BuildRequires: junit >= 3.8.1 #BuildRequires: cglib >= 2.1.3 BuildRequires: asm >= 1.5.3 @@ -110,47 +110,36 @@ %install install -Dpm 644 build/%{name}-core-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}.jar install -pm 644 build/%{name}-cglib-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-cglib-%{version}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}-cglib.jar install -pm 644 build/%{name}-tests-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-tests-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} -%add_to_maven_depmap %{name} %{name}-cglib %{version} JPP %{name}-cglib + $RPM_BUILD_ROOT%{_javadir}/%{name}-tests.jar + # 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 -install -pm 644 %{SOURCE2} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-cglib.pom -# -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/javadoc-%{version}/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +#install -pm 644 %{SOURCE2} \ +# $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-cglib.pom +%add_maven_depmap + +# +install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr build/javadoc-%{version}/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} cp -pr examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %defattr(0644,root,root,0755) %doc LICENSE.txt overview.html %{_javadir}/*.jar -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files demo -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
