[packages/csync2/DEVEL] - install doc files only once during make install

draenog draenog at pld-linux.org
Fri Oct 10 18:35:44 CEST 2014


commit bfb5ebe847a63e2b679538eb85225666dac69375
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Fri Oct 10 17:22:56 2014 +0100

    - install doc files only once during make install
    
    It could cause some build fails see:
    http://buildlogs.pld-linux.org/index.php?dist=th&arch=i486&ok=0&name=csync2&id=2c6838b2-bbe7-439a-ac7e-ab27f5d20a7f

 csync2-docdata.patch | 10 ++++++++++
 csync2.spec          |  7 +++++++
 2 files changed, 17 insertions(+)
---
diff --git a/csync2.spec b/csync2.spec
index 8f9eb6f..5f35408 100644
--- a/csync2.spec
+++ b/csync2.spec
@@ -11,7 +11,10 @@ Source1:	%{name}.init
 Source2:	%{name}.inet
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-fix-sonames.patch
+Patch1:		%{name}-docdata.patch
 URL:		http://oss.linbit.com/csync2/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gnutls-devel
@@ -98,8 +101,12 @@ klastrów HA, HPC, COW oraz farm serwerów.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
 	--enable-gnutls \
 	--enable-mysql \
diff --git a/csync2-docdata.patch b/csync2-docdata.patch
new file mode 100644
index 0000000..be510df
--- /dev/null
+++ b/csync2-docdata.patch
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	2014-10-10 17:09:05.337884952 +0100
++++ Makefile.am	2014-10-10 17:09:14.581270556 +0100
+@@ -59,7 +59,6 @@
+ 
+ endif
+ 
+-doc_DATA = $(docfiles)
+ dist_doc_DATA = $(docfiles)
+ 
+ dist-clean-local:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/csync2.git/commitdiff/bfb5ebe847a63e2b679538eb85225666dac69375



More information about the pld-cvs-commit mailing list