Hello community, here is the log from the commit of package junit4 for openSUSE:Factory checked in at 2013-09-11 13:38:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/junit4 (Old) and /work/SRC/openSUSE:Factory/.junit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "junit4" Changes: -------- --- /work/SRC/openSUSE:Factory/junit4/junit4.changes 2012-08-31 09:35:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.junit4.new/junit4.changes 2013-09-11 13:38:23.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 10 12:56:57 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:06:08 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ junit4.spec ++++++ --- /var/tmp/diff_new_pack.xsNrcv/_old 2013-09-11 13:38:24.000000000 +0200 +++ /var/tmp/diff_new_pack.xsNrcv/_new 2013-09-11 13:38:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package junit4 # -# 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 @@ -30,14 +30,14 @@ Source1: junit-4.10.pom # backport cb69050a45f1688ad8c6e817cc511cfa67401f63, that fixes an occasional failure in ParentRunnerTest.useChildHarvester Patch1: jdk7-testfailure.patch -Requires(post): jpackage-utils >= 1.7.4 -Requires(postun): jpackage-utils >= 1.7.4 +Requires(post): javapackages-tools +Requires(postun): javapackages-tools Requires: hamcrest Requires: java >= 1.5.0 BuildRequires: ant BuildRequires: hamcrest BuildRequires: java-devel >= 1.5.0 -BuildRequires: jpackage-utils >= 1.7.4 +BuildRequires: javapackages-tools BuildRequires: xz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -105,39 +105,28 @@ %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 junit%{version}/junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -pushd $RPM_BUILD_ROOT%{_javadir} -ln -sf %{name}-%{version}.jar %{name}.jar -popd +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 junit%{version}/junit-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar + # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap junit junit %{version} JPP %{name} +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap + # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr junit%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} + # demo -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is +install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is # part of package name -cp -pr junit%{version}/junit/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +cp -pr junit%{version}/junit/* %{buildroot}%{_datadir}/%{name}/demo/junit %files %defattr(0644,root,root,0755) %doc cpl-v10.html README.html %{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar -%{_datadir}/maven2/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* %files demo @@ -146,7 +135,6 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files manual -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
