[Jpackage-commits] rpms/free/slf4j slf4j.spec,1.7,1.8

jpackage jpackage at ryu.zarb.org
Tue Dec 21 10:21:50 CET 2010


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

Modified Files:
	slf4j.spec 
Log Message:
1.6.1-2.jpp6

Index: slf4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/slf4j/slf4j.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** slf4j.spec	21 Dec 2010 09:05:03 -0000	1.7
--- slf4j.spec	21 Dec 2010 09:21:48 -0000	1.8
***************
*** 34,38 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without bootstrap
  %bcond_with gcj_support
  %bcond_without repolib
--- 34,38 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with bootstrap
  %bcond_with gcj_support
  %bcond_without repolib
***************
*** 48,56 ****
  %endif
  
  %define section free
  
  Name:           slf4j
  Version:        1.6.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Simple Logging Facade for Java
--- 48,58 ----
  %endif
  
+ %global previous_version 1.5.8
+ 
  %define section free
  
  Name:           slf4j
  Version:        1.6.1
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Simple Logging Facade for Java
***************
*** 215,219 ****
  cp -p maven2-brew/org/slf4j/slf4j-site/*/slf4j-site-*-sources.jar %{buildroot}%{_javadir}/%{name}/
  # FIXME
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-1.5.8*; do %{__mv} ${jar} `echo $jar | sed "s|-1.5.8|-%{version}|g"`; done)
  (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar | sed "s|-%{version}||g"`; done)
  
--- 217,221 ----
  cp -p maven2-brew/org/slf4j/slf4j-site/*/slf4j-site-*-sources.jar %{buildroot}%{_javadir}/%{name}/
  # FIXME
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{previous_version}*; do %{__mv} ${jar} `echo $jar | sed "s|-%{previous_version}|-%{version}|g"`; done)
  (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar | sed "s|-%{version}||g"`; done)
  
***************
*** 329,332 ****
--- 331,335 ----
  %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
  %dir %{_javadir}*/%{name}
+ %exclude %dir %{_javadocdir}/%{name}
  %{_javadir}*/%{name}/integration-%{version}-sources.jar
  %{_javadir}*/%{name}/integration-%{version}.jar
***************
*** 362,371 ****
  %{_javadir}*/%{name}/slf4j-jcl-%{version}.jar
  %{_javadir}*/%{name}/slf4j-jcl-sources.jar
  %if %without bootstrap
  %{_javadir}*/%{name}/slf4j-jdk14-%{version}-sources.jar
  %{_javadir}*/%{name}/slf4j-jdk14-%{version}.jar
  %{_javadir}*/%{name}/slf4j-jdk14-sources.jar
  %endif
- %{_javadir}*/%{name}/slf4j-jcl.jar
  %{_javadir}*/%{name}/slf4j-log4j12-%{version}-sources.jar
  %{_javadir}*/%{name}/slf4j-log4j12-%{version}.jar
--- 365,375 ----
  %{_javadir}*/%{name}/slf4j-jcl-%{version}.jar
  %{_javadir}*/%{name}/slf4j-jcl-sources.jar
+ %{_javadir}*/%{name}/slf4j-jcl.jar
  %if %without bootstrap
  %{_javadir}*/%{name}/slf4j-jdk14-%{version}-sources.jar
  %{_javadir}*/%{name}/slf4j-jdk14-%{version}.jar
  %{_javadir}*/%{name}/slf4j-jdk14-sources.jar
+ %{_javadir}*/%{name}/slf4j-jdk14.jar
  %endif
  %{_javadir}*/%{name}/slf4j-log4j12-%{version}-sources.jar
  %{_javadir}*/%{name}/slf4j-log4j12-%{version}.jar
***************
*** 433,436 ****
--- 437,443 ----
  
  %changelog
+ * Tue Dec 21 2010 David Walluck <dwalluck at redhat.com> 0:1.6.1-2
+ - build as non-bootstrap
+ 
  * Tue Dec 21 2010 David Walluck <dwalluck at redhat.com> 0:1.6.1-1
  - 1.6.1




More information about the JPackage-commits mailing list