[Jpackage-commits] dist/apache-commons-logging/JPP-6 apache-commons-logging.spec, 1.7, 1.8

David Walluck david at ryu.zarb.org
Fri Oct 21 20:33:22 CEST 2011


Update of /home/projects/jpackage/cvs/dist/apache-commons-logging/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv1181

Modified Files:
	apache-commons-logging.spec 
Log Message:
- bump Release (for mdv)
- remove GCJ support


Index: apache-commons-logging.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-logging/JPP-6/apache-commons-logging.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** apache-commons-logging.spec	8 Dec 2010 22:58:11 -0000	1.7
--- apache-commons-logging.spec	21 Oct 2011 18:33:20 -0000	1.8
***************
*** 1,3 ****
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 29,41 ****
  #
  
- %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_with bootstrap
- %bcond_with gcj_support
  %bcond_without maven
! %bcond_without repolib
  
  %define repodir %{_javadir}/repository.jboss.com/apache-%{base_name}/%{version}-brew
--- 29,35 ----
  #
  
  %bcond_with bootstrap
  %bcond_without maven
! %bcond_with repolib
  
  %define repodir %{_javadir}/repository.jboss.com/apache-%{base_name}/%{version}-brew
***************
*** 44,60 ****
  %define repodirsrc %{repodir}/src
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
  
- %define base_name  logging
- %define short_name commons-%{base_name}
  %define section    free
  
  Name:           apache-%{short_name}
  Version:        1.1.1
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Apache Commons Logging Package
--- 38,49 ----
  %define repodirsrc %{repodir}/src
  
! %global base_name  logging
! %global short_name commons-%{base_name}
  
  %define section    free
  
  Name:           apache-%{short_name}
  Version:        1.1.1
! Release:        17%{?dist}
  Epoch:          0
  Summary:        Apache Commons Logging Package
***************
*** 62,67 ****
  Group:          Development/Libraries/Java
  URL:            http://commons.apache.org/logging/
! Source0:        %{short_name}-%{version}-src.tar.gz
! #wget http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.1.1-src.tar.gz
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
--- 51,55 ----
  Group:          Development/Libraries/Java
  URL:            http://commons.apache.org/logging/
! Source0:        http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.1.1-src.tar.gz
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
***************
*** 101,107 ****
  BuildRequires:  log4j
  BuildRequires:  servlet_2_5_api
- %if ! %{gcj_support}
  BuildArch:      noarch
- %endif
  Provides:       jakarta-%{short_name} = %{epoch}:%{version}-%{release}
  Obsoletes:      jakarta-%{short_name} < %{epoch}:%{version}-%{release}
--- 89,93 ----
***************
*** 114,120 ****
  Requires:       java >= 0:1.6.0
  Requires:       servlet_2_5_api
- %if %{gcj_support}
- BuildRequires:    java-gcj-compat-devel
- %endif
  
  %description
--- 100,103 ----
***************
*** 211,216 ****
  
  %else
! 
! ant \
          -Djunit.jar=$(build-classpath junit) \
          -Dlogkit.jar=$(build-classpath excalibur/avalon-logkit) \
--- 194,198 ----
  
  %else
! %{ant} \
          -Djunit.jar=$(build-classpath junit) \
          -Dlogkit.jar=$(build-classpath excalibur/avalon-logkit) \
***************
*** 220,234 ****
  
  %endif
- ## FIXME: There are failures with gcj. Ignore them for now.
- %if %{gcj_support}
-   ant -Dtest.failonerror=false \
-         -Djunit.jar=$(build-classpath junit) \
-         -Dlogkit.jar=$(build-classpath excalibur/avalon-logkit) \
-         -Davalon-framework.jar=$(build-classpath excalibur/avalon-framework) \
-         -Dservletapi.jar=$(build-classpath servlet_2_5_api) \
-     test
- %endif
  %else
!         ant compile-only javadoc
  %endif
  
--- 202,207 ----
  
  %endif
  %else
!         %{ant} compile-only javadoc
  %endif
  
***************
*** 314,321 ****
  %endif
  
- %if %{gcj_support}
- %{_bindir}/aot-compile-rpm
- %endif
- 
  %clean
  rm -rf $RPM_BUILD_ROOT
--- 287,290 ----
***************
*** 323,341 ****
  %post
  %update_maven_depmap
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %postun
  %update_maven_depmap
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %files
--- 292,298 ----
***************
*** 347,354 ****
  %{_docdir}/%{name}-%{version}/*.txt
  %{_docdir}/%{name}-%{version}/*.html
- %if %{gcj_support}
- %dir %{_libdir}/gcj/%{name}
- %attr(-,root,root) %{_libdir}/gcj/%{name}/*
- %endif
  
  %files javadoc
--- 304,307 ----
***************
*** 372,375 ****
--- 325,332 ----
  
  %changelog
+ * Fri Oct 21 2011 David Walluck <dwalluck at redhat.com> 0:1.1.1-17
+ - bump Release (for mdv)
+ - remove GCJ support
+ 
  * Wed Dec 08 2010 Ralph Apel <r.apel at r-apel.de> 0:1.1.1-6
  - Fix compat symlinks for jakarta-commons-logging




More information about the JPackage-commits mailing list