diff --git a/.cvsignore b/.cvsignore index aa5246c..a384e3b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ slf4j-1.5.8.tar.gz +slf4j-1.5.10.tar.gz diff --git a/slf4j-pom_xml.patch b/slf4j-pom_xml.patch index 8090feb..20582ae 100644 --- a/slf4j-pom_xml.patch +++ b/slf4j-pom_xml.patch @@ -1,6 +1,15 @@ ---- pom.xml.sav 2008-07-06 13:50:34.000000000 +0200 -+++ pom.xml 2008-07-06 13:51:24.000000000 +0200 -@@ -98,9 +98,9 @@ +--- pom.xml.sav 2009-12-03 01:15:37.000000000 +0200 ++++ pom.xml 2010-02-02 22:46:30.664328057 +0200 +@@ -44,7 +44,7 @@ + jcl104-over-slf4j + log4j-over-slf4j + jul-to-slf4j +- integration ++ + slf4j-site + slf4j-migrator + +@@ -121,9 +121,9 @@ @@ -13,7 +22,7 @@ maven-source-plugin -@@ -111,6 +111,7 @@ +@@ -134,6 +134,7 @@ @@ -21,7 +30,7 @@ org.apache.maven.plugins -@@ -283,4 +284,4 @@ +@@ -328,4 +329,4 @@ diff --git a/slf4j.spec b/slf4j.spec index 6b6ac55..008b076 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -29,14 +29,14 @@ # Name: slf4j -Version: 1.5.8 -Release: 5%{?dist} +Version: 1.5.10 +Release: 1%{?dist} Epoch: 0 Summary: Simple Logging Facade for Java Group: Development/Libraries License: MIT URL: http://www.slf4j.org/ -Source0: http://www.slf4j.org/dist/slf4j-1.5.8.tar.gz +Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz Source1: %{name}-settings.xml Source2: %{name}-jpp-depmap.xml Source3: slf4j-component-info.xml @@ -96,7 +96,7 @@ Manual for %{name}. %prep %setup -q -%patch0 -p0 +%patch0 -p0 -b .sav %patch1 -p1 find . -name "*.jar" | xargs rm cp -p %{SOURCE1} settings.xml @@ -134,6 +134,7 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mvn-jpp \ -e \ -s $(pwd)/settings.xml \ + -P skipTests \ -Dmaven2.jpp.mode=true \ -Dmaven2.jpp.depmap.file=%{SOURCE2} \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ @@ -260,6 +261,9 @@ rm -rf $RPM_BUILD_ROOT %{_docdir}/%{name}-%{version}/site %changelog +* Wed Feb 10 2010 Alexander Kurtakov 0:1.5.10-1 +- Update to upstream 1.5.10. + * Fri Sep 4 2009 Alexander Kurtakov 0:1.5.8-5 - Skip tests. diff --git a/sources b/sources index 53327ee..2aec328 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a50d4b793d2e7c6c1e901f364a74a10f slf4j-1.5.8.tar.gz +9115b86cce99b229333936700ac387b3 slf4j-1.5.10.tar.gz