Rebase on top of latest Tizen 3.0 code

Change-Id: Ie9de5638834ec6486c73427f6bd6b315dcb8eaec
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/debian/changelog b/debian/changelog
index 5022d0df69bd9e2170ccfa294177a753357e1393..55291f9e7cec1543dc12724e10db1568446366c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librpm-tizen (4.11.0.1.tizen20140530-tizen20140611) UNRELEASED; urgency=low
+
+  * Rebase on latest Tizen 3.0
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Wed, 11 Jun 2014 17:50:05 +0300
+
 librpm-tizen (4.11.0.1.tizen20130618-tizen20140306) unstable; urgency=low
 
   [ Markus Lehtonen ]

diff --git a/packaging/librpm-tizen.changes b/packaging/librpm-tizen.changes
index e2fdad281a9681af79e4435e073a7a2b4348a01b..35f542e0ac18ce12f684da0eeb5434c1ef51da3b 100644 (file)
--- a/packaging/librpm-tizen.changes
+++ b/packaging/librpm-tizen.changes
@@ -1,3 +1,6 @@
+* Wed Jun 11 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/4.11.0.1.tizen20140530-38-g7bf2b1d
+- Rebase on latest Tizen 3.0
+
 * Thu Mar 06 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen-tools/4.11.0.1.tizen20130618-20140306
 - Fix build against Lua 5.2
 

diff --git a/packaging/librpm-tizen.spec b/packaging/librpm-tizen.spec
index 5363c496a18a7f884ab965e871a812136878fe94..c82ca111f0741d5d6e660cc0aa26f775b40fa451 100644 (file)
--- a/packaging/librpm-tizen.spec
+++ b/packaging/librpm-tizen.spec
@@ -5,7 +5,7 @@ Name:           librpm-tizen
 Summary:        The RPM libraries for git-buildpackage
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-Version:        4.11.0.1.tizen20130618
+Version:        4.11.0.1.tizen20140530
 Release:        0
 Url:            http://www.rpm.org
 BuildRequires:  binutils
@@ -60,7 +60,7 @@ Source1001:    rpm.manifest
 Source0:        rpm-%{version}.tar.gz
 AutoReqProv:    No
 
-Provides:       rpm-tizen = %{version}-tizen20140306
+Provides:       rpm-tizen = %{version}-tizen20140611
 #
 # avoid bootstrapping problem
 %define _binary_payload w9.bzdio