commit slf4j for openSUSE:Factory
Hello community, here is the log from the commit of package slf4j for openSUSE:Factory checked in at 2017-05-31 13:30:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slf4j (Old) and /work/SRC/openSUSE:Factory/.slf4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "slf4j" Wed May 31 13:30:45 2017 rev:12 rq:496822 version:1.7.12 Changes: -------- --- /work/SRC/openSUSE:Factory/slf4j/slf4j.changes 2015-11-12 19:35:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.slf4j.new/slf4j.changes 2017-05-31 13:30:49.107258564 +0200 @@ -1,0 +2,5 @@ +Fri May 19 16:49:25 UTC 2017 - tchvatal@suse.com + +- Remove some not-needed deps + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slf4j.spec ++++++ --- /var/tmp/diff_new_pack.wByqio/_old 2017-05-31 13:30:50.071122703 +0200 +++ /var/tmp/diff_new_pack.wByqio/_new 2017-05-31 13:30:50.075122140 +0200 @@ -1,9 +1,8 @@ # # spec file for package slf4j # -# 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 @@ -28,9 +27,6 @@ Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz Source1: build.xml.tar.bz2 Patch1: build-remove-slf4j_api-binder.patch - -Requires(post): javapackages-tools -Requires(postun): javapackages-tools BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit >= 1.6.5 BuildRequires: apache-commons-lang @@ -43,12 +39,11 @@ BuildRequires: log4j-mini Requires: cal10n Requires: java -Requires: javapackages-tools # this is ugly hack, which creates package wich requires the same, # however slf4j is not splitted between -api and -impl, but pom files are modeled as it was Provides: osgi(slf4j.api) -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The Simple Logging Facade for Java or (SLF4J) is intended to serve @@ -65,7 +60,6 @@ %package javadoc Summary: Javadoc for %{name} Group: Documentation/HTML -Requires: javapackages-tools %description javadoc API documentation for %{name}. @@ -86,7 +80,7 @@ sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \ - %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g' + %{_bindir}/xargs -t perl -pi -e 's/\r$//g' # The general pattern is that the API package exports API classes and does # # not require impl classes. slf4j was breaking that causing "A cycle was @@ -112,40 +106,40 @@ %install # jars -install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 0755 %{buildroot}%{_javadir}/%{name} install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-over-slf4j.jar + %{buildroot}%{_javadir}/%{name}/jcl-over-slf4j.jar install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jul-to-slf4j.jar + %{buildroot}%{_javadir}/%{name}/jul-to-slf4j.jar install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j-over-slf4j.jar + %{buildroot}%{_javadir}/%{name}/log4j-over-slf4j.jar install -m 644 slf4j-api/target/%{name}-api-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/api.jar + %{buildroot}%{_javadir}/%{name}/api.jar install -m 644 slf4j-ext/target/%{name}-ext-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/ext.jar + %{buildroot}%{_javadir}/%{name}/ext.jar install -m 644 slf4j-jcl/target/%{name}-jcl-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl.jar + %{buildroot}%{_javadir}/%{name}/jcl.jar install -m 644 slf4j-jdk14/target/%{name}-jdk14-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jdk14.jar + %{buildroot}%{_javadir}/%{name}/jdk14.jar install -m 644 slf4j-log4j12/target/%{name}-log4j12-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j12.jar + %{buildroot}%{_javadir}/%{name}/log4j12.jar install -m 644 slf4j-migrator/target/%{name}-migrator-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/migrator.jar + %{buildroot}%{_javadir}/%{name}/migrator.jar install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/nop.jar + %{buildroot}%{_javadir}/%{name}/nop.jar install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/simple.jar + %{buildroot}%{_javadir}/%{name}/simple.jar # manual -install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} rm -f target/site/.htaccess -cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ -install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ +cp -pr target/site %{buildroot}%{_docdir}/%{name}-%{version}/ +install -m 644 LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/ # javadoc -install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/ +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/* %{buildroot}%{_javadocdir}/%{name}/ rm -rf target/site %files
participants (1)
-
root@hilbert.suse.de