[Jpackage-commits] rpms/free/apache-commons-logging apache-commons-logging.spec, 1.5, 1.6

jpackage jpackage at ryu.zarb.org
Fri Oct 21 21:54:12 CEST 2011


Update of /home/projects/jpackage/cvs/rpms/free/apache-commons-logging
In directory ryu.zarb.org:/tmp/mb_qP4Cwqj/rpms/free/apache-commons-logging

Modified Files:
	apache-commons-logging.spec 
Log Message:
1.1.1-17.jpp6

Index: apache-commons-logging.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/apache-commons-logging/apache-commons-logging.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** apache-commons-logging.spec	8 Dec 2010 23:07:17 -0000	1.5
--- apache-commons-logging.spec	21 Oct 2011 19:54:10 -0000	1.6
***************
*** 1,3 ****
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 27,60 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- 
- %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
! %define repodirlib %{repodir}/lib
! %define repodirres %{repodir}/resources
! %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
--- 27,48 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  %bcond_with bootstrap
  %bcond_without maven
! %bcond_with repolib
  
! %global repodir %{_javadir}/repository.jboss.com/apache-%{base_name}/%{version}-brew
! %global repodirlib %{repodir}/lib
! %global repodirres %{repodir}/resources
! %global 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
--- 50,54 ----
  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
***************
*** 74,78 ****
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
- BuildRequires:  liberation-fonts
  BuildRequires:  ant >= 0:1.7
  %if %with maven
--- 61,64 ----
***************
*** 90,95 ****
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-default-skin
! BuildRequires:  mojo-maven2-plugin-build-helper
! BuildRequires:  mojo-maven2-plugin-rat
  %endif
  %if %without bootstrap
--- 76,83 ----
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-default-skin
! BuildRequires:  velocity15
! BuildRequires:  build-helper-maven-plugin
! BuildRequires:  rat-maven-plugin
! BuildRequires:  mojo-parent >= 0:23
  %endif
  %if %without bootstrap
***************
*** 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 ----
***************
*** 208,216 ****
          -e \
          -s $(pwd)/settings.xml \
!         install javadoc:javadoc site
  
  %else
! 
! ant \
          -Djunit.jar=$(build-classpath junit) \
          -Dlogkit.jar=$(build-classpath excalibur/avalon-logkit) \
--- 191,198 ----
          -e \
          -s $(pwd)/settings.xml \
!         install javadoc:aggregate
  
  %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
  
***************
*** 239,247 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  
! install -m 644 target/%{short_name}-%{version}.jar \
                  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -m 644 target/%{short_name}-api-%{version}.jar \
                  $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
! install -m 644 target/%{short_name}-adapters-%{version}.jar \
                  $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters-%{version}.jar
  
--- 212,220 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  
! install -p -m 644 target/%{short_name}-%{version}.jar \
                  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -p -m 644 target/%{short_name}-api-%{version}.jar \
                  $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
! install -p -m 644 target/%{short_name}-adapters-%{version}.jar \
                  $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters-%{version}.jar
  
***************
*** 267,273 ****
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{short_name}.pom
! install -m 644 %{SOURCE4} \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{short_name}-api.pom
  
--- 240,246 ----
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{short_name}.pom
! install -p -m 644 %{SOURCE4} \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{short_name}-api.pom
  
***************
*** 277,281 ****
  %if %with maven
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
- rm -rf target/site/apidocs
  %else
  cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
--- 250,253 ----
***************
*** 297,300 ****
--- 269,273 ----
  # manual
  cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site/apidocs
  %endif
  %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 ----
***************
*** 344,354 ****
  %{_datadir}/maven2/poms/*
  %config(noreplace) %{_mavendepmapfragdir}/*
! %dir %{_docdir}/%{name}-%{version}
! %{_docdir}/%{name}-%{version}/*.txt
! %{_docdir}/%{name}-%{version}/*.html
! %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/*
! %endif
  
  %files javadoc
--- 301,307 ----
  %{_datadir}/maven2/poms/*
  %config(noreplace) %{_mavendepmapfragdir}/*
! %doc %dir %{_docdir}/%{name}-%{version}
! %doc %{_docdir}/%{name}-%{version}/*.txt
! %doc %{_docdir}/%{name}-%{version}/*.html
  
  %files javadoc
***************
*** 372,375 ****
--- 325,336 ----
  
  %changelog
+ * Fri Oct 21 2011 David Walluck <dwalluck at redhat.com> 0:1.1.1-17
+ - bump Release (for mdv)
+ - remove GCJ support
+ - switch to new mojo plugins build requires
+ - fix doc install
+ - fix doc file ownership
+ - disable failing site
+ 
  * 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