From ee630f686fd61e70e5633db47a0a351c25edd22a524d93c65ee0ad94abaa75ab Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 18 Dec 2014 14:00:43 +0000 Subject: [PATCH] Accepting request 265460 from home:dimstar:branches:devel:libraries:c_c++ - Add libmemcached-no-docs-available.patch: Do not build documentation if this is not a VC checkout. The idea is that the tarballs do only ship the pre-built documentation (which, on the other hand, is also missing in 1.0.18). And, after more than a month, we get a building package again... OBS-URL: https://build.opensuse.org/request/show/265460 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmemcached?expand=0&rev=46 --- libmemcached-no-docs-available.patch | 32 ++++++++++++++++++++++++++++ libmemcached.changes | 8 +++++++ libmemcached.spec | 3 +++ 3 files changed, 43 insertions(+) create mode 100644 libmemcached-no-docs-available.patch diff --git a/libmemcached-no-docs-available.patch b/libmemcached-no-docs-available.patch new file mode 100644 index 0000000..e8090fe --- /dev/null +++ b/libmemcached-no-docs-available.patch @@ -0,0 +1,32 @@ +Index: libmemcached-1.0.18/Makefile.am +=================================================================== +--- libmemcached-1.0.18.orig/Makefile.am ++++ libmemcached-1.0.18/Makefile.am +@@ -26,6 +26,10 @@ EXTRA_DIST= + dist_man_MANS= + MAINTAINERCLEANFILES= + ++if IS_VCS_CHECKOUT ++SUBDIRS= docs ++endif ++ + #includes additional rules from aminclude.am + @INC_AMINCLUDE@ + +@@ -57,7 +61,6 @@ endif + include libmemcachedutil-1.0/include.am + + include clients/include.am +-include docs/include.am + include man/include.am + + if BUILD_LIBMEMCACHED_PROTOCOL +@@ -103,7 +106,7 @@ merge-clean: + @echo "Files that need to be either removed or checked in:" + @bzr unknowns + +-clean-local: clean-libtest-check clean-docs-check clean-rpm ++clean-local: clean-libtest-check clean-rpm + + + lcov: lcov-clean check diff --git a/libmemcached.changes b/libmemcached.changes index dbd9b54..618e18e 100644 --- a/libmemcached.changes +++ b/libmemcached.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 16 17:31:06 UTC 2014 - dimstar@opensuse.org + +- Add libmemcached-no-docs-available.patch: Do not build + documentation if this is not a VC checkout. The idea is that the + tarballs do only ship the pre-built documentation (which, on the + other hand, is also missing in 1.0.18). + ------------------------------------------------------------------- Tue Dec 9 16:24:59 UTC 2014 - jengelh@inai.de diff --git a/libmemcached.spec b/libmemcached.spec index 57795f2..b24bbfe 100644 --- a/libmemcached.spec +++ b/libmemcached.spec @@ -30,6 +30,8 @@ Source2: %{name}.keyring # PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dimstar@opensuse.org -- Fix pthread detection Patch0: libmemcached-pthread.patch Patch1: libmemcached-automake1_14.diff +# PATCH-FIX-UPSTREAM libmemcached-no-docs-available.patch dimstar@opensuse.org -- Do not build docs if not VCS checkout +Patch2: libmemcached-no-docs-available.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # List of additional build dependencies BuildRequires: automake >= 1.13 @@ -92,6 +94,7 @@ methods. %prep %setup -q %patch -P 0 -P 1 -p1 +%patch2 -p1 %build autoreconf -fiv