[Tizen-submit] 21528: Changes to Tizen:IVI:Genivi/rpm

noreply at tizen.org noreply at tizen.org
Mon Feb 24 23:04:04 GMT 2014


Hi,
Graydon, Tracy have made the following changes to rpm in project Tizen:IVI:Genivi. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #21528

  submit:       Tizen:IVI:Genivi:build/rpm(cleanup) -> Tizen:IVI:Genivi


Message:
Submitter: Graydon, Tracy <tracy.graydon at intel.com>
Comments: submit/tizen_ivi_genivi/20140224.230649
Git project: platform/upstream/rpm
Tag: submit/tizen_ivi_genivi/20140224.230649
Commit: a33e7f4998e69fdf60954125667b3da5ab7a9eb2 Fix the python-rpm spec to fix package build of python-rpm

State:   new        2014-02-24T23:03:43 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- python-rpm.spec
+++ python-rpm.spec
@@ -1,19 +1,11 @@
 Name:           python-rpm
-VCS:            platform/upstream/rpm#6a8d25c09836923d642a6c02e1d49d61abda9618
+VCS:            platform/upstream/rpm#a33e7f4998e69fdf60954125667b3da5ab7a9eb2
 Version:        4.11.0.1
 Release:        0
 Summary:        Python Bindings for Manipulating RPM Packages
 License:        GPL-2.0+
 Group:          System/Packages
 Source99:       rpm.spec
-# Patches auto-generated by git-buildpackage:
-Patch0:         26389a6-to-82f4df7.diff.gz
-Patch1:         0002-Security-plugin-allowing-multiple-domains-definition.patch
-Patch2:         0003-Security-plugin-pkg_name-allocation-in-conflict.patch
-Patch3:         0004-Security-plugin-support-for-root-option.patch
-Patch4:         0005-Security-plugin-removing-disable-dchecks-option.patch
-Patch5:         0006-Security-plugin-small-fixes.patch
-Patch6:         0007-Security-plugin-adding-checking-of-return-code-for-d.patch
 BuildRequires:  gettext-tools
 BuildRequires:  file-devel
 BuildRequires:  libacl-devel
@@ -33,7 +25,16 @@
 BuildRequires:  libattr-devel
 BuildRequires:  pkgconfig(libsmack)
 Requires:       rpm = %{version}
-%{expand:%(sed -n -e '/^Source0:/,/^BuildRoot:/p' <%_sourcedir/rpm.spec)}
+%{expand:%(sed -n -e '/^### SOURCES BEGIN ###/,/^### SOURCES END ###/p' <%_sourcedir/rpm.spec)}
+Source0:        rpm-%{version}.tar.bz2
+# Patches auto-generated by git-buildpackage:
+Patch0:     26389a6-to-82f4df7.diff.gz
+Patch1:     0002-Security-plugin-allowing-multiple-domains-definition.patch
+Patch2:     0003-Security-plugin-pkg_name-allocation-in-conflict.patch
+Patch3:     0004-Security-plugin-support-for-root-option.patch
+Patch4:     0005-Security-plugin-removing-disable-dchecks-option.patch
+Patch5:     0006-Security-plugin-small-fixes.patch
+Patch6:     0007-Security-plugin-adding-checking-of-return-code-for-d.patch
 %global with_python 2
 
 %description
@@ -45,6 +46,7 @@
 that will manipulate RPM packages and databases.
 
 %prep
+%setup -q -n rpm-%{version}
 # 26389a6-to-82f4df7.diff.gz
 %patch0 -p1
 # 0002-Security-plugin-allowing-multiple-domains-definition.patch
@@ -59,7 +61,10 @@
 %patch5 -p1
 # 0007-Security-plugin-adding-checking-of-return-code-for-d.patch
 %patch6 -p1
-%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%_sourcedir/rpm.spec | sed -e '1d' -e '$d')}
+%{expand:%(sed -n -e '/^### PREP BEGIN ###/,/^### PREP END ###/p' <%_sourcedir/rpm.spec)}
+
+%build
+%{expand:%(sed -n -e '/^### BUILD BEGIN ###/,/^### BUILD END ###/p' <%_sourcedir/rpm.spec)}
 
 %install
 mkdir -p %{buildroot}%{_prefix}/lib
--- rpm.spec
+++ rpm.spec
@@ -1,7 +1,7 @@
 %define rpmhome /usr/lib/rpm
 
 Name:           rpm
-VCS:            platform/upstream/rpm#6a8d25c09836923d642a6c02e1d49d61abda9618
+VCS:            platform/upstream/rpm#a33e7f4998e69fdf60954125667b3da5ab7a9eb2
 Summary:        The RPM Package Manager
 License:        GPL-2.0+
 Group:          System/Package Management
@@ -37,7 +37,8 @@
 
 Provides:       rpminst
 Provides:	    rpm-libs
-Source0:        rpm-%{version}.tar.bz2
+
+### SOURCES BEGIN ###
 Source1:       	db-4.8.30.tar.bz2
 Source2:	    db-4.8.30-integration.dif

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list