From 551c77d69b6903f73a1fd746ef394430f0bfe48edf48bf62ce003f80a62131cc Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 30 Mar 2020 07:45:57 +0000 Subject: [PATCH] Accepting request 786667 from home:GeoDerp:branches:graphics - Added If statments for Fedora not having sertain openSUSE macros - Added If statments for Fedora not having sertain openSUSE macros OBS-URL: https://build.opensuse.org/request/show/786667 OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=103 --- libjpeg-turbo.changes | 5 +++++ libjpeg-turbo.spec | 12 ++++++++++-- libjpeg62-turbo.changes | 5 +++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/libjpeg-turbo.changes b/libjpeg-turbo.changes index c4039fd..ca216d0 100644 --- a/libjpeg-turbo.changes +++ b/libjpeg-turbo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 17 05:52:14 UTC 2020 - John Whately + +- Added If statments for Fedora not having sertain openSUSE macros + ------------------------------------------------------------------- Tue Nov 12 14:09:12 UTC 2019 - pgajdos@suse.com diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index a8cd731..6c4ce06 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -138,10 +138,18 @@ make %{?_smp_mflags} exit 0 %endif export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -%ctest +%if 0%{?fedora_version} + ctest --output-on-failure --force-new-ctest-process +%else + %ctest +%endif %install -%cmake_install +%if 0%{?fedora_version} + make DESTDIR=%{buildroot} install/fast +%else + %cmake_install +%endif # Remove docs, we'll select docs manually rm -rf %{buildroot}%{_datadir}/doc/ diff --git a/libjpeg62-turbo.changes b/libjpeg62-turbo.changes index 87cbf53..292fad6 100644 --- a/libjpeg62-turbo.changes +++ b/libjpeg62-turbo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 17 05:52:14 UTC 2020 - John Whately + +- Added If statments for Fedora not having sertain openSUSE macros + ------------------------------------------------------------------- Sat Oct 5 09:08:29 UTC 2019 - Bjørn Lie