commit libp11 for openSUSE:Factory
Hello community, here is the log from the commit of package libp11 for openSUSE:Factory checked in at 2018-01-31 19:54:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libp11 (Old) and /work/SRC/openSUSE:Factory/.libp11.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libp11" Wed Jan 31 19:54:16 2018 rev:28 rq:571358 version:0.4.7 Changes: -------- --- /work/SRC/openSUSE:Factory/libp11/libp11.changes 2017-08-24 18:29:08.729940722 +0200 +++ /work/SRC/openSUSE:Factory/.libp11.new/libp11.changes 2018-01-31 19:54:17.170796046 +0100 @@ -1,0 +2,9 @@ +Wed Jan 17 11:31:42 UTC 2018 - dimstar@opensuse.org + +- Conditionalize libname to libp11-2 for suse_version < 1500 (using + openssl 1.0) / libp11-3 for suse_version >= 1500 (using + openssl 1.1). +- Create baselibs.conf dynamically, since the library name can be + different. Drop the static baselibs.conf. + +------------------------------------------------------------------- Old: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libp11.spec ++++++ --- /var/tmp/diff_new_pack.XIbMH3/_old 2018-01-31 19:54:17.798766842 +0100 +++ /var/tmp/diff_new_pack.XIbMH3/_new 2018-01-31 19:54:17.802766656 +0100 @@ -1,7 +1,7 @@ # # spec file for package libp11 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,7 +16,14 @@ # +# the libname depends on what version openssl it is linked against +%if 0%{?suse_version} < 1500 +# libp11.so.2 for openssl 1.0 - suse_version < 1500 %define libname libp11-2 +%else +# libp11.so.3 for openssl 1.1 - suse_version >= 1500 +%define libname libp11-3 +%endif Name: libp11 Version: 0.4.7 Release: 0 @@ -28,7 +35,6 @@ Source1: https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: %{name}-rpmlintrc -Source4: baselibs.conf BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: pkgconfig(openssl) @@ -94,6 +100,8 @@ %prep %setup -q +# Since the library name changes based on used openssl, we have to create baselibs.conf dynamically +echo %{libname} > %{_sourcedir}/baselibs.conf %build %configure \
participants (1)
-
root@hilbert.suse.de