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
This commit is contained in:
Hrvoje Senjan 2015-05-21 18:49:13 +00:00 committed by Git OBS Bridge
parent 5bf65d8160
commit 4113d0c4d5
2 changed files with 38 additions and 33 deletions

View File

@ -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

View File

@ -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