Hello community, here is the log from the commit of package tanukiwrapper for openSUSE:Factory checked in at 2014-07-11 20:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tanukiwrapper (Old) and /work/SRC/openSUSE:Factory/.tanukiwrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tanukiwrapper" Changes: -------- --- /work/SRC/openSUSE:Factory/tanukiwrapper/tanukiwrapper.changes 2013-09-14 20:30:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tanukiwrapper.new/tanukiwrapper.changes 2014-07-11 20:06:05.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 8 10:52:25 UTC 2014 - tchvatal@suse.com + +- Do not depend on ant-nodeps. + +------------------------------------------------------------------- +Mon Jul 7 15:07:30 UTC 2014 - tchvatal@suse.com + +- Use junit not junit4 dep. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tanukiwrapper.spec ++++++ --- /var/tmp/diff_new_pack.9TM0nk/_old 2014-07-11 20:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.9TM0nk/_new 2014-07-11 20:06:06.000000000 +0200 @@ -1,9 +1,8 @@ # # spec file for package tanukiwrapper # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2006, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +17,6 @@ # -%define section free - Name: tanukiwrapper Version: 3.2.3 Release: 0 @@ -39,11 +36,10 @@ Patch6: %{name}-Makefile-aarch64.patch BuildRequires: ant >= 1.6.1 BuildRequires: ant-junit -BuildRequires: ant-nodeps >= 1.6.1 BuildRequires: glibc-devel BuildRequires: java-devel BuildRequires: javapackages-tools -BuildRequires: junit4 +BuildRequires: junit BuildRequires: perl BuildRequires: unzip BuildRequires: xerces-j2 @@ -102,49 +98,45 @@ %patch3 %patch4 %patch6 -p1 -find . -name "*.jar" -exec %__rm -f {} \; -%__perl -p -i -e 's/\r//' doc/AUTHORS -%__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile* -%__perl -p -e \ +find . -name "*.jar" -exec rm -f {} \; +perl -p -i -e 's/\r//' doc/AUTHORS +perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile* +perl -p -e \ 's|=\.\./lib/wrapper\.jar$|=%{_javadir}/%{name}.jar| ; s|=\.\./lib$|=%{_libdir}|' \ src/conf/wrapper.conf.in > wrapper.conf.sample -%__perl -p -e \ +perl -p -e \ 's|"\./wrapper"|"%{_sbindir}/%{name}"| ; s|"\.\./conf/wrapper\.conf"|"/path/to/wrapper.conf"|' \ src/bin/sh.script.in > script.sh.sample %build -export CLASSPATH=$(build-classpath ant junit4 xerces-j2 xml-commons-apis) +export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis) %ifarch x86_64 ia64 ppc64 sparc64 s390x aarch64 bits=64 %else bits=32 %endif -%ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \ +ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \ main jdoc %install -%__rm -rf %{buildroot} # jar -%__mkdir_p %{buildroot}%{_javadir} -%__install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar +mkdir -p %{buildroot}%{_javadir} +install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar # jni -%__install -d -m 755 %{buildroot}%{_libdir} -%__install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir} +install -d -m 755 %{buildroot}%{_libdir} +install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir} # commands -%__install -d -m 755 %{buildroot}%{_sbindir} -%__install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name} +install -d -m 755 %{buildroot}%{_sbindir} +install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name} # javadoc -%__install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -%__cp -a jdoc/* %{buildroot}%{_javadocdir}/%{name} - -%clean -%__rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -a jdoc/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org