From: biao716.wang <biao716.wang@samsung.com>
Date: Thu, 21 Sep 2023 09:31:14 +0000 (+0900)
Subject: fix git-buildpackage to adapt the librpm-tizen 4.14 version
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1f8a02989b46be60fe01a2745ef5103376ee21e;p=tools%2Fgit-buildpackage.git

fix git-buildpackage to adapt the librpm-tizen 4.14 version

Change-Id: I831852903f2657f8ecd043badf2ff1ae7cbf5dc2
Signed-off-by: biao716.wang <biao716.wang@samsung.com>
---

diff --git a/gbp/__init__.py b/gbp/__init__.py
old mode 100755
new mode 100644
diff --git a/gbp/paths.py b/gbp/paths.py
old mode 100755
new mode 100644
diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py
index 926f66e4..a4e6b791 100644
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -65,10 +65,10 @@ class SrcRpmFile(object):
     """Keeps all needed data read from a source rpm"""
     def __init__(self, srpmfile):
         # Do not required signed packages to be able to import
-        ts_vsflags = (librpm.RPMVSF_NOMD5HEADER | librpm.RPMVSF_NORSAHEADER |
+        ts_vsflags = (librpm.RPMVSF_NOSHA256HEADER | librpm.RPMVSF_NORSAHEADER |
                       librpm.RPMVSF_NOSHA1HEADER | librpm.RPMVSF_NODSAHEADER |
                       librpm.RPMVSF_NOMD5 | librpm.RPMVSF_NORSA |
-                      librpm.RPMVSF_NOSHA1 | librpm.RPMVSF_NODSA)
+                      librpm.RPMVSF_NOPAYLOAD | librpm.RPMVSF_NODSA)
         srpmfp = open(srpmfile)
         self.rpmhdr = librpm.ts(vsflags=ts_vsflags).hdrFromFdno(srpmfp.fileno())
         srpmfp.close()
@@ -77,8 +77,8 @@ class SrcRpmFile(object):
     @property
     def version(self):
         """Get the (downstream) version of the RPM package"""
-        version = dict(upstreamversion=self.rpmhdr[librpm.RPMTAG_VERSION].decode(),
-                       release=self.rpmhdr[librpm.RPMTAG_RELEASE].decode())
+        version = dict(upstreamversion=self.rpmhdr[librpm.RPMTAG_VERSION],
+                       release=self.rpmhdr[librpm.RPMTAG_RELEASE])
         if self.rpmhdr[librpm.RPMTAG_EPOCH] is not None:
             version['epoch'] = str(self.rpmhdr[librpm.RPMTAG_EPOCH])
         return version
@@ -86,17 +86,17 @@ class SrcRpmFile(object):
     @property
     def name(self):
         """Get the name of the RPM package"""
-        return self.rpmhdr[librpm.RPMTAG_NAME].decode()
+        return self.rpmhdr[librpm.RPMTAG_NAME]
 
     @property
     def upstreamversion(self):
         """Get the upstream version of the RPM package"""
-        return self.rpmhdr[librpm.RPMTAG_VERSION].decode()
+        return self.rpmhdr[librpm.RPMTAG_VERSION]
 
     @property
     def packager(self):
         """Get the packager of the RPM package"""
-        return _decode(self.rpmhdr[librpm.RPMTAG_PACKAGER])
+        return self.rpmhdr[librpm.RPMTAG_PACKAGER]
 
     def unpack(self, dest_dir):
         """
@@ -164,13 +164,13 @@ class SpecFile(object):
 
         # Other initializations
         source_header = self._specinfo.packages[0].header
-        self.name = source_header[librpm.RPMTAG_NAME].decode()
-        self.upstreamversion = source_header[librpm.RPMTAG_VERSION].decode()
-        self.release = source_header[librpm.RPMTAG_RELEASE].decode()
+        self.name = source_header[librpm.RPMTAG_NAME]
+        self.upstreamversion = source_header[librpm.RPMTAG_VERSION]
+        self.release = source_header[librpm.RPMTAG_RELEASE]
         # rpm-python returns epoch as 'long', convert that to string
         self.epoch = str(source_header[librpm.RPMTAG_EPOCH]) \
             if source_header[librpm.RPMTAG_EPOCH] is not None else None
-        self.packager = _decode(source_header[librpm.RPMTAG_PACKAGER])
+        self.packager = source_header[librpm.RPMTAG_PACKAGER]
         self._tags = {}
         self._special_directives = defaultdict(list)
         self._gbp_tags = defaultdict(list)
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
old mode 100755
new mode 100644
diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py
old mode 100755
new mode 100644
diff --git a/gbp/scripts/config.py b/gbp/scripts/config.py
old mode 100755
new mode 100644
diff --git a/gbp/scripts/import_orig_rpm.py b/gbp/scripts/import_orig_rpm.py
old mode 100755
new mode 100644
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
old mode 100755
new mode 100644
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
old mode 100755
new mode 100644
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
old mode 100755
new mode 100644
diff --git a/gbp/scripts/rpm_ch.py b/gbp/scripts/rpm_ch.py
old mode 100755
new mode 100644
diff --git a/gbp/version.py b/gbp/version.py
index a4f16706..0ba64577 100644
--- a/gbp/version.py
+++ b/gbp/version.py
@@ -1,2 +1,2 @@
 "The current gbp version number"
-gbp_version="0.0"
+gbp_version = "0.9.26-tizen20221104"