From 97be0b9ea772edd6c8b9010e9887d9761fdde651b80bd81cac7e8dd830338be4 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Wed, 27 Nov 2013 22:00:01 +0000 Subject: [PATCH] Accepting request 208650 from home:gberh:branches:graphics this addresses the points from https://build.opensuse.org/request/show/206852 execept that %cmake and %cmake_install are not used because that breaks < 13.1, note that this does NOT break the build on SLE since it cannot be built on SLE anyway because it requires a newer cmake OBS-URL: https://build.opensuse.org/request/show/208650 OBS-URL: https://build.opensuse.org/package/show/graphics/openjpeg2?expand=0&rev=9 --- openjpeg2.changes | 11 +++++++++++ openjpeg2.spec | 9 ++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/openjpeg2.changes b/openjpeg2.changes index 18a1c18..f20aaf1 100644 --- a/openjpeg2.changes +++ b/openjpeg2.changes @@ -1,8 +1,19 @@ +------------------------------------------------------------------- +Tue Nov 26 09:48:46 UTC 2013 - gber@opensuse.org + +- remove bogus dependency on libjpeg-devel + ------------------------------------------------------------------- Tue Nov 26 04:25:48 UTC 2013 - mrdocs@opensuse.org - add explicit libjpeg-devel to fix build on SLE 11 +------------------------------------------------------------------- +Sun Nov 24 10:38:25 UTC 2013 - gber@opensuse.org + +- use pkgconfig macros +- let openjpeg2-devel only recommend openjpeg2 + ------------------------------------------------------------------- Wed Nov 13 16:50:45 UTC 2013 - gber@opensuse.org diff --git a/openjpeg2.spec b/openjpeg2.spec index 8a8ad8d..93bf792 100644 --- a/openjpeg2.spec +++ b/openjpeg2.spec @@ -29,11 +29,10 @@ Source1: baselibs.conf BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc -BuildRequires: libtiff-devel -BuildRequires: liblcms2-devel -BuildRequires: libpng-devel +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libpng) BuildRequires: doxygen -BuildRequires: libjpeg-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,7 +57,7 @@ still-image compression standard from the Joint Photographic Experts Group Summary: Development files for %{name} Group: Development/Libraries/Other Requires: %{library_name} = %{version} -Requires: %{name} = %{version} +Recommends: %{name} = %{version} %description devel The OpenJPEG library is an open-source JPEG 2000 codec written in C language.