[gentoo-commits] gentoo-x86 commit in sys-cluster/heartbeat/files: 3.0.4-docs.patch 3.0.4-python_tests.patch 3.0.4-fix_configure.patch 3.0.3-docs.patch 3.0.3-python_tests.patch 3.0.3-fix_configure.patch

[Alexys Jacob (ultrabug)]

ultrabug    11/02/11 11:04:47

  Added:                3.0.4-docs.patch 3.0.4-python_tests.patch
                        3.0.4-fix_configure.patch
  Removed:              3.0.3-docs.patch 3.0.3-python_tests.patch
                        3.0.3-fix_configure.patch
  Log:
  Version bump, drop old unstable.
  
  (Portage version: 2.1.9.39/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-cluster/heartbeat/files/3.0.4-docs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/files/3.0.4-docs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/files/3.0.4-docs.patch?rev=1.1&content-type=text/plain

Index: 3.0.4-docs.patch
===================================================================
--- configure.in
+++ configure.in
@@ -505,8 +505,15 @@
 AC_PATH_PROGS(TEST, test)
 AC_PATH_PROGS(PKGCONFIG, pkg-config)
 
-dnl xsltproc is required for building the man pages
-AC_PATH_PROGS(XSLTPROC, xsltproc)
+AC_ARG_ENABLE([doc],
+	AS_HELP_STRING([--enable-doc],[Build documentation]
+))
+AS_IF([test "x$enable_doc" = "xyes"], [
+	AC_PATH_PROGS(XSLTPROC, xsltproc)
+])
+AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"] )
+AC_SUBST(XSLTPROC)
+
 
 dnl ************************************************************************
 dnl Check whether non-root user can chown.
--- doc/Makefile.am
+++ doc/Makefile.am
@@ -33,11 +33,12 @@
 
 doc_DATA		= $(OTHER_DOCS)
 
+if BUILD_DOC
 man_MANS		= heartbeat.8 apphbd.8 cl_status.1  \
 			 hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \
 			 ha.cf.5 authkeys.5
 
-STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
+STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets 
 MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
 HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
 FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
@@ -47,6 +48,12 @@
 XSLTPROC_HTML_OPTIONS 	?= $(XSLTPROC_OPTIONS)
 XSLTPROC_FO_OPTIONS 	?= $(XSLTPROC_OPTIONS)
 
+%.5 %.8 %.1: %.xml
+	$(XSLTPROC) \
+	$(XSLTPROC_MANPAGES_OPTIONS) \
+	$(MANPAGES_STYLESHEET) $<
+endif
+
 EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
 
 ChangeLog: $(SPECSRC)
@@ -56,7 +63,3 @@
 .html.txt:
 	if [ "X$(HTML2TXT)" = "X" ]; then echo "Lynx or w3m or user-defined HTML2TXT required to convert $< to $@" >$@ ; else $(HTML2TXT) -dump $< >$@ ; fi
 
-%.5 %.8 %.1: %.xml
-	$(XSLTPROC) \
-	$(XSLTPROC_MANPAGES_OPTIONS) \
-	$(MANPAGES_STYLESHEET) $<



1.1                  sys-cluster/heartbeat/files/3.0.4-python_tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/files/3.0.4-python_tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/files/3.0.4-python_tests.patch?rev=1.1&content-type=text/plain

Index: 3.0.4-python_tests.patch
===================================================================
--- cts/Makefile.am
+++ cts/Makefile.am
@@ -21,7 +21,7 @@
 
 ctsdir		= @HA_NOARCHDATAHBDIR@/cts
 
-cts_PYTHON	=				\
+cts_SCRIPTS	=				\
 			CM_fs.py		\
 			CM_hb.py		\
 			CM_LinuxHAv2.py		\
@@ -32,14 +32,12 @@
 			extracttests.py		\
 			getpeinputs.sh		\
 			OCFIPraTest.py		\
-			CIB.py
+			CIB.py			\
+			CTSproxy.py		\
+			LSBDummy
 
 cts_DATA	=	README
 
-cts_SCRIPTS	=				\
-			CTSproxy.py		\
-			getpeinputs.sh		\
-			LSBDummy
 
 all-local: $(cts_PYTHON)
 



1.1                  sys-cluster/heartbeat/files/3.0.4-fix_configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch?rev=1.1&content-type=text/plain

Index: 3.0.4-fix_configure.patch
===================================================================
--- work/Heartbeat-3-0-STABLE-3.0.4/configure.in	2010-12-09 21:09:47.000000000 +0100
+++ work2/Heartbeat-3-0-STABLE-3.0.4/configure.in	2010-12-28 17:37:45.080773140 +0100
@@ -243,9 +243,9 @@
 mandir=`var "$mandir" "$exec_prefix/man"`
 dnl docdir is available in autoconf 2.60+, for older versions preseed
 dnl with the same value that 2.60+ uses
-docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
-libdir=`var "$libdir" "$exec_prefix/lib"`
-libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
+dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
+dnl libdir=`var "$libdir" "$exec_prefix/lib"`
+dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
 noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
 
 
@@ -284,59 +284,11 @@
   LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
   LibCdir=`dirname $LIBC`
   dirlist=`echo $LibCdir | tr '/' ' '`
-  LibDirSuffix=unknown
-  for dir in $dirlist
-  do
-    case $dir in
-      *lib*)	LibDirSuffix=$dir; break;;
-      *);;
-    esac
-  done
-  case $LibDirSuffix in
-    unknown)	LibDirSuffix=`basename $LibCdir`;;
-  esac
   OutFileType=`file $tmpOutfile`
   rm -f $tmpCfile $tmpOutfile
 else
   AC_MSG_ERROR([Cannot Compile trivial C program])
 fi
-#
-#	The code above doesn't work right everywhere
-#		(like Fedora and OpenBSD) 
-#
-case ${LibDirSuffix} in
-	*lib*)	: Cool;;
-	*)	: Sigh...
-		case $OutFileType in
-		  *64-bit*)	
-		  	case $host_os in
-			  openbsd*)	LibDirSuffix=lib;;
-		  	  *)		LibDirSuffix=lib64;;
-			esac;;
-		  *32-bit*)	LibDirSuffix=lib;;
-		  *)		LibDirSuffix=lib;;
-		esac;;
-esac
-#
-#	This may not yet be quite right for PPC where the default
-#	is to produce 32-bit binaries, even though the OS is 64-bit
-#	or for that matter for system Z, But, it's a lot better than
-#	it used to be.
-#
-AC_MSG_RESULT($LibDirSuffix)
-
-case $libdir in
-  */*${LibDirSuffix})	: Cool ;;
-  *)			: Uh Oh... 
-	libdir=`dirname $libdir`/$LibDirSuffix
-	AC_MSG_WARN([Overriding libdir to: $libdir]);;
-esac
-case $libexecdir in
-  */$LibDirSuffix)	: Cool ;;
-  *)			: Uh Oh... 
-	libexecdir=`dirname $libexecdir`/$LibDirSuffix
-	AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
-esac
 
 for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
 	includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
@@ -386,7 +338,6 @@
 fi
 
 AC_CHECK_HEADERS(heartbeat/glue_config.h)
-GLUE_HEADER=none
 if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
    GLUE_HEADER=heartbeat/glue_config.h
 else
@@ -453,15 +404,6 @@
 
 dnl	We use this in the RPM specfile...
 AC_SUBST(ac_configure_args)
-cleaned_configure_args=""
-for j in ${ac_configure_args}
-do
-  case $j in
-    *--libdir=*|*--libexecdir=*)	;;
-    *)		cleaned_configure_args="$cleaned_configure_args $j";;
-  esac
-done
-AC_SUBST(cleaned_configure_args)
 
 dnl *************************************************************************
 PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"