[Jpackage-commits] rpms/free/maven-doxia maven-doxia-1.0-pom.patch, 1.1, 1.2 maven-doxia-directory.patch, NONE, 1.1 maven-doxia-doxia-maven-plugin.patch, NONE, 1.1 maven-doxia-jpp-depmap.xml, 1.8, 1.9 maven-doxia-logging.patch, NONE, 1.1 maven-doxia-module-docbook-simple.patch, NONE, 1.1 maven-doxia-settings.xml, 1.4, 1.5 maven-doxia.spec, 1.15, 1.16

jpackage jpackage at ryu.zarb.org
Wed Oct 12 05:59:57 CEST 2011


Update of /home/projects/jpackage/cvs/rpms/free/maven-doxia
In directory ryu.zarb.org:/tmp/FYX4MAeVj3/rpms/free/maven-doxia

Modified Files:
	maven-doxia-1.0-pom.patch maven-doxia-jpp-depmap.xml 
	maven-doxia-settings.xml maven-doxia.spec 
Added Files:
	maven-doxia-directory.patch 
	maven-doxia-doxia-maven-plugin.patch maven-doxia-logging.patch 
	maven-doxia-module-docbook-simple.patch 
Log Message:
1.1-1.jpp6

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia/maven-doxia.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** maven-doxia.spec	5 Dec 2010 16:24:01 -0000	1.15
--- maven-doxia.spec	12 Oct 2011 03:59:55 -0000	1.16
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 27,47 ****
  # (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_gcj_support 1
! %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 gcj_support 0
! 
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
! 
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
! %define namedversion 1.0
  
  Name:           maven-doxia
! Version:        1.0
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Content generation framework
--- 27,38 ----
  # (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_without maven
  
! %define namedversion %{version}
  
  Name:           maven-doxia
! Version:        1.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Content generation framework
***************
*** 49,86 ****
  Group:          Development/Java
  URL:            http://maven.apache.org/doxia/
! 
! # svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0
! #       maven-doxia/
! # tar czf maven-doxia-1.0-src.tar.gz maven-doxia/
! Source0:        %{name}-%{version}-src.tar.gz
! 
  Source1:        %{name}-decoration-model-build.xml
  Source2:        %{name}-core-build.xml
  Source3:        %{name}-sink-api-build.xml
  Source4:        %{name}-site-renderer-build.xml
- 
  # These files are taken from the doxia build itself, done with maven2
  # To regenerate, build above tarball with upstream maven
  Source5:        %{name}-autogenerated-files.tar.gz
- 
  Source6:        %{name}-jpp-depmap.xml
  Source7:        %{name}-settings.xml
- 
  Patch0:         maven-doxia-1.0-pom.patch
  Patch1:         maven-doxia-module-apt-pom.patch
  Patch2:         maven-doxia-module-xdoc-pom.patch
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
! %if ! %{gcj_support}
! BuildArch:      noarch
! %else
! ExcludeArch:   ppc64
! %endif
! 
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  ant-nodeps
! %if %{with_maven}
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
--- 40,82 ----
  Group:          Development/Java
  URL:            http://maven.apache.org/doxia/
! # svn export -r 1182148 http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1 maven-doxia-1.1 && tar cjf maven-doxia-1.1.tar.bz2 maven-doxia-1.1
! Source0:        %{name}-%{version}.tar.bz2
  Source1:        %{name}-decoration-model-build.xml
  Source2:        %{name}-core-build.xml
  Source3:        %{name}-sink-api-build.xml
  Source4:        %{name}-site-renderer-build.xml
  # These files are taken from the doxia build itself, done with maven2
  # To regenerate, build above tarball with upstream maven
  Source5:        %{name}-autogenerated-files.tar.gz
  Source6:        %{name}-jpp-depmap.xml
  Source7:        %{name}-settings.xml
  Patch0:         maven-doxia-1.0-pom.patch
  Patch1:         maven-doxia-module-apt-pom.patch
  Patch2:         maven-doxia-module-xdoc-pom.patch
! Patch3:         maven-doxia-module-docbook-simple.patch
! Patch4:         maven-doxia-logging.patch
! Patch5:         maven-doxia-directory.patch
! Patch6:         maven-doxia-doxia-maven-plugin.patch
! Requires(post):   jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       classworlds
! Requires:       apache-commons-collections
! Requires:       apache-commons-logging
! Requires:       apache-commons-validator
! Requires:       jpackage-utils
! Requires:       junit
! Requires:       oro
! Requires:       plexus-container-default
! Requires:       plexus-i18n
! Requires:       plexus-utils
! Requires:       plexus-velocity
! Requires:       velocity
! Requires:       itext
! Requires:       jakarta-commons-configuration
! Requires:       xmlgraphics-fop
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  ant-nodeps
! %if %with maven
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
***************
*** 95,101 ****
  BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  plexus-maven-plugin 
! BuildRequires:  qdox161
  BuildRequires:  modello-maven-plugin 
! BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
  BuildRequires:  plexus-cdc 
  BuildRequires:  excalibur-avalon-framework
--- 91,97 ----
  BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  plexus-maven-plugin 
! ##BuildRequires:  qdox161
  BuildRequires:  modello-maven-plugin 
! ##BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
  BuildRequires:  plexus-cdc 
  BuildRequires:  excalibur-avalon-framework
***************
*** 108,112 ****
  BuildRequires:  junit
  BuildRequires:  oro
! BuildRequires:  plexus-container-default
  BuildRequires:  plexus-cli
  BuildRequires:  plexus-i18n
--- 104,108 ----
  BuildRequires:  junit
  BuildRequires:  oro
! ##BuildRequires:  plexus-container-default
  BuildRequires:  plexus-cli
  BuildRequires:  plexus-i18n
***************
*** 116,140 ****
  BuildRequires:  itext <= 2.0
  BuildRequires:  xml-commons-jaxp-1.3-apis
! 
! Requires:       classworlds
! Requires:       apache-commons-collections
! Requires:       apache-commons-logging
! Requires:       apache-commons-validator
! Requires:       junit
! Requires:       oro
! Requires:       plexus-container-default
! Requires:       plexus-i18n
! Requires:       plexus-utils
! Requires:       plexus-velocity
! Requires:       velocity
! 
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! 
! %if %{gcj_support}
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
! %endif
  
  %description
--- 112,119 ----
  BuildRequires:  itext <= 2.0
  BuildRequires:  xml-commons-jaxp-1.3-apis
! BuildRequires:  jakarta-commons-configuration
! BuildRequires:  xmlgraphics-fop
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 145,152 ****
  wikis and content management systems.
  
! %if %{with_maven}
  %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
--- 124,132 ----
  wikis and content management systems.
  
! %if %with maven
  %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
  %description javadoc
***************
*** 155,206 ****
  
  %prep
! %setup -q -n %{name}
  
! %if %{without_maven}
  # Extract autogenerated (by maven) files
! tar xzf %{SOURCE5}
! rm -rf doxia-decoration-model
! rm -rf doxia-site-renderer
  
! cp -p %{SOURCE2} doxia-core/build.xml
! cp -p %{SOURCE3} doxia-sink-api/build.xml
  %endif
  
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! 
! cp %{SOURCE7} settings.xml
! sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! 
! %build
! 
! %if %{with_maven}
! 
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/poms/
! 
! export M2_SETTINGS=$(pwd)/settings.xml
! 
! mvn-jpp \
!         -e \
!         -s ${M2_SETTINGS} \
!         -Dmaven2.jpp.depmap.file=%{SOURCE6} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven.test.failure.ignore=true \
!         install 
! 
! mvn-jpp \
!         -e \
!         -s ${M2_SETTINGS} \
!         -Dmaven2.jpp.depmap.file=%{SOURCE6} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Daggregate=true \
!         javadoc:javadoc
  
  %else
- 
  mkdir lib
  build-jar-repository -s -p lib/ \
--- 135,166 ----
  
  %prep
! %setup -q
  
! %if %without maven
  # Extract autogenerated (by maven) files
! # FIXME: use setup macro
! %{__tar} xzf %{SOURCE5}
! %{__rm} -r doxia-decoration-model
! %{__rm} -r doxia-site-renderer
  
! %{__cp} -p %{SOURCE2} doxia-core/build.xml
! %{__cp} -p %{SOURCE3} doxia-sink-api/build.xml
  %endif
  
! %patch0 -p0 -b .sav0
! %patch1 -p0 -b .sav1
! %patch2 -p0 -b .sav2
! %patch3 -p0 -b .sav3
! %patch4 -p1 -b .sav4
! %patch5 -p1 -b .sav5
! %patch6 -p1 -b .sav6
  
+ %if %with maven
+ export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
+ export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
+ export MAVEN_OPTS="-Xms1g -Xmx1g"
+ %{_bindir}/mvn-jpp -e -Dproject.build.directory=target -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven2.jpp.depmap.file=%{SOURCE6} -Dmaven.test.skip=true -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy
+ #javadoc:aggregate
  %else
  mkdir lib
  build-jar-repository -s -p lib/ \
***************
*** 229,317 ****
         popd
  done
- 
  %endif
  
  %install
! rm -rf $RPM_BUILD_ROOT
! 
! # jars/poms
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! 
! for targetdir in `find -type d -name target`; do
! 
!     targetdir=`echo $targetdir | sed -e s:^\./::g`
! 
!     modulename=`echo $targetdir | awk -F / '{print $(NF-1)}'`
!     strippedmodulename=`echo $modulename | sed -e s:^doxia-::g`
! 
!     # Does the module have a jar?
!     if [ -f $targetdir/$modulename-%{namedversion}.jar ]; then
!         cp -p $targetdir/$modulename-%{namedversion}.jar \
!                 $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename-%{namedversion}.jar
!     fi
! 
! 
!     # Skip parent pom
!     if [ ! -z $strippedmodulename ]; then
!         cp -p $targetdir/../pom.xml \
!                 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-$strippedmodulename.pom
! 
!         %add_to_maven_depmap org.apache.maven.doxia $modulename %{namedversion} JPP/maven-doxia $strippedmodulename
!     fi
!     
! done
  
! # Install parent pom
! install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.pom
! %add_to_maven_depmap org.apache.maven.doxia doxia %{namedversion} JPP/maven-doxia doxia
  
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
!   do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
  # Install javadocs
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %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
! %defattr(-,root,root,-)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
! %if %{gcj_support}
! %attr(-,root,root) %{_libdir}/gcj/%{name}
! %endif
  
! %if %{with_maven}
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
  %endif
  
  %changelog
  * Sun Dec 05 2010 Ralph Apel <r.apel at r-apel.de> 1.0-2
  - Force creation of plexus component descriptors
--- 189,342 ----
         popd
  done
  %endif
  
  %install
! %{__rm} -rf %{buildroot}
  
! # jars
! %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-book/*/doxia-book-*.jar %{buildroot}%{_javadir}/doxia-book-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/*/doxia-module-xhtml-*.jar %{buildroot}%{_javadir}/doxia-module-xhtml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/*/doxia-module-xdoc-*.jar %{buildroot}%{_javadir}/doxia-module-xdoc-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/*/doxia-module-twiki-*.jar %{buildroot}%{_javadir}/doxia-module-twiki-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/*/doxia-module-rtf-*.jar %{buildroot}%{_javadir}/doxia-module-rtf-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/*/doxia-module-latex-*.jar %{buildroot}%{_javadir}/doxia-module-latex-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/*/doxia-module-itext-*.jar %{buildroot}%{_javadir}/doxia-module-itext-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/*/doxia-module-fo-*.jar %{buildroot}%{_javadir}/doxia-module-fo-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/*/doxia-module-fml-*.jar %{buildroot}%{_javadir}/doxia-module-fml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/*/doxia-module-docbook-simple-*.jar %{buildroot}%{_javadir}/doxia-module-docbook-simple-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/*/doxia-module-confluence-*.jar %{buildroot}%{_javadir}/doxia-module-confluence-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/*/doxia-module-apt-*.jar %{buildroot}%{_javadir}/doxia-module-apt-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/*/doxia-core-*-tests.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}-tests.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/*/doxia-core-1.?.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/*/doxia-test-docs-*.jar %{buildroot}%{_javadir}/doxia-test-docs-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/*/doxia-sink-api-*.jar %{buildroot}%{_javadir}/doxia-sink-api-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/*/doxia-logging-api-*.jar %{buildroot}%{_javadir}/doxia-logging-api-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do %{__ln_s} ${jar} `/bin/echo ${jar} | %{__sed} -e "s|-%{namedversion}||g"`; done)
  
+ # poms
+ %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-book/*/doxia-book-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-book.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/*/doxia-module-xhtml-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xhtml.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/*/doxia-module-xdoc-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xdoc.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/*/doxia-module-twiki-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-twiki.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/*/doxia-module-rtf-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-rtf.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/*/doxia-module-latex-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-latex.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/*/doxia-module-itext-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-itext.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/*/doxia-module-fo-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fo.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/*/doxia-module-fml-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fml.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/*/doxia-module-docbook-simple-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-docbook-simple.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/*/doxia-module-confluence-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-confluence.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/*/doxia-module-apt-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-apt.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-modules/*/doxia-modules-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-modules.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/*/doxia-core-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-core.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/*/doxia-test-docs-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-test-docs.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/*/doxia-sink-api-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-sink-api.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/*/doxia-logging-api-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-logging-api.pom
+ %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia/*/doxia-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia.pom
  
! # depmaps
! %add_to_maven_depmap org.apache.maven.doxia doxia-book %{namedversion} JPP doxia-book
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-xhtml %{namedversion} JPP doxia-module-xhtml
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-xdoc %{namedversion} JPP doxia-module-xdoc
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-twiki %{namedversion} JPP doxia-module-twiki
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-rtf %{namedversion} JPP doxia-module-rtf
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-latex %{namedversion} JPP doxia-module-latex
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-itext %{namedversion} JPP doxia-module-itext
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-fo %{namedversion} JPP doxia-module-fo
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-fml %{namedversion} JPP doxia-module-fml
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-docbook-simple %{namedversion} JPP doxia-module-docbook-simple
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-confluence %{namedversion} JPP doxia-module-confluence
! %add_to_maven_depmap org.apache.maven.doxia doxia-module-apt %{namedversion} JPP doxia-module-apt
! %add_to_maven_depmap org.apache.maven.doxia doxia-modules %{namedversion} JPP doxia-modules
! %add_to_maven_depmap org.apache.maven.doxia doxia-core %{namedversion} JPP doxia-core
! %add_to_maven_depmap org.apache.maven.doxia doxia-test-docs %{namedversion} JPP doxia-test-docs
! %add_to_maven_depmap org.apache.maven.doxia doxia-sink-api %{namedversion} JPP doxia-sink-api
! %add_to_maven_depmap org.apache.maven.doxia doxia-logging-api %{namedversion} JPP doxia-logging-api
! %add_to_maven_depmap org.apache.maven.doxia doxia %{namedversion} JPP doxia
  
  # Install javadocs
! %{__mkdir_p} %{buildroot}%{_javadocdir}/doxia-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/doxia-%{namedversion}/ || :
! %{__ln_s} doxia-%{version} %{buildroot}%{_javadocdir}/doxia
  
  %clean
! %{__rm} -rf %{buildroot}
  
  %post
  %update_maven_depmap
  
  %postun
  %update_maven_depmap
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/doxia-book-%{namedversion}.jar
! %{_javadir}*/doxia-book.jar
! %{_javadir}*/doxia-module-xhtml-%{namedversion}.jar
! %{_javadir}*/doxia-module-xhtml.jar
! %{_javadir}*/doxia-module-xdoc-%{namedversion}.jar
! %{_javadir}*/doxia-module-xdoc.jar
! %{_javadir}*/doxia-module-twiki-%{namedversion}.jar
! %{_javadir}*/doxia-module-twiki.jar
! %{_javadir}*/doxia-module-rtf-%{namedversion}.jar
! %{_javadir}*/doxia-module-rtf.jar
! %{_javadir}*/doxia-module-latex-%{namedversion}.jar
! %{_javadir}*/doxia-module-latex.jar
! %{_javadir}*/doxia-module-itext-%{namedversion}.jar
! %{_javadir}*/doxia-module-itext.jar
! %{_javadir}*/doxia-module-fo-%{namedversion}.jar
! %{_javadir}*/doxia-module-fo.jar
! %{_javadir}*/doxia-module-fml-%{namedversion}.jar
! %{_javadir}*/doxia-module-fml.jar
! %{_javadir}*/doxia-module-docbook-simple-%{namedversion}.jar
! %{_javadir}*/doxia-module-docbook-simple.jar
! %{_javadir}*/doxia-module-confluence-%{namedversion}.jar
! %{_javadir}*/doxia-module-confluence.jar
! %{_javadir}*/doxia-module-apt-%{namedversion}.jar
! %{_javadir}*/doxia-module-apt.jar
! %{_javadir}*/doxia-core-%{namedversion}-tests.jar
! %{_javadir}*/doxia-core-tests.jar
! %{_javadir}*/doxia-core-%{namedversion}.jar
! %{_javadir}*/doxia-core.jar
! %{_javadir}*/doxia-test-docs-%{namedversion}.jar
! %{_javadir}*/doxia-test-docs.jar
! %{_javadir}*/doxia-sink-api-%{namedversion}.jar
! %{_javadir}*/doxia-sink-api.jar
! %{_javadir}*/doxia-logging-api-%{namedversion}.jar
! %{_javadir}*/doxia-logging-api.jar
! %{_datadir}/maven2/poms/JPP-doxia-book.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-xhtml.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-xdoc.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-twiki.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-rtf.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-latex.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-itext.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-fo.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-fml.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-docbook-simple.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-confluence.pom
! %{_datadir}/maven2/poms/JPP-doxia-module-apt.pom
! %{_datadir}/maven2/poms/JPP-doxia-modules.pom
! %{_datadir}/maven2/poms/JPP-doxia-core.pom
! %{_datadir}/maven2/poms/JPP-doxia-test-docs.pom
! %{_datadir}/maven2/poms/JPP-doxia-sink-api.pom
! %{_datadir}/maven2/poms/JPP-doxia-logging-api.pom
! %{_datadir}/maven2/poms/JPP-doxia.pom
! %{_mavendepmapfragdir}/%{name}
  
! %if %with maven
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/doxia-%{namedversion}
! %{_javadocdir}/doxia
  %endif
  
  %changelog
+ * Tue Oct 11 2011 David Walluck <dwalluck at redhat.com> 0:1.1-1
+ - 1.1
+ - disable GCJ support
+ - use proper names
+ 
  * Sun Dec 05 2010 Ralph Apel <r.apel at r-apel.de> 1.0-2
  - Force creation of plexus component descriptors
***************
*** 380,382 ****
  * Wed Mar 15 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a7.1jpp
  - Initial build
- 
--- 405,406 ----

--- NEW FILE: maven-doxia-logging.patch ---
--- maven-doxia-1.1/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java~	2009-02-25 05:43:09.000000000 -0500
+++ maven-doxia-1.1/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java	2011-10-11 20:25:32.714042281 -0400
@@ -47,7 +47,7 @@
     /** {@inheritDoc} */
     public void setLogLevel( int level )
     {
-        if ( level <= LEVEL_DEBUG )
+/*        if ( level <= LEVEL_DEBUG )
         {
             logger.setThreshold( Logger.LEVEL_DEBUG );
         }
@@ -66,7 +66,7 @@
         else
         {
             logger.setThreshold( Logger.LEVEL_DISABLED );
-        }
+        }*/
     }
 
     /** {@inheritDoc} */

--- NEW FILE: maven-doxia-module-docbook-simple.patch ---
--- doxia-modules/doxia-module-docbook-simple/pom.xml.orig	2009-03-03 13:32:44.000000000 -0500
+++ doxia-modules/doxia-module-docbook-simple/pom.xml	2011-10-11 21:19:52.587890684 -0400
@@ -49,7 +49,6 @@
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>

Index: maven-doxia-settings.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia/maven-doxia-settings.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** maven-doxia-settings.xml	5 Dec 2010 14:10:48 -0000	1.4
--- maven-doxia-settings.xml	12 Oct 2011 03:59:55 -0000	1.5
***************
*** 1,36 ****
  <settings>
! 	<profiles>
! 		<profile>
! 			<id>JPP</id>
! 			<repositories>
! 				<repository>
! 					<id>internal</id>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>external</id>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</repository>
! 			</repositories>
! 			<pluginRepositories>
! 				<pluginRepository>
! 					<id>plugins-internal</id>
! 					<name>plugins-internal</name>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-external</id>
! 					<name>plugins-external</name>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</pluginRepository>
! 			</pluginRepositories>
! 		</profile>
! 	</profiles>
! 	<activeProfiles>
! 		<activeProfile>JPP</activeProfile>
! 	</activeProfiles>
  </settings>
--- 1,36 ----
  <settings>
!     <profiles>
!         <profile>
!             <id>JPP</id>
!             <repositories>
!                 <repository>
!                     <id>internal</id>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>external</id>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </repository>
!             </repositories>
!             <pluginRepositories>
!                 <pluginRepository>
!                     <id>plugins-internal</id>
!                     <name>plugins-internal</name>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-external</id>
!                     <name>plugins-external</name>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </pluginRepository>
!             </pluginRepositories>
!         </profile>
!     </profiles>
!     <activeProfiles>
!         <activeProfile>JPP</activeProfile>
!     </activeProfiles>
  </settings>

--- NEW FILE: maven-doxia-directory.patch ---
--- maven-doxia-1.1/pom.xml~	2011-10-11 20:58:55.000000000 -0400
+++ maven-doxia-1.1/pom.xml	2011-10-11 21:49:43.765610292 -0400
@@ -248,7 +248,7 @@
         <directory>src/main/resources</directory>
       </resource>
       <resource>
-        <directory>${build.directory}/generated-site/xsd</directory>
+        <directory>${project.build.directory}/generated-site/xsd</directory>
         <includes>
           <include>**/*.xsd</include>
         </includes>

Index: maven-doxia-1.0-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia/maven-doxia-1.0-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-doxia-1.0-pom.patch	5 Dec 2010 14:10:48 -0000	1.1
--- maven-doxia-1.0-pom.patch	12 Oct 2011 03:59:55 -0000	1.2
***************
*** 1,9 ****
! --- pom.xml.sav	2010-11-28 21:23:35.000000000 +0100
! +++ pom.xml	2010-11-28 21:23:56.000000000 +0100
! @@ -168,6 +168,14 @@
!            </execution>
!          </executions>
!        </plugin>
! +      <plugin>
  +        <groupId>org.apache.maven.plugins</groupId>
  +        <artifactId>maven-compiler-plugin</artifactId>
--- 1,8 ----
! --- pom.xml.sav0	2009-03-03 13:32:44.000000000 -0500
! +++ pom.xml	2011-10-11 20:58:30.189826808 -0400
! @@ -288,6 +288,14 @@
!      </pluginManagement>
!      <plugins>
!        <plugin>
  +        <groupId>org.apache.maven.plugins</groupId>
  +        <artifactId>maven-compiler-plugin</artifactId>
***************
*** 13,17 ****
  +        </configuration>
  +      </plugin>
!      </plugins>
!      <pluginManagement>
!        <plugins>
--- 12,17 ----
  +        </configuration>
  +      </plugin>
! +      <plugin>
!          <groupId>org.codehaus.plexus</groupId>
!          <artifactId>plexus-maven-plugin</artifactId>
!          <executions>

Index: maven-doxia-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia/maven-doxia-jpp-depmap.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** maven-doxia-jpp-depmap.xml	5 Dec 2010 14:10:48 -0000	1.8
--- maven-doxia-jpp-depmap.xml	12 Oct 2011 03:59:55 -0000	1.9
***************
*** 1,3 ****
--- 1,4 ----
  <dependencies>
+ <!--
    <dependency>
  	<maven>
***************
*** 76,85 ****
  	</jpp>
    </dependency>
- 
    <dependency>
  	<maven>
  	  <groupId>xml-apis</groupId>
! 	  <artifactId>xmlParserAPIs</artifactId>
! 	  <version>2.0.2</version>
  	</maven>
  	<jpp>
--- 77,85 ----
  	</jpp>
    </dependency>
    <dependency>
  	<maven>
  	  <groupId>xml-apis</groupId>
! 	  <artifactId>xml-apis-ext</artifactId>
! 	  <version>1.3.04</version>
  	</maven>
  	<jpp>
***************
*** 89,97 ****
  	</jpp>
    </dependency>
    <dependency>
  	<maven>
  	  <groupId>xml-apis</groupId>
! 	  <artifactId>xml-apis-ext</artifactId>
! 	  <version>1.3.04</version>
  	</maven>
  	<jpp>
--- 89,98 ----
  	</jpp>
    </dependency>
+ -->
    <dependency>
  	<maven>
  	  <groupId>xml-apis</groupId>
! 	  <artifactId>xmlParserAPIs</artifactId>
! 	  <version>2.0.2</version>
  	</maven>
  	<jpp>
***************
*** 101,104 ****
  	</jpp>
    </dependency>
- 
  </dependencies>
--- 102,104 ----

--- NEW FILE: maven-doxia-doxia-maven-plugin.patch ---
--- maven-doxia-1.1/pom.xml~	2011-10-11 21:52:43.000000000 -0400
+++ maven-doxia-1.1/pom.xml	2011-10-11 22:34:15.648977393 -0400
@@ -98,7 +98,7 @@
     <module>doxia-core</module>
     <module>doxia-modules</module>
     <module>doxia-book</module>
-    <module>doxia-maven-plugin</module>
+    <!--<module>doxia-maven-plugin</module>-->
   </modules>
 
   <scm>




More information about the JPackage-commits mailing list