Hello community, here is the log from the commit of package jformatstring for openSUSE:Factory checked in at 2014-07-11 20:05:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jformatstring (Old) and /work/SRC/openSUSE:Factory/.jformatstring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jformatstring" Changes: -------- --- /work/SRC/openSUSE:Factory/jformatstring/jformatstring.changes 2014-06-30 22:49:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jformatstring.new/jformatstring.changes 2014-07-11 20:05:47.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 7 15:04:27 UTC 2014 - tchva...@suse.com + +- Junit dep instead of junit4. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jformatstring.spec ++++++ --- /var/tmp/diff_new_pack.dQM974/_old 2014-07-11 20:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.dQM974/_new 2014-07-11 20:05:47.000000000 +0200 @@ -1,9 +1,8 @@ # # spec file for package jformatstring # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, 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 @@ -16,41 +15,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# + + %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} - %bcond_with gcj_support - %if %with gcj_support %define gcj_support 1 %else %define gcj_support 0 %endif - Name: jformatstring Version: 0 -Release: 0.3.20081016svn%{?dist} +Release: 0 Summary: Java library for format string checks License: GPL-2.0 Group: Development/Libraries/Java Url: https://jformatstring.dev.java.net/ # svn -q export -r 8 https://jformatstring.dev.java.net/svn/jformatstring/trunk/jFormatString jformatstring-0 --username guest --password guest && tar cjf jformatstring-0.tar.bz2 jformatstring-0 Source0: jformatstring-0.tar.bz2 -Provides: jFormatString = %{version}-%{release} -Obsoletes: jFormatString < %{version}-%{release} BuildRequires: ant BuildRequires: java-devel BuildRequires: javapackages-tools -BuildRequires: junit4 +BuildRequires: junit +Provides: jFormatString = %{version}-%{release} +Obsoletes: jFormatString < %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{gcj_support} BuildRequires: java-gcj-compat-devel %else BuildArch: noarch %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This project is derived from Sun's implementation of java.util.Formatter. It @@ -82,42 +79,37 @@ mkdir lib pushd lib -%{__ln_s} $(build-classpath junit4) +ln -s $(build-classpath junit) popd %build export CLASSPATH= export OPT_JAR_LIST=: -%{ant} -%{javadoc} -d javadoc \ - -source 1.5 \ +ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 +javadoc -d javadoc \ -sourcepath src/java \ - -classpath build/classes:$(build-classpath junit4) \ + -classpath build/classes:$(build-classpath junit) \ -link %{_javadocdir}/java \ edu.umd.cs.findbugs.formatStringChecker %install -%{__rm} -rf %{buildroot} -%{__mkdir_p} %{buildroot}%{_javadir} -%{__cp} -p build/jFormatString.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jFormatString-%{version}.jar -%{__ln_s} jFormatString-%{version}.jar %{buildroot}%{_javadir}/jFormatString.jar - -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/jFormatString-%{version} -%{__ln_s} jFormatString-%{version} %{buildroot}%{_javadocdir}/jFormatString +mkdir -p %{buildroot}%{_javadir} +cp -p build/jFormatString.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jFormatString-%{version}.jar +ln -s jFormatString-%{version}.jar %{buildroot}%{_javadir}/jFormatString.jar + +mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jFormatString-%{version} +ln -s jFormatString-%{version} %{buildroot}%{_javadocdir}/jFormatString %if %{gcj_support} %{_bindir}/aot-compile-rpm %endif -%clean -%{__rm} -rf %{buildroot} - %if %{gcj_support} %post if [ -x %{_bindir}/rebuild-gcj-db ]; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
