From 9055d140600227a119d61b1e82bc2a815dbe6970a5fcccc218a95b16ca5ab136 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Mon, 17 Apr 2017 08:24:10 +0000 Subject: [PATCH] Accepting request 487175 from science:HPC Add missing changelog entry OBS-URL: https://build.opensuse.org/request/show/487175 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/infinipath-psm?expand=0&rev=8 --- infinipath-psm.changes | 10 ++++++++++ infinipath-psm.spec | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/infinipath-psm.changes b/infinipath-psm.changes index 3817103..8b73d52 100644 --- a/infinipath-psm.changes +++ b/infinipath-psm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 11 09:17:06 CEST 2017 - pth@suse.de + +- Update to latest version (fate#320170). + +------------------------------------------------------------------- +Fri Mar 31 12:05:18 CEST 2017 - pth@suse.de + +- Make package conflict with libpsm2 (fate#321230). + ------------------------------------------------------------------- Wed Nov 30 14:42:24 CET 2016 - pth@suse.de diff --git a/infinipath-psm.spec b/infinipath-psm.spec index cea6916..b4be7cc 100644 --- a/infinipath-psm.spec +++ b/infinipath-psm.spec @@ -1,7 +1,7 @@ # # spec file for package infinipath-psm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -35,6 +35,7 @@ Patch1: infinipath-psm-no_werror.patch Patch3: infinipath-psm-executable_headers.patch BuildRequires: libuuid-devel Conflicts: infinipath-libs +Conflicts: libpsm2-compat ExclusiveArch: %ix86 x86_64 %define so_major 4 @@ -56,6 +57,7 @@ Requires: %{lnamepsm} = %{version} Requires: %{lname} = %{version} Requires: libuuid-devel Conflicts: infinipath-devel +Conflicts: libpsm2-devel %description devel Development files for the libpsm_infinipath library