libcouchbase 1.0.4 → 1.1.0

data/ext/libcouchbase/include/libcouchbase/deprecated.h

@@ -225,9 +225,9 @@ lcb_error_t lcb_verify_struct_size(lcb_uint32_t id, lcb_uint32_t version,
 /**@deprecated Initial connections are always attempted */
 #define LCB_CNTL_SKIP_CONFIGURATION_ERRORS_ON_CONNECT 0x13
 
-/**@deprecated - Use error classifiers */
+/**@deprecated Use error classifiers */
 #define lcb_is_error_enomem(a) ((a == LCB_CLIENT_ENOMEM) || (a == LCB_ENOMEM))
-/**@deprecated - Use error classifiers */
+/**@deprecated Use error classifiers */
 #define lcb_is_error_etmpfail(a) ((a == LCB_CLIENT_ETMPFAIL) || (a == LCB_ETMPFAIL))
 
 typedef enum {

data/ext/libcouchbase/include/libcouchbase/error.h

@@ -532,7 +532,7 @@ typedef enum {
     LCB_MAX_ERROR = 0x1000
 } lcb_error_t;
 
-/** @deprecated. Use new, less ambiguous identifier (@ref LCB_CLIENT_ENOCONF) */
+/** @deprecated Use new, less ambiguous identifier (@ref LCB_CLIENT_ENOCONF) */
 #define LCB_CLIENT_ETMPFAIL LCB_CLIENT_ENOCONF
 
 /** @brief If the error is a result of bad input */

data/ext/libcouchbase/include/libcouchbase/iops.h

@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2014 Couchbase, Inc.
+ *     Copyright 2017 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -313,20 +313,20 @@ typedef int (*lcb_ioE_connect_fn)
                 const struct sockaddr *dst,
                 unsigned int addrlen);
 
-/** @private */
+/** @internal */
 typedef int (*lcb_ioE_bind_fn)
         (lcb_io_opt_t iops,
                 lcb_socket_t sock,
                 const struct sockaddr *srcaddr,
                 unsigned int addrlen);
 
-/** @private */
+/** @internal */
 typedef int (*lcb_ioE_listen_fn)
         (lcb_io_opt_t iops,
                 lcb_socket_t bound_sock,
                 unsigned int queuelen);
 
-/** @private */
+/** @internal */
 typedef lcb_socket_t (*lcb_ioE_accept_fn)
         (lcb_io_opt_t iops,
                 lcb_socket_t lsnsock);
@@ -338,7 +338,7 @@ typedef void (*lcb_ioE_close_fn)
 
 
 /**
- * While checking the socket, treat pending data as an _erorr_.
+ * While checking the socket, treat pending data as an _error_.
  * This flag will be _missing_ if the socket participates in a protocol
  * where unsolicited data is possible.
  *
@@ -976,12 +976,12 @@ lcb_iops_wire_bsd_impl2(lcb_bsd_procs *procs, int version);
  * @committed
  */
 typedef enum {
-    LCB_IO_OPS_INVALID = 0x00, /**< @private */
-    LCB_IO_OPS_DEFAULT = 0x01, /**< @private */
+    LCB_IO_OPS_INVALID = 0x00, /**< @internal */
+    LCB_IO_OPS_DEFAULT = 0x01, /**< @internal */
 
     /** Integrate with the libevent loop. See lcb_create_libevent_io_opts() */
     LCB_IO_OPS_LIBEVENT = 0x02,
-    LCB_IO_OPS_WINSOCK = 0x03, /**< @private */
+    LCB_IO_OPS_WINSOCK = 0x03, /**< @internal */
     LCB_IO_OPS_LIBEV = 0x04,
     LCB_IO_OPS_SELECT = 0x05,
     LCB_IO_OPS_WINIOCP = 0x06,
@@ -1000,7 +1000,7 @@ typedef struct { const char *sofile; const char *symbol; void *cookie; } lcb_IOC
 typedef struct { lcb_io_create_fn create; void *cookie; } lcb_IOCREATEOPS_FUNCTIONPOINTER;
 #endif
 
-/** @uncommited */
+/** @uncommitted */
 struct lcb_create_io_ops_st {
     int version;
     union {

data/ext/libcouchbase/include/libcouchbase/ixmgmt.h

@@ -103,14 +103,14 @@ typedef struct {
 } lcb_N1XSPEC;
 
 /** Input/Output flag. The index is the primary index for the bucket */
-#define LCB_N1XSPEC_F_PRIMARY 1<<16
+#define LCB_N1XSPEC_F_PRIMARY (1 << 16)
 
 /**
  * Input flag for creation. Defer the index building until later. This may
  * be used to accelerate the building of multiple indexes, so that the index
  * builder can construct all indexes by scanning items only once
  */
-#define LCB_N1XSPEC_F_DEFER 1<<17
+#define LCB_N1XSPEC_F_DEFER (1 << 17)
 
 /**
  * Input for index type. It's best to just leave this value to 0 (DEFAULT)

data/ext/libcouchbase/include/libcouchbase/n1ql.h

@@ -1,5 +1,5 @@
 /*
- *     Copyright 2015 Couchbase, Inc.
+ *     Copyright 2017 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@ lcb_n1p_free(lcb_N1QLPARAMS *params);
 /** Query is a statement string */
 #define LCB_N1P_QUERY_STATEMENT 1
 
-/** @private */
+/** @internal */
 #define LCB_N1P_QUERY_PREPARED 2
 
 /**
@@ -112,6 +112,7 @@ LIBCOUCHBASE_API
 lcb_error_t
 lcb_n1p_setquery(lcb_N1QLPARAMS *params, const char *qstr, size_t nqstr, int type);
 
+/** Shortcut to set NUL-terminated string as statement via @ref lcb_n1p_setquery */
 #define lcb_n1p_setstmtz(params, qstr) \
     lcb_n1p_setquery(params, qstr, -1, LCB_N1P_QUERY_STATEMENT)
 
@@ -128,6 +129,7 @@ lcb_error_t
 lcb_n1p_namedparam(lcb_N1QLPARAMS *params, const char *name, size_t n_name,
     const char *value, size_t n_value);
 
+/** Shortcut to set NUL-terminated string as named param via @ref lcb_n1p_namedparam */
 #define lcb_n1p_namedparamz(params, name, value) \
     lcb_n1p_namedparam(params, name, -1, value, -1)
 
@@ -141,6 +143,66 @@ LIBCOUCHBASE_API
 lcb_error_t
 lcb_n1p_posparam(lcb_N1QLPARAMS *params, const char *value, size_t n_value);
 
+
+/**
+ * Marks query as read-only.
+ *
+ * If the user knows the request is only ever a select, for security
+ * reasons it can make sense to tell the server this thing is readonly
+ * and it will prevent mutations from happening.
+ *
+ * If readonly is set, then the following statements are not allowed:
+ *   * CREATE INDEX
+ *   * DROP INDEX
+ *   * INSERT
+ *   * MERGE
+ *   * UPDATE
+ *   * UPSERT
+ *   * DELETE
+ *
+ * @param params the params object
+ * @param readonly if non-zero, the query will be read-only
+ */
+LIBCOUCHBASE_API
+lcb_error_t
+lcb_n1p_readonly(lcb_N1QLPARAMS *params, int readonly);
+
+/**
+ * Sets maximum buffered channel size between the indexer client
+ * and the query service for index scans.
+ *
+ * This parameter controls when to use scan backfill. Use 0 or
+ * a negative number to disable.
+ *
+ * @param params the params object
+ * @param scancap channel size
+ */
+LIBCOUCHBASE_API
+lcb_error_t
+lcb_n1p_scancap(lcb_N1QLPARAMS *params, int scancap);
+
+/**
+ * Sets maximum number of items each execution operator can buffer
+ * between various operators.
+ *
+ * @param params the params object
+ * @param pipelinecap number of items
+ */
+LIBCOUCHBASE_API
+lcb_error_t
+lcb_n1p_pipelinecap(lcb_N1QLPARAMS *params, int pipelinecap);
+
+/**
+ * Sets the number of items execution operators can batch for
+ * fetch from the KV.
+ *
+ * @param params the params object
+ * @param pipelinebatch number of items
+ */
+LIBCOUCHBASE_API
+lcb_error_t
+lcb_n1p_pipelinebatch(lcb_N1QLPARAMS *params, int pipelinebatch);
+
 /**
  * Set a query option
  * @param params the params object
@@ -256,19 +318,19 @@ lcb_n1p_mkcmd(lcb_N1QLPARAMS *params, lcb_CMDN1QL *cmd);
  * Prepare and cache the query if required. This may be used on frequently
  * issued queries, so they perform better.
  */
-#define LCB_CMDN1QL_F_PREPCACHE 1<<16
+#define LCB_CMDN1QL_F_PREPCACHE (1 << 16)
 
-/** @private The lcb_CMDN1QL::query member is an internal JSON structure */
-#define LCB_CMDN1QL_F_JSONQUERY 1<<17
+/** The lcb_CMDN1QL::query member is an internal JSON structure. @internal */
+#define LCB_CMDN1QL_F_JSONQUERY (1 << 17)
 
 /**
  * This is an analytics query. Use the `host` field to specify the host/port
  * to target. When this flag is set, things like prepared queries and
  * parametrized statements will not work.
  *
- * @uncommited
+ * @uncommitted
  */
-#define LCB_CMDN1QL_F_CBASQUERY 1<<18
+#define LCB_CMDN1QL_F_CBASQUERY (1 << 18)
 
 /**
  * Command structure for N1QL queries. Typically an application will use the

data/ext/libcouchbase/include/libcouchbase/vbucket.h

@@ -52,6 +52,7 @@ typedef enum {
     LCBVB_SVCTYPE_IXADMIN, /**< Index administration */
     LCBVB_SVCTYPE_N1QL, /**< N1QL Query */
     LCBVB_SVCTYPE_FTS, /**< Fulltext */
+    LCBVB_SVCTYPE_CBAS, /**< Analytics Query */
     LCBVB_SVCTYPE__MAX
 } lcbvb_SVCTYPE;
 
@@ -75,9 +76,11 @@ typedef struct {
     lcb_U16 ixadmin; /**< Indexing admin port (HTTP) */
     lcb_U16 n1ql; /**< Query port */
     lcb_U16 fts; /**< CBFT */
+    lcb_U16 cbas; /**< CBAS (Analytics) */
     char *views_base_; /**< Views base URL */
     char *query_base_; /**< N1QL base URL */
     char *fts_base_;
+    char *cbas_base_;
     char *hoststrs[LCBVB_SVCTYPE__MAX];
 } lcbvb_SERVICES;
 
@@ -96,6 +99,7 @@ typedef struct {
     char *viewpath; /**< Path prefix for view queries */
     char *querypath; /**< Path prefix for n1ql queries */
     char *ftspath; /**< Path prefix for fulltext queries */
+    char *cbaspath; /**< Path prefix for analytics queries */
     unsigned nvbs; /**< Total number of vbuckets the server has assigned */
 } lcbvb_SERVER;
 
@@ -117,6 +121,17 @@ typedef enum {
     LCBVB_DIST_KETAMA = 1 /**< Ketama hashing ("memcached") bucket */
 } lcbvb_DISTMODE;
 
+typedef enum {
+    LCBVB_CAP_XATTR = 0x01,
+    LCBVB_CAP_CBHELLO = 0x02,
+    LCBVB_CAP_CCCP = 0x04,
+    LCBVB_CAP_COUCHAPI = 0x08,
+    LCBVB_CAP_DCP = 0x10,
+    LCBVB_CAP_NODES_EXT = 0x20,
+    LCBVB_CAP_TOUCH = 0x40,
+    LCBVB_CAP_XDCR_CHECKPOINTING = 0x80
+} lcbvb_BUCKET_CAPABILITIES;
+
 /**@volatile. ABI/API compatibility not guaranteed between versions.
  * @brief Structure containing the configuration.*/
 typedef struct lcbvb_CONFIG_st {
@@ -136,6 +151,7 @@ typedef struct lcbvb_CONFIG_st {
     lcbvb_VBUCKET *ffvbuckets; /* fast-forward map */
     lcbvb_CONTINUUM *continuum; /* ketama continuums */
     int *randbuf; /* Used for random server selection */
+    long caps; /**< Server capabilities */
 } lcbvb_CONFIG;
 
 
@@ -143,6 +159,7 @@ typedef struct lcbvb_CONFIG_st {
 #define LCBVB_NDATASERVERS(cfg) (cfg)->ndatasrv
 #define LCBVB_NREPLICAS(cfg) (cfg)->nrepl
 #define LCBVB_DISTTYPE(cfg) (cfg)->dtype
+#define LCBVB_CAPS(cfg) (cfg)->caps
 #define LCBVB_GET_SERVER(conf, ix) ((conf)->servers + ix)
 
 /**

data/ext/libcouchbase/include/libcouchbase/views.h

@@ -57,14 +57,14 @@ typedef void (*lcb_VIEWQUERYCALLBACK)(lcb_t instance,
         int cbtype, const lcb_RESPVIEWQUERY *row);
 
 /** Set this flag to execute an actual get with each response */
-#define LCB_CMDVIEWQUERY_F_INCLUDE_DOCS 1 << 16
+#define LCB_CMDVIEWQUERY_F_INCLUDE_DOCS (1 << 16)
 
 /**Set this flag to only parse the top level row, and not its constituent
  * parts. Note this is incompatible with `F_INCLUDE_DOCS`*/
-#define LCB_CMDVIEWQUERY_F_NOROWPARSE 1 << 17
+#define LCB_CMDVIEWQUERY_F_NOROWPARSE (1 << 17)
 
 /**This view is spatial. Modifies how the final view path will be constructed */
-#define LCB_CMDVIEWQUERY_F_SPATIAL 1 << 18
+#define LCB_CMDVIEWQUERY_F_SPATIAL (1 << 18)
 
 /** Command structure for querying a view */
 typedef struct {

data/ext/libcouchbase/include/memcached/protocol_binary.h

@@ -99,7 +99,13 @@ extern "C"
         PROTOCOL_BINARY_RESPONSE_DELTA_BADVAL = 0x06,
         /** The server is not responsible for the requested vbucket */
         PROTOCOL_BINARY_RESPONSE_NOT_MY_VBUCKET = 0x07,
+        /** Not connected to a bucket */
+        PROTOCOL_BINARY_RESPONSE_NO_BUCKET = 0x08,
+        /** The requested resource is locked */
+        PROTOCOL_BINARY_RESPONSE_LOCKED = 0x09,
 
+        /** The authentication context is stale. You should reauthenticate*/
+        PROTOCOL_BINARY_RESPONSE_AUTH_STALE = 0x1f,
         /** Authentication failure (invalid user/password combination,
          * OR an internal error in the authentication library. Could
          * be a misconfigured SASL configuration. See server logs for
@@ -113,6 +119,10 @@ extern "C"
 
         /** No access (could be opcode, value, bucket etc) */
         PROTOCOL_BINARY_RESPONSE_EACCESS = 0x24,
+        /** The Couchbase cluster is currently initializing this
+         * node, and the Cluster manager has not yet granted all
+         * users access to the cluster. */
+        PROTOCOL_BINARY_RESPONSE_NOT_INITIALIZED = 0x25,
 
         /** The server have no idea what this command is for */
         PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND = 0x81,
@@ -136,6 +146,11 @@ extern "C"
          * etc).
          */
         PROTOCOL_BINARY_RESPONSE_ETMPFAIL = 0x86,
+        /**
+         * There is something wrong with the syntax of the provided
+         * XATTR.
+         */
+        PROTOCOL_BINARY_RESPONSE_XATTR_EINVAL = 0x87,
 
         /*
          * Sub-document specific responses.
@@ -191,8 +206,53 @@ extern "C"
          * found, but one or more path operations failed. Examine the individual
          * lookup_result (MULTI_LOOKUP) / mutation_result (MULTI_MUTATION)
          * structures for details. */
-        PROTOCOL_BINARY_RESPONSE_SUBDOC_MULTI_PATH_FAILURE = 0xcc
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_MULTI_PATH_FAILURE = 0xcc,
 
+        /**
+         * The operation completed successfully, but operated on a deleted
+         * document.
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_SUCCESS_DELETED = 0xcd,
+
+        /**
+         * The combination of the subdoc flags for the xattrs doesn't make
+         * any sense
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_XATTR_INVALID_FLAG_COMBO = 0xce,
+
+        /**
+         * Only a single xattr key may be accessed at the same time.
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_XATTR_INVALID_KEY_COMBO = 0xcf,
+
+        /**
+         * The server has no knowledge of the requested macro
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_XATTR_UNKNOWN_MACRO = 0xd0,
+
+        /**
+         * The server has no knowledge of the requested virtual xattr
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_XATTR_UNKNOWN_VATTR = 0xd1,
+
+        /**
+         * Virtual xattrs can't be modified
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_XATTR_CANT_MODIFY_VATTR = 0xd2,
+
+        /**
+         * [For multi-path commands only] Specified key was found as a
+         * Deleted document, but one or more path operations
+         * failed. Examine the individual lookup_result (MULTI_LOOKUP) /
+         * mutation_result (MULTI_MUTATION) structures for details.
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_MULTI_PATH_FAILURE_DELETED = 0xd3,
+
+        /**
+         * According to the spec all xattr commands should come first,
+         * followed by the commands for the document body
+         */
+        PROTOCOL_BINARY_RESPONSE_SUBDOC_INVALID_XATTR_ORDER = 0xd4
     } protocol_binary_response_status;
 
     /**
@@ -209,6 +269,7 @@ extern "C"
         PROTOCOL_BINARY_CMD_DECREMENT = 0x06,
         PROTOCOL_BINARY_CMD_FLUSH = 0x08,
         PROTOCOL_BINARY_CMD_GETQ = 0x09 /* Used in tests */,
+        PROTOCOL_BINARY_CMD_NOOP = 0x0a,
         PROTOCOL_BINARY_CMD_VERSION = 0x0b,
         PROTOCOL_BINARY_CMD_APPEND = 0x0e,
         PROTOCOL_BINARY_CMD_PREPEND = 0x0f,

data/ext/libcouchbase/packaging/deb/control

@@ -64,7 +64,7 @@ Description: library for the Couchbase protocol, development files
 Package: libcouchbase2-bin
 Section: utils
 Architecture: any
-Depends: libcouchbase2-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libcouchbase2-core (= ${binary:Version}), libcouchbase2-libevent (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libcouchbase1-bin
 Description: library for the Couchbase protocol
  libcouchbase is a library implementing Couchbase protocol.

data/ext/libcouchbase/packaging/rpm/libcouchbase.spec.in

@@ -1,79 +1,80 @@
-Summary: Couchbase Client & Protocol Library
+Summary: Client and protocol library for the Couchbase project
 Name: libcouchbase
 Version: @VERSION@
 Release: @RELEASE@%{?dist}
 Vendor: Couchbase, Inc.
 Packager: Couchbase SDK Team <support@couchbase.com>
-License: Apache-2
+License: ASL 2.0
 Group: System Environment/Libraries
-%if %{?fedora}0 >= 180 || %{?rhel}0 >= 60
+BuildRequires: gcc, gcc-c++
 BuildRequires: cmake >= 2.8.9
-%else
-BuildRequires: cmake28
-%endif
-BuildRequires: libevent-devel >= 1.4, libev-devel >= 3, openssl-devel
-URL: https://github.com/couchbase/libcouchbase
-Source: @TARREDAS@.tar.gz
+BuildRequires: pkgconfig(libevent) >= 2
+BuildRequires: libev-devel >= 3
+BuildRequires: openssl-devel
+URL: https://developer.couchbase.com/server/other-products/release-notes-archives/c-sdk
+Source: https://packages.couchbase.com/clients/c/@TARREDAS@.tar.gz
 BuildRoot: %{_topdir}/build/@TARREDAS@
+%if ! (0%{?rhel} && 0%{?rhel} <= 7)
+Recommends: %{name}2-libevent%{_isa} = %{version}-%{release}
+Suggests: %{name}2-libev%{_isa} = %{version}-%{release}
+Suggests: %{name}2-tools%{_isa} = %{version}-%{release}
+%endif
 
 %description
 This is the client and protocol library for Couchbase project.
 
 %package -n %{name}2-libevent
 Group: System Environment/Libraries
-Summary: Couchbase Client & Protocol Library (libevent backend)
-Requires: %{name}2-core = %{version}-%{release}, libevent >= 1.4
+Summary: Couchbase client library - libevent IO back-end
+Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description -n %{name}2-libevent
-This package provides libevent backend for libcouchbase
+This package provides libevent back-end for libcouchbase
 
 %package -n %{name}2-libev
 Group: System Environment/Libraries
-Summary: Couchbase Client & Protocol Library (libev backend)
-Requires: %{name}2-core = %{version}-%{release}, libev >= 3
+Summary: Couchbase client library - libev IO back-end
+Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description -n %{name}2-libev
-This package provides libev backend for libcouchbase
+This package provides libev back-end for libcouchbase
 
 %package -n %{name}2-core
 Group: System Environment/Libraries
-Summary: Couchbase Client & Protocol Library (core)
-Provides: %{name}2
+Summary: Couchbase client library - core
+Provides: %{name}2%{?_isa} = %{version}-%{release}
 %description -n %{name}2-core
 This package provides the core for libcouchbase. It contains an IO
 implementation based on select(2). If preferred, you can install one
-of the available backends (libcouchbase2-libevent or
+of the available back-ends (libcouchbase2-libevent or
 libcouchbase2-libev).  libcouchbase will automatically use the
-installed backend. It is also possible to integrate another IO backend
+installed back-end. It is also possible to integrate another IO back-end
 or write your own.
 
 %package -n %{name}2-bin
 Group: Development/Tools
 Summary: Couchbase Client Tools
-Requires: %{name}2-core = %{version}-%{release}
+Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description -n %{name}2-bin
 This is the CLI tools Couchbase project.
 
 %package devel
 Group: Development/Libraries
 Summary: Couchbase Client & Protocol Library - Header files
-Requires: %{name}2-core = %{version}-%{release}
+Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description devel
 Development files for the Couchbase Client & Protocol Library
 
 %prep
-%if 0%{?rhel} > 5 || 0%{?fedora} > 7
-%define __lcb_cmake %cmake
-%else
-%define __lcb_cmake %cmake28
-%endif
-
 %setup -q -n @TARREDAS@
-%{__lcb_cmake} -DLCB_NO_TESTS=1 -DLCB_BUILD_LIBUV=OFF
+%cmake -DLCB_NO_MOCK=1 -DLCB_BUILD_LIBUV=OFF
 
 %build
-%{__make} %{_smp_mflags}
+%make_build
 
 %install
-%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
+%make_install
+
+%check
+make test
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -84,16 +85,16 @@ Development files for the Couchbase Client & Protocol Library
 
 %files -n %{name}2-core
 %defattr(-, root, root)
-%{_libdir}/libcouchbase.so.*
+%{_libdir}/%{name}.so.*
 %doc README.markdown LICENSE RELEASE_NOTES.markdown
 
 %files -n %{name}2-libevent
 %defattr(-, root, root)
-%{_libdir}/libcouchbase_libevent.so
+%{_libdir}/%{name}_libevent.so
 
 %files -n %{name}2-libev
 %defattr(-, root, root)
-%{_libdir}/libcouchbase_libev.so
+%{_libdir}/%{name}_libev.so
 
 %files -n %{name}2-bin
 %defattr(-, root, root)
@@ -103,6 +104,6 @@ Development files for the Couchbase Client & Protocol Library
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/libcouchbase
-%{_libdir}/libcouchbase.so
-%{_libdir}/pkgconfig/libcouchbase.pc
+%{_includedir}/%{name}
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc