From 7ba6a54afeb6ffebd07cb5c64c9a1ee5f418e40b8b806a290584fe3c20b65960 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 1 Feb 2023 09:28:53 +0000 Subject: [PATCH 1/2] Accepting request 1062412 from home:dirkmueller:Factory - switch to pkgconfig(zlib) to allow alternative providers as well - build with glibc hwcaps optimized libs OBS-URL: https://build.opensuse.org/request/show/1062412 OBS-URL: https://build.opensuse.org/package/show/graphics/libpng16?expand=0&rev=131 --- libpng16.changes | 6 ++++++ libpng16.spec | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libpng16.changes b/libpng16.changes index 5510103..8bae45b 100644 --- a/libpng16.changes +++ b/libpng16.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 1 09:24:14 UTC 2023 - Dirk Müller + +- switch to pkgconfig(zlib) to allow alternative providers as well +- build with glibc hwcaps optimized libs + ------------------------------------------------------------------- Fri Nov 25 11:49:52 UTC 2022 - Dominique Leuenberger diff --git a/libpng16.spec b/libpng16.spec index 230462b..fae1061 100644 --- a/libpng16.spec +++ b/libpng16.spec @@ -1,7 +1,7 @@ # # spec file for package libpng16 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,8 @@ Source3: rpm-macros.libpng-tools Source4: baselibs.conf BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: zlib-devel +BuildRequires: pkgconfig(zlib) +%{?suse_build_hwcaps_libs} %package -n %{libname} Summary: Library for the Portable Network Graphics Format (PNG) @@ -50,7 +51,7 @@ Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} Requires: glibc-devel Requires: pkgconfig -Requires: zlib-devel +Requires: pkgconfig(zlib) Recommends: libpng%{branch}-compat-devel # @@ -117,7 +118,7 @@ sed -i -e 's/^\(CFLAGS.*\)$/\1 -fsanitize=address/' \ %install %make_install -rm %{buildroot}/%{_libdir}/libpng*.la +find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}%{_sysconfdir}/rpm install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.libpng-tools %if %{debug_build} ||%{asan_build} From 8fab1a6c5e9ee528074e9dd89e6f0e509e33e84bd29780febbde069c44f0f744 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 1 Feb 2023 13:25:02 +0000 Subject: [PATCH 2/2] Accepting request 1062444 from home:dimstar:Factory - Fix build: some*.la files are symlinks. Adjust spec to use find -type f,l OBS-URL: https://build.opensuse.org/request/show/1062444 OBS-URL: https://build.opensuse.org/package/show/graphics/libpng16?expand=0&rev=132 --- libpng16.changes | 6 ++++++ libpng16.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libpng16.changes b/libpng16.changes index 8bae45b..b54a416 100644 --- a/libpng16.changes +++ b/libpng16.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 1 12:18:06 UTC 2023 - Dominique Leuenberger + +- Fix build: some*.la files are symlinks. Adjust spec to use + find -type f,l + ------------------------------------------------------------------- Wed Feb 1 09:24:14 UTC 2023 - Dirk Müller diff --git a/libpng16.spec b/libpng16.spec index fae1061..4e79980 100644 --- a/libpng16.spec +++ b/libpng16.spec @@ -118,7 +118,7 @@ sed -i -e 's/^\(CFLAGS.*\)$/\1 -fsanitize=address/' \ %install %make_install -find %{buildroot} -type f -name "*.la" -delete -print +find %{buildroot} -type f,l -name "*.la" -delete -print mkdir -p %{buildroot}%{_sysconfdir}/rpm install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.libpng-tools %if %{debug_build} ||%{asan_build}