[rabbitmq-server/el5/master: 12/12] New 2.0.0 release with special treatment of xmlto and xsltproc during building

[Hubert Plociniczak]

commit f50828b0f09d6ae0d91c2f6bca218c73e8d73f00
Merge: e18009e e666376
Author: Hubert Plociniczak <hubert.plociniczak at gmail.com>
Date:   Thu Sep 16 05:27:12 2010 +0200

    New 2.0.0 release with special treatment of xmlto and xsltproc during building

 .gitignore           |    2 ++
 rabbitmq-server.ocf  |   16 ----------------
 rabbitmq-server.spec |   13 ++++++++-----
 sources              |    2 +-
 xmltovalidate.patch  |   27 +++++++++++++++++++++++++++
 5 files changed, 38 insertions(+), 22 deletions(-)
---
diff --cc .gitignore
index b038293,358bad6..d1dbdc1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,3 @@@
  rabbitmq-server-1.8.0.tar.gz
+ /rabbitmq-server-2.0.0.tar.gz
++
diff --cc rabbitmq-server.ocf
index db0ed70,b969535..b969535
mode 100644,100755..100644
--- a/rabbitmq-server.ocf
+++ b/rabbitmq-server.ocf
diff --cc rabbitmq-server.spec
index 0e52a08,2039936..8819177
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@@ -11,7 -11,6 +11,7 @@@ Source2: rabbitmq-script-wrappe
  Source3: rabbitmq-server.logrotate
  Source4: rabbitmq-asroot-script-wrapper
  Source5: rabbitmq-server.ocf
- Patch0: bug22871.patch
++Patch0: xmltovalidate.patch
  URL: http://www.rabbitmq.com/
  BuildArch: noarch
  BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt
@@@ -32,7 -31,9 +32,8 @@@ scalable implementation of an AMQP brok
  %define _rabbit_wrapper %{_builddir}/`basename %{S:2}`
  %define _rabbit_asroot_wrapper %{_builddir}/`basename %{S:4}`
  %define _rabbit_server_ocf %{_builddir}/`basename %{S:5}`
+ %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
  
 -
  %define _maindir %{buildroot}%{_rabbit_erllibdir}
  
  %prep
@@@ -130,6 -128,9 +129,10 @@@ don
  rm -rf %{buildroot}
  
  %changelog
+ * Mon Aug 23 2010 Mike Bridgen <mikeb at rabbitmq.com> 2.0.0-1
+ - New Upstream Release
++- Skip validation for xsltproc and xmlto since versions available have bugs
+ 
  * Mon Jun 28 2010 Hubert Plociniczak <hubert at lshift.net> 1.8.0-1
  - New Upstream Release
  - Backported fix for bug 22871, fixes issues with erlang >= R14A
diff --cc xmltovalidate.patch
index 0000000,0000000..d769f84
new file mode 100644
--- /dev/null
+++ b/xmltovalidate.patch
@@@ -1,0 -1,0 +1,27 @@@
++diff -uNr rabbitmq-server-2.0.0/Makefile rabbitmq-server-2.0.0-patched/Makefile
++--- rabbitmq-server-2.0.0/Makefile	2010-08-24 17:19:27.000000000 +0200
+++++ rabbitmq-server-2.0.0-patched/Makefile	2010-09-16 05:13:17.460225675 +0200
++@@ -236,8 +236,8 @@
++ # xmlto can not read from standard input, so we mess with a tmp file.
++ %.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl
++ 	xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$' >/dev/null || opt='--stringparam man.indent.verbatims=0' ; \
++-	    xsltproc $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \
++-	    xmlto -o $(DOCS_DIR) $$opt man $<.tmp && \
+++	    xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \
+++	    xmlto --skip-validation -o $(DOCS_DIR) $$opt man $<.tmp && \
++ 	    gzip -f $(DOCS_DIR)/`basename $< .xml`
++ 	rm -f $<.tmp
++ 
++@@ -256,10 +256,10 @@
++ # the file to make internal links.
++ %.man.xml: %.xml $(DOCS_DIR)/html-to-website-xml.xsl
++ 	cp $< `basename $< .xml`.xml && \
++-		xmlto xhtml-nochunks `basename $< .xml`.xml ; rm `basename $< .xml`.xml
+++		xmlto --skip-validation xhtml-nochunks `basename $< .xml`.xml ; rm `basename $< .xml`.xml
++ 	cat `basename $< .xml`.html | \
++ 	    xsltproc --novalid $(DOCS_DIR)/remove-namespaces.xsl - | \
++-		xsltproc --stringparam original `basename $<` $(DOCS_DIR)/html-to-website-xml.xsl - | \
+++		xsltproc --novalid --stringparam original `basename $<` $(DOCS_DIR)/html-to-website-xml.xsl - | \
++ 		xmllint --format - > $@
++ 	rm `basename $< .xml`.html
++