[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia.spec, 1.31, 1.32

David Walluck david at ryu.zarb.org
Wed Oct 12 05:40:05 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv11696

Modified Files:
	maven-doxia.spec 
Log Message:
- fix install

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** maven-doxia.spec	12 Oct 2011 03:05:26 -0000	1.31
--- maven-doxia.spec	12 Oct 2011 03:40:02 -0000	1.32
***************
*** 40,59 ****
  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
--- 40,54 ----
***************
*** 63,71 ****
  Patch5:         maven-doxia-directory.patch
  Patch6:         maven-doxia-doxia-maven-plugin.patch
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! 
! BuildArch:      noarch
! 
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  ant >= 0:1.7.1
--- 58,78 ----
  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
***************
*** 107,128 ****
  BuildRequires:  jakarta-commons-configuration
  BuildRequires:  xmlgraphics-fop
! 
! 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:       itext
! Requires:       jakarta-commons-configuration
! Requires:       xmlgraphics-fop
! 
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
  %description
--- 114,119 ----
  BuildRequires:  jakarta-commons-configuration
  BuildRequires:  xmlgraphics-fop
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 137,140 ****
--- 128,132 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
  %description javadoc
***************
*** 147,156 ****
  %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
  
--- 139,149 ----
  %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
  
***************
*** 164,174 ****
  
  %if %with maven
- export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
- %if 0
- mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/poms/
- 
- export M2_SETTINGS=$(pwd)/settings.xml
- %endif
- 
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
  export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
--- 157,160 ----
***************
*** 203,207 ****
         popd
  done
- 
  %endif
  
--- 189,192 ----
***************
*** 211,253 ****
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-book/%{namedversion}/doxia-book-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-book-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/%{namedversion}/doxia-module-xhtml-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-xhtml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/%{namedversion}/doxia-module-xdoc-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-xdoc-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/%{namedversion}/doxia-module-twiki-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-twiki-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/%{namedversion}/doxia-module-rtf-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-rtf-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/%{namedversion}/doxia-module-latex-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-latex-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/%{namedversion}/doxia-module-itext-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-itext-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/%{namedversion}/doxia-module-fo-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-fo-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/%{namedversion}/doxia-module-fml-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-fml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/%{namedversion}/doxia-module-docbook-simple-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-docbook-simple-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/%{namedversion}/doxia-module-confluence-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-confluence-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/%{namedversion}/doxia-module-apt-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-apt-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/%{namedversion}/doxia-core-%{namedversion}-tests.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}-tests.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/%{namedversion}/doxia-core-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/%{namedversion}/doxia-test-docs-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-test-docs-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/%{namedversion}/doxia-sink-api-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-sink-api-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/%{namedversion}/doxia-logging-api-%{namedversion}.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/%{namedversion}/doxia-book-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-book.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/%{namedversion}/doxia-module-xhtml-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xhtml.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/%{namedversion}/doxia-module-xdoc-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xdoc.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/%{namedversion}/doxia-module-twiki-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-twiki.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/%{namedversion}/doxia-module-rtf-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-rtf.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/%{namedversion}/doxia-module-latex-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-latex.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/%{namedversion}/doxia-module-itext-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-itext.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/%{namedversion}/doxia-module-fo-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fo.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/%{namedversion}/doxia-module-fml-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fml.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/%{namedversion}/doxia-module-docbook-simple-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-docbook-simple.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/%{namedversion}/doxia-module-confluence-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-confluence.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/%{namedversion}/doxia-module-apt-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-apt.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-modules/%{namedversion}/doxia-modules-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-modules.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/%{namedversion}/doxia-core-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-core.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/%{namedversion}/doxia-test-docs-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-test-docs.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/%{namedversion}/doxia-sink-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-sink-api.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/%{namedversion}/doxia-logging-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-logging-api.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia/%{namedversion}/doxia-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia.pom
  
  # depmaps
--- 196,238 ----
  # 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-*.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
***************
*** 272,281 ****
  
  # 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}
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
--- 257,266 ----
  
  # 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
***************
*** 343,348 ****
  %if %with maven
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
  %endif
  
--- 328,334 ----
  %if %with maven
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/doxia-%{namedversion}
! %{_javadocdir}/doxia
  %endif
  




More information about the JPackage-commits mailing list