Attachment 11800 Details for Bug 11696 – Patch for v4-4 branch

[patch] Patch for v4-4 branch

0001-ctdb-do-not-provide-a-useless-pkgconfig-file-for-ctd.patch (text/plain), 2.40 KB, created by Amitay Isaacs on 2016-01-29 05:42:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2016-01-29 05:42:03 UTC

Size: 2.40 KB

patch

obsolete

>From f1d96796ac7188ee457bbc1ab108cce1a85f0ac8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Wed, 27 Jan 2016 15:40:33 +0100
>Subject: [PATCH] ctdb: do not provide a useless pkgconfig file for ctdb.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11696
>
>We neither have public headers nor a public library.
>
>Guenther
>
>Signed-off-by: Guenther Deschner <gd@samba.org>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>
>Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
>Autobuild-Date(master): Fri Jan 29 04:33:36 CET 2016 on sn-devel-144
>---
> ctdb/ctdb.pc.in                 | 19 -------------------
> ctdb/packaging/RPM/ctdb.spec.in |  1 -
> ctdb/wscript                    |  9 ---------
> 3 files changed, 29 deletions(-)
> delete mode 100644 ctdb/ctdb.pc.in
>
>diff --git a/ctdb/ctdb.pc.in b/ctdb/ctdb.pc.in
>deleted file mode 100644
>index 5f5bfab..0000000
>--- a/ctdb/ctdb.pc.in
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-prefix=@prefix@
>-exec_prefix=@exec_prefix@
>-datarootdir=@datarootdir@
>-includedir=@includedir@
>-libdir=@libdir@
>-bindir=@bindir@
>-sbindir=@sbindir@
>-mandir=@mandir@
>-localstatedir=@localstatedir@
>-srcdir=@srcdir@
>-etcdir=@sysconfdir@
>-
>-Name: ctdb
>-Description: A clustered database to store temporary data
>-Version: @PACKAGE_VERSION@
>-Libs: -L${libdir}
>-Cflags: -I${includedir}
>-URL: http://ctdb.samba.org/
>-
>diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
>index 55ce0e5..420ec52 100644
>--- a/ctdb/packaging/RPM/ctdb.spec.in
>+++ b/ctdb/packaging/RPM/ctdb.spec.in
>@@ -217,7 +217,6 @@ rm -rf $RPM_BUILD_ROOT
> %{_mandir}/man7/ctdb.7.gz
> %{_mandir}/man7/ctdb-statistics.7.gz
> %{_mandir}/man7/ctdb-tunables.7.gz
>-%{_libdir}/pkgconfig/ctdb.pc
> 
> 
> %package devel
>diff --git a/ctdb/wscript b/ctdb/wscript
>index edd4aa4..e1fad17 100755
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -615,15 +615,6 @@ def build(bld):
>     bld.install_dir(bld.env.CTDB_RUNDIR)
>     bld.install_dir(bld.env.CTDB_VARDIR)
> 
>-    sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
>-    t = bld.SAMBA_GENERATOR('ctdb-pc',
>-                            source='ctdb.pc.in',
>-                            target='ctdb.pc',
>-                            rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr,
>-                            dep_vars=['VERSION'])
>-    t.env.VERSION = VERSION
>-    bld.INSTALL_FILES('${LIBDIR}/pkgconfig', 'ctdb.pc')
>-
>     # Unit tests
>     ctdb_unit_tests = [
>         'db_hash_test',
>-- 
>2.5.0
>

Flags:

gd: review+

Actions: View

Attachments on bug 11696: 11800