[Jpackage-commits] rpms/free/slf4j slf4j-1.5.6-integration-tests-current-only.patch, NONE, 1.1 slf4j-component-info.xml, NONE, 1.1 slf4j-jpp-depmap.xml, 1.2, 1.3 slf4j.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Wed Feb 11 00:43:49 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/slf4j
In directory ryu.zarb.org:/tmp/PtIZRGt5mD/rpms/free/slf4j

Modified Files:
	slf4j-jpp-depmap.xml slf4j.spec 
Added Files:
	slf4j-1.5.6-integration-tests-current-only.patch 
	slf4j-component-info.xml 
Log Message:
1.5.6-1.jpp6

Index: slf4j-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/slf4j/slf4j-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** slf4j-jpp-depmap.xml	6 Jul 2008 14:28:45 -0000	1.2
--- slf4j-jpp-depmap.xml	10 Feb 2009 23:43:47 -0000	1.3
***************
*** 12,15 ****
     </jpp>
   </dependency>
! 
  </dependencies>
--- 12,38 ----
     </jpp>
   </dependency>
!  <dependency>
!    <maven>
!      <groupId>javassist</groupId>
!      <artifactId>javassist</artifactId>
!      <version>3.4.GA</version>
!    </maven>
!    <jpp>
!      <groupId>JPP</groupId>
!      <artifactId>javassist</artifactId>
!      <version>3.9.0</version>
!    </jpp>
!  </dependency>
!  <dependency>
!    <maven>
!      <groupId>ant</groupId>
!      <artifactId>ant-junit</artifactId>
!      <version>1.6.5</version>
!    </maven>
!    <jpp>
!      <groupId>JPP/ant</groupId>
!      <artifactId>ant-junit</artifactId>
!      <version>1.7.1</version>
!    </jpp>
!  </dependency>
  </dependencies>

Index: slf4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/slf4j/slf4j.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** slf4j.spec	18 Jul 2008 16:59:07 -0000	1.3
--- slf4j.spec	10 Feb 2009 23:43:47 -0000	1.4
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,51 ****
  #
  
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section         free
  
- Summary:        Simple Logging Facade for Java
  Name:           slf4j
! Version:        1.5.2
! Release:        2%{dist}
  Epoch:          0
  Group:          System/Logging
  License:        MIT
  URL:            http://www.slf4j.org/
! Source0:        http://www.slf4j.org/dist/slf4j-1.5.2.tar.gz
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
  Patch0:         %{name}-pom_xml.patch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  maven2 >= 2.0.7
--- 29,68 ----
  #
  
+ %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+ %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+ %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+ %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+ 
+ %bcond_without repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/org/slf4j/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section         free
  
  Name:           slf4j
! Version:        1.5.6
! Release:        1%{?dist}
  Epoch:          0
+ Summary:        Simple Logging Facade for Java
  Group:          System/Logging
  License:        MIT
  URL:            http://www.slf4j.org/
! Source0:        http://www.slf4j.org/dist/slf4j-1.5.6.tar.gz
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
+ Source3:        slf4j-component-info.xml
  Patch0:         %{name}-pom_xml.patch
+ Patch1:         slf4j-1.5.6-integration-tests-current-only.patch
+ Requires(post): jpackage-utils >= 0:1.7.5
+ Requires(postun): jpackage-utils >= 0:1.7.5
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
+ BuildRequires:  ant-junit >= 0:1.6.5
+ BuildRequires:  javassist >= 0:3.4
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  maven2 >= 2.0.7
***************
*** 61,67 ****
  BuildRequires:  log4j
  BuildRequires:  jakarta-commons-logging
- 
- Requires(post): jpackage-utils >= 0:1.7.5
- Requires(postun): jpackage-utils >= 0:1.7.5
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
--- 78,81 ----
***************
*** 77,80 ****
--- 91,95 ----
  allows for a gradual migration path away from
  Jakarta Commons Logging (JCL). 
+ 
  Logging API implementations can either choose to implement the
  SLF4J interfaces directly, e.g. NLOG4J or SimpleLogger. Alternatively,
***************
*** 96,104 ****
  %{summary}.
  
  %prep
  %setup -q
  find . -name "*.jar" | xargs rm
  cp -p %{SOURCE1} settings.xml
- %patch0 -b .sav0
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
--- 111,131 ----
  %{summary}.
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
+ 
  %prep
  %setup -q
+ %patch0 -p0
+ %patch1 -p1
  find . -name "*.jar" | xargs rm
  cp -p %{SOURCE1} settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
***************
*** 116,119 ****
--- 143,149 ----
  ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-simple.jar
  ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-log4j12.jar
+ ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-nop.jar
+ 
+ %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'
  
  %build
***************
*** 204,207 ****
--- 234,253 ----
  install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
  
+ %if %with repolib
+ %{__install} -d -m 755 %{buildroot}%{repodir}
+ %{__install} -d -m 755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 644 %{SOURCE3} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{PATCH1} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}/api-%{version}.jar %{buildroot}%{repodirlib}/slf4j-api.jar
+ %endif
+ 
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
***************
*** 250,254 ****
--- 296,312 ----
  %{_docdir}/%{name}-%{version}/site
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Tue Feb 18 2009 David Walluck <dwalluck at redhat.com> 0:1.5.6-1
+ - 1.5.6
+ - add repolib
+ - fix file eol
+ - fix Release tag
+ 
  * Fri Jul 18 2008 David Walluck <dwalluck at redhat.com> 0:1.5.2-2
  - use excalibur for avalon

--- NEW FILE: slf4j-1.5.6-integration-tests-current-only.patch ---
--- slf4j-1.5.6/integration/build.xml.orig	2009-02-10 17:25:55.788660241 -0500
+++ slf4j-1.5.6/integration/build.xml	2009-02-10 17:28:23.628658386 -0500
@@ -51,19 +51,23 @@
 	</target>
 
 	<target name="testMismatch">
+<!--
 		<junit printsummary="yes" fork="no" haltonfailure="yes">
 			<classpath refid="pathIncompatible" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionMismatchTest" />
 		</junit>
+-->
 	</target>
 		
 	<target name="testPre155">
+<!--
 		<junit printsummary="yes" fork="no" haltonfailure="yes">
 			<classpath refid="path150" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" name="org.slf4j.Pre155VersionTest" />
 		</junit>
+-->
 	</target>
 
 	<target name="testMatch">
@@ -74,4 +78,4 @@
 		</junit>
 	</target>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: slf4j-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="org/slf4j"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="slf4j-api.jar"/>


    <export>
      <include input="slf4j-api.jar"/>

    </export>
  </component>
</project>




More information about the JPackage-commits mailing list