diff --git a/build.xml.tar.bz2 b/build.xml.tar.bz2 index e3e6d76..38cd9ed 100644 --- a/build.xml.tar.bz2 +++ b/build.xml.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07b1ebf12cf4be908708fae54f7003cf8304aed7eefa81843db315f88eb3383f -size 6855 +oid sha256:8c2fc6bfc4c8c259350c803ff6b978dfb0b13c56af96b6e69e1c49f692bf1996 +size 317440 diff --git a/slf4j-1.6.1.tar.gz b/slf4j-1.6.1.tar.gz deleted file mode 100644 index 4200906..0000000 --- a/slf4j-1.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62cd3614c84315304969f5d42a029d3dcc80017e1588f3b4357f01b1f50c4955 -size 1708903 diff --git a/slf4j-1.7.12.tar.gz b/slf4j-1.7.12.tar.gz new file mode 100644 index 0000000..f237458 --- /dev/null +++ b/slf4j-1.7.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee93f7baa5d0e3db5fc130f5216750059992bfa0e5cb618a808428edf2fc28a1 +size 3067708 diff --git a/slf4j-pom_xml.patch b/slf4j-pom_xml.patch deleted file mode 100644 index e363d61..0000000 --- a/slf4j-pom_xml.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- pom.xml.sav 2010-07-05 23:24:16.000000000 +0300 -+++ pom.xml 2011-01-25 22:34:34.761335409 +0200 -@@ -44,7 +44,7 @@ - jcl-over-slf4j - log4j-over-slf4j - jul-to-slf4j -- integration -+ - slf4j-site - slf4j-migrator - -@@ -121,9 +121,9 @@ - - - -- -- -- org.apache.maven.plugins -+ - - - org.apache.maven.plugins -@@ -349,4 +350,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/slf4j.changes b/slf4j.changes index 63edbbc..b7b825b 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 23 08:56:21 UTC 2015 - dmacvicar@suse.de + +- update to version 1.7.12 + ------------------------------------------------------------------- Wed Mar 18 09:46:20 UTC 2015 - tchvatal@suse.com diff --git a/slf4j.spec b/slf4j.spec index cb438c9..c39bf98 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -19,15 +19,14 @@ Name: slf4j -Version: 1.6.1 -Release: 0 +Version: 1.7.12 +Release: 0 Summary: Simple Logging Facade for Java License: MIT Group: Development/Libraries/Java Url: http://www.slf4j.org/ Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz Source1: build.xml.tar.bz2 -Patch0: %{name}-pom_xml.patch Patch1: build-remove-slf4j_api-binder.patch Requires(post): javapackages-tools @@ -81,7 +80,6 @@ Manual for %{name}. %prep %setup -q tar xf %{SOURCE1} -%patch0 -p0 -b .sav %patch1 -p1 find . -name "*.jar" | xargs rm @@ -106,6 +104,7 @@ export CLASSPATH=$(build-classpath log4j \ javassist-3.14.0 \ cal10n) export CLASSPATH=$CLASSPATH:$(pwd)/slf4j-api/target/slf4j-api-%{version}.jar +export MAVEN_REPO_LOCAL=$(pwd)/.m2 ant -Dmaven2.jpp.mode=true \ -Dmaven.test.skip=true \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \