[erlang-riak_api] Fix version mismatch

Peter Lemenkov peter at fedoraproject.org
Thu Aug 1 08:12:25 UTC 2013


commit aaf52a1297f6ed81154040e520bea0aec869533c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 1 11:31:14 2013 +0400

    Fix version mismatch
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 ...0001-Allow-building-against-riak_pb-1.3.x.patch |    2 +-
 erlang-riak_api-0002-Fix-version.patch             |   26 ++++++++++++++++++++
 erlang-riak_api.spec                               |   14 ++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/erlang-riak_api-0001-Allow-building-against-riak_pb-1.3.x.patch b/erlang-riak_api-0001-Allow-building-against-riak_pb-1.3.x.patch
index 585f97e..fdc3548 100644
--- a/erlang-riak_api-0001-Allow-building-against-riak_pb-1.3.x.patch
+++ b/erlang-riak_api-0001-Allow-building-against-riak_pb-1.3.x.patch
@@ -1,7 +1,7 @@
 From 287ea4524bdbc39dd10f9039b8feeeeb96e78bc5 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Mon, 11 Mar 2013 21:41:22 +0400
-Subject: [PATCH 1/1] Allow building against riak_pb 1.3.x
+Subject: [PATCH 1/2] Allow building against riak_pb 1.3.x
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
diff --git a/erlang-riak_api-0002-Fix-version.patch b/erlang-riak_api-0002-Fix-version.patch
new file mode 100644
index 0000000..0700db6
--- /dev/null
+++ b/erlang-riak_api-0002-Fix-version.patch
@@ -0,0 +1,26 @@
+From 90c521e79570ea1c02b397949ba9574d6c70fd8c Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Wed, 31 Jul 2013 23:23:50 +0400
+Subject: [PATCH 2/2] Fix version
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/riak_api.app.src | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/riak_api.app.src b/src/riak_api.app.src
+index 03731d0..cdf1488 100644
+--- a/src/riak_api.app.src
++++ b/src/riak_api.app.src
+@@ -3,7 +3,7 @@
+ {application, riak_api,
+  [
+   {description, "Riak Client APIs"},
+-  {vsn, "1.3.1"},
++  {vsn, "1.3.2"},
+   {applications, [
+                   kernel,
+                   stdlib,
+-- 
+1.8.3.1
+
diff --git a/erlang-riak_api.spec b/erlang-riak_api.spec
index 9eca0a4..166bd77 100644
--- a/erlang-riak_api.spec
+++ b/erlang-riak_api.spec
@@ -1,5 +1,11 @@
 %global realname riak_api
 %global upstream basho
+#
+# This package contains only arch-independent data but install it into
+# arch-dependent directory thus making this package arch-dependent. In order to
+# suppress empty *-debuginfo generation we have to explicitly order
+# debuginfo-generator to skip trying to build *-debuiginfo for that package.
+#
 %global debug_package %{nil}
 %global git_tag 887c63d
 %global patchnumber 0
@@ -7,7 +13,7 @@
 
 Name:		erlang-%{realname}
 Version:	1.3.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Riak Client APIs
 Group:		Development/Languages
 License:	ASL 2.0
@@ -17,6 +23,8 @@ VCS:		https://github.com/basho/riak_pb.git
 Source0:	%{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
 # Fedora/EPEL-specific
 Patch1:		erlang-riak_api-0001-Allow-building-against-riak_pb-1.3.x.patch
+# Fedora/EPEL-specific
+Patch2:		erlang-riak_api-0002-Fix-version.patch
 BuildRequires:	erlang-lager >= 1.2.2
 BuildRequires:	erlang-meck
 BuildRequires:	erlang-os_mon
@@ -42,6 +50,7 @@ later time.
 %prep
 %setup -q -n %{upstream}-%{realname}-ec168e7
 %patch1 -p1 -b .relax_deps
+%patch2 -p1 -b .fix_version
 
 
 %build
@@ -67,6 +76,9 @@ rebar eunit skip_deps=true -v
 
 
 %changelog
+* Wed Jul 31 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3.2-2
+- Fix version mismatch
+
 * Wed Jul 31 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3.2-1
 - Ver. 1.3.2
 


More information about the scm-commits mailing list