From 969ff309fb92d9155c5c7d2e441c9e18129bf32a04a80cdf93cdbd867940e3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 2 Jan 2018 10:06:45 +0000 Subject: [PATCH] - remove shebang from pythondistdeps.py new patch: pythondistdeps.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=428 --- python-rpm.spec | 2 +- pythondistdeps.diff | 7 +++++++ rpm.changes | 6 ++++++ rpm.spec | 4 +++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pythondistdeps.diff diff --git a/python-rpm.spec b/python-rpm.spec index e7ceccd..0a05904 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 Neal Gompa . # # All modifications and additions to the file contributed by third parties diff --git a/pythondistdeps.diff b/pythondistdeps.diff new file mode 100644 index 0000000..7324049 --- /dev/null +++ b/pythondistdeps.diff @@ -0,0 +1,7 @@ +--- ./scripts/pythondistdeps.py.orig 2018-01-02 10:03:28.273247676 +0000 ++++ ./scripts/pythondistdeps.py 2018-01-02 10:03:41.527207759 +0000 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # Copyright 2010 Per Øyvind Karlsen diff --git a/rpm.changes b/rpm.changes index 2b03d27..992fbbb 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 2 11:04:52 CET 2018 - mls@suse.de + +- remove shebang from pythondistdeps.py + new patch: pythondistdeps.diff + ------------------------------------------------------------------- Tue Dec 19 09:39:25 UTC 2017 - jengelh@inai.de diff --git a/rpm.spec b/rpm.spec index 3a18457..8e91f18 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -132,6 +132,7 @@ Patch105: rofs.diff Patch106: transfiletriggerpostun.diff Patch107: hardlink.diff Patch108: debugedit-macro.diff +Patch109: pythondistdeps.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -228,6 +229,7 @@ rm -f rpmdb/db.h %patch -P 85 %patch -P 93 -P 94 -P 99 %patch -P 100 -P 102 -P 103 -P 104 -P 105 -P 106 -P 107 -P 108 +%patch -P 109 %ifarch aarch64 ppc64le %patch6464