From 4113d0c4d5ab0b763a60b19a1d16ebe31bbd40dd9bbc3174aff18d98127f842d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 21 May 2015 18:49:13 +0000 Subject: [PATCH] Accepting request 308268 from home:dimstar:Factory Fix the ordering in the .spec; as it was, the obsoletes version does not expand %{version}, as it is not set yet at that point -> resulting in the file conflict seen at https://openqa.opensuse.org/tests/63639/modules/zdup/steps/4 (kde4-print-manager 14.x is not obsoleted) OBS-URL: https://build.opensuse.org/request/show/308268 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kde-print-manager?expand=0&rev=12 --- kde-print-manager.changes | 6 ++++ kde-print-manager.spec | 65 +++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/kde-print-manager.changes b/kde-print-manager.changes index b395815..2fd116d 100644 --- a/kde-print-manager.changes +++ b/kde-print-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 21 18:23:46 UTC 2015 - dimstar@opensuse.org + +- Re-order the preamble, especially ensure that Version: is set + before it's being used as a macro to obsolete old versions. + ------------------------------------------------------------------- Mon May 11 10:51:37 UTC 2015 - tittiatcoke@gmail.com diff --git a/kde-print-manager.spec b/kde-print-manager.spec index 857ce72..cead994 100644 --- a/kde-print-manager.spec +++ b/kde-print-manager.spec @@ -18,45 +18,44 @@ Name: kde-print-manager -BuildRequires: update-desktop-files -BuildRequires: cups -BuildRequires: cups-backends -BuildRequires: cups-client -BuildRequires: cups-devel -BuildRequires: cups-pk-helper -BuildRequires: extra-cmake-modules -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcompletion-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kiconthemes-devel -BuildRequires: knotifications-devel -BuildRequires: kdbusaddons-devel -BuildRequires: ki18n-devel -BuildRequires: kio-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: kwindowsystem-devel -BuildRequires: kcmutils-devel -BuildRequires: plasma-framework-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Designer) -BuildRequires: pkgconfig(Qt5Qml) -Url: http://dantti.wordpress.com/24.9.90/02/12/print-manager/ -Obsoletes: kde4-print-manager < %{version} -Obsoletes: print-manager5 < %{version} -Provides: print-manager5 = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A new print manager for KDE License: GPL-2.0+ Group: System/GUI/KDE Version: 15.04.1 Release: 0 Source: print-manager-%{version}.tar.xz - +BuildRequires: cups +BuildRequires: cups-backends +BuildRequires: cups-client +BuildRequires: cups-devel +BuildRequires: cups-pk-helper +BuildRequires: extra-cmake-modules +BuildRequires: kcmutils-devel +BuildRequires: kcompletion-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdbusaddons-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kio-devel +BuildRequires: knotifications-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: plasma-framework-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Widgets) +Url: http://dantti.wordpress.com/24.9.90/02/12/print-manager/ +Obsoletes: kde4-print-manager < %{version} +Obsoletes: print-manager5 < %{version} +Provides: print-manager5 = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This project aims to be a full replacement for the