rpms/slf4j/devel slf4j-pom_xml.patch, 1.1, 1.2 slf4j.spec, 1.2, 1.3 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/slf4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20028/devel

Modified Files:
	slf4j-pom_xml.patch slf4j.spec sources .cvsignore 
Log Message:
- Update to upstream 1.5.10.

slf4j-pom_xml.patch:
 pom.xml |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Index: slf4j-pom_xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/slf4j/devel/slf4j-pom_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- slf4j-pom_xml.patch	3 Sep 2009 21:05:13 -0000	1.1
+++ slf4j-pom_xml.patch	10 Feb 2010 11:54:10 -0000	1.2
@@ -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 @@
+     <module>jcl104-over-slf4j</module>
+     <module>log4j-over-slf4j</module>
+     <module>jul-to-slf4j</module>
+-    <module>integration</module>
++    <!--module>integration</module-->
+     <module>slf4j-site</module>
+     <module>slf4j-migrator</module>
+   </modules>
+@@ -121,9 +121,9 @@
  					</excludes>
  				</configuration>
  			</plugin>		
@@ -13,7 +22,7 @@
          <artifactId>maven-source-plugin</artifactId>
          <executions>
            <execution>
-@@ -111,6 +111,7 @@
+@@ -134,6 +134,7 @@
            </execution>
          </executions>
        </plugin>
@@ -21,7 +30,7 @@
  
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
-@@ -283,4 +284,4 @@
+@@ -328,4 +329,4 @@
  
  	</distributionManagement>
    


Index: slf4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slf4j/devel/slf4j.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- slf4j.spec	3 Sep 2009 21:20:27 -0000	1.2
+++ slf4j.spec	10 Feb 2010 11:54:10 -0000	1.3
@@ -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/repos
 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 <akurtako at redhat.com> 0:1.5.10-1
+- Update to upstream 1.5.10.
+
 * Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.8-5
 - Skip tests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slf4j/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Sep 2009 21:05:14 -0000	1.2
+++ sources	10 Feb 2010 11:54:10 -0000	1.3
@@ -1 +1 @@
-a50d4b793d2e7c6c1e901f364a74a10f  slf4j-1.5.8.tar.gz
+9115b86cce99b229333936700ac387b3  slf4j-1.5.10.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slf4j/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Sep 2009 21:05:14 -0000	1.2
+++ .cvsignore	10 Feb 2010 11:54:10 -0000	1.3
@@ -1 +1,2 @@
 slf4j-1.5.8.tar.gz
+slf4j-1.5.10.tar.gz