From 1ea5e70a92f7718aaebf36807e4b8a415c9ab8cdd826c941ee0ddfe74285d8e4 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 3 Jan 2017 08:47:46 +0000 Subject: [PATCH] Accepting request 448588 from home:mlin7442:32bitunistring add baselibs.conf, newer gnutls now build requires libunistring and its 32bit binary missing libunistring 32bit binary, thus broke the upgrade case OBS-URL: https://build.opensuse.org/request/show/448588 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libunistring?expand=0&rev=28 --- baselibs.conf | 4 ++++ libunistring.changes | 5 +++++ libunistring.spec | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..752eb69 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,4 @@ +libunistring2 +libunistring-devel + requires -libunistring- + requires "libunistring2- = " diff --git a/libunistring.changes b/libunistring.changes index a554c07..0014baf 100644 --- a/libunistring.changes +++ b/libunistring.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 3 07:39:31 UTC 2017 - mlin@suse.com + +- Add baselibs.conf to generate -32bit packages + ------------------------------------------------------------------- Sun Dec 18 18:11:26 UTC 2016 - astieger@suse.com diff --git a/libunistring.spec b/libunistring.spec index df4dbc2..0c9937a 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,7 +1,7 @@ # # spec file for package libunistring # -# 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 @@ -27,6 +27,7 @@ Url: http://www.gnu.org/software/libunistring/ Source0: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar.xz Source1: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar.xz.sig Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libunistring&download=1#/%{name}.keyring +Source3: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?suse_version } == 1110 BuildRequires: xz