From d9882e71dd84898e04aa4fb2f4f2884957d56ce3dd8761a13f7d6f18bc81fa96 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 6 May 2021 06:53:29 +0000 Subject: [PATCH 1/2] - install rpm macros in %{_rpmmacrodir} [bsc#1185661] - call spec-cleaner OBS-URL: https://build.opensuse.org/package/show/graphics/libpng16?expand=0&rev=122 --- libpng16.changes | 6 ++++++ libpng16.spec | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/libpng16.changes b/libpng16.changes index e3cd355..4e0dfb2 100644 --- a/libpng16.changes +++ b/libpng16.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 6 06:43:17 UTC 2021 - pgajdos@suse.com + +- install rpm macros in %{_rpmmacrodir} [bsc#1185661] +- call spec-cleaner + ------------------------------------------------------------------- Thu Mar 11 13:26:15 UTC 2021 - Lubos Lunak diff --git a/libpng16.spec b/libpng16.spec index d98a705..3f78a75 100644 --- a/libpng16.spec +++ b/libpng16.spec @@ -18,7 +18,6 @@ %define debug_build 0 %define asan_build 0 - %define major 1 %define minor 6 %define micro 37 @@ -111,17 +110,17 @@ export CFLAGS="$CFLAGS -Og" sed -i -e 's/^\(CFLAGS.*\)$/\1 -fsanitize=address/' \ -e 's/\(^LIBS =.*\)/\1 -lasan/' Makefile %endif -make %{?_smp_mflags} +%make_build %check -make -j1 check +%make_build -j1 check %install %make_install +#find %{buildroot} -type f -name "*.la" -delete -print rm %{buildroot}/%{_libdir}/libpng*.la mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp -a %{SOURCE3} \ - %{buildroot}%{_sysconfdir}/rpm/macros.libpng-tools +install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.libpng-tools %if %{debug_build} ||%{asan_build} install -m755 .libs/pngcp %{buildroot}/%{_bindir} %endif @@ -137,16 +136,17 @@ install -m755 .libs/pngcp %{buildroot}/%{_bindir} %{_includedir}/libpng%{branch} %{_libdir}/libpng%{branch}.so %{_libdir}/pkgconfig/libpng%{branch}.pc -%doc CHANGES README TODO ANNOUNCE LICENSE libpng-*.txt +%license LICENSE +%doc CHANGES README TODO ANNOUNCE libpng-*.txt %files compat-devel %{_bindir}/libpng-config %{_includedir}/*.h %{_libdir}/libpng.so %{_libdir}/pkgconfig/libpng.pc -%{_mandir}/man3/libpng.3%{ext_man} -%{_mandir}/man3/libpngpf.3%{ext_man} -%{_mandir}/man5/png.5%{ext_man} +%{_mandir}/man3/libpng.3%{?ext_man} +%{_mandir}/man3/libpngpf.3%{?ext_man} +%{_mandir}/man5/png.5%{?ext_man} %files tools %{_bindir}/png-fix-itxt @@ -154,6 +154,6 @@ install -m755 .libs/pngcp %{buildroot}/%{_bindir} %if %{debug_build} || %{asan_build} %{_bindir}/pngcp %endif -%{_sysconfdir}/rpm/macros.libpng-tools +%{_rpmmacrodir}/macros.libpng-tools %changelog From 49208e97284ed6a3998e88179a2d85b2c1d30e387f29fe03b8acb0cbf658c7f3 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 6 May 2021 07:41:07 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/graphics/libpng16?expand=0&rev=123 --- libpng16.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libpng16.spec b/libpng16.spec index 3f78a75..2acd822 100644 --- a/libpng16.spec +++ b/libpng16.spec @@ -117,7 +117,6 @@ sed -i -e 's/^\(CFLAGS.*\)$/\1 -fsanitize=address/' \ %install %make_install -#find %{buildroot} -type f -name "*.la" -delete -print rm %{buildroot}/%{_libdir}/libpng*.la mkdir -p %{buildroot}%{_sysconfdir}/rpm install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.libpng-tools