From cfaa48b02dfb6e2776543e9145c6663b8f65a937 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 2 May 2020 16:04:07 +0300 Subject: [PATCH 1/2] Adapt python naming for rosa2019.05 --- hplip.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hplip.spec b/hplip.spec index 7f1eb3d..c3e8331 100644 --- a/hplip.spec +++ b/hplip.spec @@ -97,7 +97,7 @@ Patch305: hpps-3.16.11-fix-syntax.patch BuildRequires: desktop-file-utils BuildRequires: imagemagick BuildRequires: polkit -BuildRequires: python2-sip >= 4.1.1 +BuildRequires: %python2-sip >= 4.1.1 BuildRequires: net-snmp-devel BuildRequires: cups-devel BuildRequires: jpeg-devel @@ -239,10 +239,10 @@ determine whether HPLIP has to be installed or not. Summary: HPLIP Python 2 modules License: GPLv2+ and MIT Requires: %{name} = %{version}-%{release} -Requires: python2-pillow -Requires: python2-dbus +Requires: %python2-pillow +Requires: %python2-dbus Requires: python -BuildRequires: python2-devel +BuildRequires: %python2-devel %description compat-libs Python 2 modules needed by HP plugin. From b55c14890effea2d00f00e8781a3371a556923b1 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Thu, 21 May 2020 11:34:33 +0300 Subject: [PATCH 2/2] bot: rpm5 -> rpm4 (11) [rosa2019.05] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (11) rosa2019.05: remove quotations from %__requires_exclude and %__provides_exclude which do not work on RPM 4 (10) rosa2019.05: %py_ -> %py2_, %{py_ -> %{py2_ (9): Adopt spec for enabled byte compiling in Python These automatic changes are done by scripts *rpm5-to-rpm4.sh at https://gitlab.com/abf-mirror/abf-mirror-scripts The goal is to adopt specs for RPM 4 to which ROSA 2019.1 has migrated from RPM 5, but keep compatibility with RPM 5. Details about migration are here: https://wiki.rosalab.ru/ru/index.php/Переход_ROSA_с_RPM_5_на_RPM_4 Contact m.novosyolov@rosalinux.ru in case of problems --- hplip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index c3e8331..d1eb977 100644 --- a/hplip.spec +++ b/hplip.spec @@ -13,7 +13,7 @@ %define devname %mklibname hpip -d # Suppress automatically generated Requires for devel packages -%global __requires_exclude 'devel\(.*\)' +%global __requires_exclude devel\(.*\) %define extraversion %nil