Hello community, here is the log from the commit of package findbugs for openSUSE:Factory checked in at 2017-06-01 16:32:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/findbugs (Old) and /work/SRC/openSUSE:Factory/.findbugs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "findbugs" Thu Jun 1 16:32:19 2017 rev:23 rq:496733 version:1.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/findbugs/findbugs.changes 2015-08-27 08:56:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.findbugs.new/findbugs.changes 2017-06-01 16:32:20.298474184 +0200 @@ -1,0 +2,8 @@ +Fri May 19 11:56:38 UTC 2017 - [email protected] + +- New build dependency: javapackages-local +- Fixed requires +- Removed not needed build requirements +- Spec file cleaned + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ findbugs.spec ++++++ --- /var/tmp/diff_new_pack.TUYKn8/_old 2017-06-01 16:32:22.066224814 +0200 +++ /var/tmp/diff_new_pack.TUYKn8/_new 2017-06-01 16:32:22.070224250 +0200 @@ -1,9 +1,8 @@ # # spec file for package findbugs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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 @@ -18,10 +17,9 @@ # -%bcond_with bundled_jformatstring - %global _iconsdir %{_datadir}/icons/ - +%define asm_version 3.3 +%bcond_with bundled_jformatstring Name: findbugs Version: 1.3.9 Release: 0 @@ -29,7 +27,6 @@ License: LGPL-2.1+ Group: Development/Languages/Java Url: http://findbugs.sourceforge.net/ - Source0: http://download.sourceforge.net/findbugs/findbugs-%{version}-source-suse.tar.bz2 Source1: findbugs-ant Source2: findbugs-tools-README @@ -41,72 +38,56 @@ Source12: findbugs-48x48.png Source13: findbugs.desktop Source1000: README.manual - # This patch has not been submitted upstream, as it contains Fedora-specific # changes. It looks in /usr/share/java for jar files at both compile time and # run time, instead of in findbugs' lib directory. Patch0: findbugs-1.3.9-build.patch - # Build against ASM 3.3 instead of 3.1. Already changed upstream; see: # http://code.google.com/p/findbugs/source/detail?r=12605 # http://code.google.com/p/findbugs/source/detail?r=12606 Patch1: findbugs-asm-version.patch -%define asm_version 3.3 - # Updates the version information in POMs, as we don't have up to date POM's :( Patch2: findbugs-1.3.9-pom.patch - # Fedora-specific patch: use Fedora JAR filenames Patch3: findbugs-jar-filenames.patch - # Fedora-specific patch to cope with removal of Class-Path & Main-Class entries # from findbugs.jar manifest Patch4: findbugs-remove-classpath.patch - # Fedora-specific patch to allow FindBugs launcher scripts to be run from # /bin or /usr/bin (#848612) Patch5: findbugs-home.patch - -Requires(post): javapackages-tools -Requires(postun): javapackages-tools -Requires: dom4j -Requires: findbugs-bcel -Requires: jakarta-commons-lang >= 2.4 -Requires: java >= 1.6.0 -Requires: jaxen -Requires: jcip-annotations -Requires: objectweb-asm >= 3.0 -%if %without bundled_jformatstring -Requires: jformatstring -%endif -Requires: javapackages-tools -Requires: jsr-305 - BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit BuildRequires: desktop-file-utils BuildRequires: dom4j +BuildRequires: fdupes BuildRequires: findbugs-bcel +BuildRequires: hicolor-icon-theme BuildRequires: jakarta-commons-lang >= 2.4 BuildRequires: java-devel >= 1.6.0 +BuildRequires: javapackages-local +BuildRequires: javapackages-tools BuildRequires: jaxen BuildRequires: jcip-annotations BuildRequires: jdepend -%if %without bundled_jformatstring -BuildRequires: jformatstring -%endif -BuildRequires: fdupes -BuildRequires: javapackages-tools BuildRequires: jsr-305 BuildRequires: junit BuildRequires: objectweb-asm >= 3.0 -#FIXME: can't install buildroot with texlive-latex -#BuildRequires: texlive-latex BuildRequires: update-desktop-files -# owns /usr/share/icons/hicolor -BuildRequires: hicolor-icon-theme -BuildArch: noarch +Requires: dom4j +Requires: findbugs-bcel +Requires: jakarta-commons-lang >= 2.4 +Requires: java >= 1.6.0 +Requires: jaxen +Requires: jcip-annotations +Requires: jsr-305 +Requires: objectweb-asm >= 3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +%if %without bundled_jformatstring +BuildRequires: jformatstring +Requires: jformatstring +%endif %description FindBugs is a program to find bugs in Java programs. It looks for @@ -156,26 +137,26 @@ %patch4 -p1 %patch5 -p1 -%{_bindir}/find . -name "*.bat" | %{_bindir}/xargs -t %{__rm} +%{_bindir}/find . -name "*.bat" | %{_bindir}/xargs -t rm %if %with bundled_jformatstring # FIXME: (dwalluck): standalone source code is at # <https://jformatstring.dev.java.net/>, but using bundled source # for now -%{__unzip} -qq -d jFormatString lib/jFormatString.jar +unzip -qq -d jFormatString lib/jFormatString.jar pushd jFormatString/ -%{_bindir}/find -name "*.class" | %{_bindir}/xargs -t %{__rm} -%{javac} `%{_bindir}/find -name "*.java"` -%{jar} cfm ../lib/jFormatString.jar.no META-INF/MANIFEST.MF . +%{_bindir}/find -name "*.class" | %{_bindir}/xargs -t rm +%javac `%{_bindir}/find -name "*.java"` +%jar cfm ../lib/jFormatString.jar.no META-INF/MANIFEST.MF . popd -%{__rm} -r jFormatString/ +rm -r jFormatString/ %endif find -name "*.jar" \ %if %with bundled_jformatstring -and -not -name jFormatString.jar \ %endif - | %{_bindir}/xargs -t %{__rm} + | %{_bindir}/xargs -t rm # Use the system jcip-annotations instead of building it in rm -fr src/java5/net @@ -235,29 +216,29 @@ # Install the ant task mkdir -p %{buildroot}%{_javadir}/ant -cp -p lib/%{name}-ant.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}-%{version}.jar -ln -s ant-%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}.jar -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} +cp -p lib/%{name}-ant.jar %{buildroot}%{_javadir}/ant/ant-%{name}-%{version}.jar +ln -s ant-%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/ant-%{name}.jar +mkdir -p %{buildroot}%{_sysconfdir}/ant.d +cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.d/%{name} # Install the javadocs -mkdir -p $RPM_BUILD_ROOT%{_javadocdir} -cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir} +cp -a apiJavaDoc %{buildroot}%{_javadocdir}/%{name} # Install the scripts -mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_bindir} for f in $(find bin -maxdepth 1 -type f \! -name '*.bat'); do - cp -p $f $RPM_BUILD_ROOT%{_bindir} + cp -p $f %{buildroot}%{_bindir} done # Install the shared files -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -a etc plugin $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -a etc plugin %{buildroot}%{_datadir}/%{name} # Install poms -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} -cp findbugs.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom +mkdir -p %{buildroot}%{_mavenpomdir} +cp findbugs.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +cp annotations.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}-annotations.pom # Add depmaps echo add_maven_depmap JPP-%{name}.pom %{name}.jar
