From 0838f8c149d852095053d4cbbb04b07ebe28612d79414486da8af5d0e11ca8a3 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Wed, 12 Jul 2017 22:48:08 +0000 Subject: [PATCH] Accepting request 509679 from home:scarabeus_iv:branches:graphics - Cleanup a bit with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/509679 OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=6 --- openexr.changes | 5 +++++ openexr.spec | 54 +++++++++++++++++++------------------------------ 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/openexr.changes b/openexr.changes index d48c622..22a6eb3 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 12 09:22:22 UTC 2017 - tchvatal@suse.com + +- Cleanup a bit with spec-cleaner + ------------------------------------------------------------------- Thu Jan 29 09:50:21 UTC 2015 - mlin@suse.com diff --git a/openexr.spec b/openexr.spec index cc78800..d07c62f 100644 --- a/openexr.spec +++ b/openexr.spec @@ -1,7 +1,7 @@ # # spec file for package openexr # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,11 +17,9 @@ %global so_suffix -2_2-22 - # tests should run at least during local build # but do expect a HUGE number of memory, so beware %bcond_with tests - Name: openexr Version: 2.2.0 Release: 0 @@ -29,20 +27,19 @@ Summary: Utilities for work with HDR images in OpenEXR format License: BSD-3-Clause Group: Productivity/Graphics/Other Url: http://www.openexr.com/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake -BuildRequires: fltk-devel -BuildRequires: freeglut-devel -BuildRequires: gcc-c++ -BuildRequires: pkg-config -BuildRequires: pkgconfig(IlmBase) = %{version} -BuildRequires: pkgconfig(zlib) -Obsoletes: OpenEXR <= 1.6.1 -Provides: OpenEXR = %{version} Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz Source1: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz.sig Source2: baselibs.conf Source3: openexr.keyring +BuildRequires: automake +BuildRequires: fltk-devel +BuildRequires: freeglut-devel +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: pkgconfig(IlmBase) = %{version} +BuildRequires: pkgconfig(zlib) +Obsoletes: OpenEXR <= 1.6.1 +Provides: OpenEXR = %{version} %description OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -68,11 +65,9 @@ Industrial Light & Magic for use in computer imaging applications. This package contains shared library libIlmImf %post -n libIlmImf%{so_suffix} -p /sbin/ldconfig - %postun -n libIlmImf%{so_suffix} -p /sbin/ldconfig %files -n libIlmImf%{so_suffix} -%defattr(-,root,root) %doc COPYING %{_libdir}/libIlmImf-*.so.* @@ -87,26 +82,24 @@ Industrial Light & Magic for use in computer imaging applications. This package contains shared library libIlmImfUtil %post -n libIlmImfUtil%{so_suffix} -p /sbin/ldconfig - %postun -n libIlmImfUtil%{so_suffix} -p /sbin/ldconfig %files -n libIlmImfUtil%{so_suffix} -%defattr(-,root,root) %doc COPYING %{_libdir}/libIlmImfUtil-*.so.* %package devel Summary: Library to Handle EXR Pictures (16-bit floating-point format) Group: Development/Libraries/C and C++ +Requires: libIlmImf%{so_suffix} = %{version} +Requires: libIlmImfUtil%{so_suffix} = %{version} +Requires: libilmbase-devel +Requires: pkgconfig +Requires: pkgconfig(zlib) Obsoletes: OpenEXR-devel <= 1.6.1 Provides: OpenEXR-devel = %{version} Obsoletes: libopenexr-devel <= 1.7.0 Provides: libopenexr-devel = %{version} -Requires: libIlmImf%{so_suffix} = %{version} -Requires: libIlmImfUtil%{so_suffix} = %{version} -Requires: libilmbase-devel -Requires: pkg-config -Requires: zlib-devel %description devel OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -136,35 +129,32 @@ if cmp COPYING LICENSE; then fi # remove a non-linux file -%{__rm} README.win32 README.OSX +rm README.win32 README.OSX %build -#autoreconf --force --install --include=config -# export PTHREAD_LIBS="-lpthread" -%{configure} \ +%configure \ --disable-static \ --with-pic \ --enable-large-stack \ --enable-imfexamples \ --enable-imffuzztest \ --enable-imfhugetest -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install -%{makeinstall} -%{__rm} -f %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print install -d -m 0755 %{buildroot}%{_defaultdocdir}/ mv %{buildroot}%{_datadir}/doc/OpenEXR-2* %{buildroot}%{_defaultdocdir}/%{name}-%{version} %check %if %{with tests} -%{__make} check +make %{?_smp_mflags} check %endif %files -%defattr(-,root,root) %doc AUTHORS ChangeLog COPYING LICENSE NEWS README* %{_bindir}/exrenvmap %{_bindir}/exrheader @@ -175,7 +165,6 @@ mv %{buildroot}%{_datadir}/doc/OpenEXR-2* %{buildroot}%{_defaultdocdir}/%{name}- %{_bindir}/exrmultipart %files devel -%defattr(-,root,root) %{_includedir}/OpenEXR %{_libdir}/libIlmImf.so %{_libdir}/libIlmImfUtil.so @@ -183,7 +172,6 @@ mv %{buildroot}%{_datadir}/doc/OpenEXR-2* %{buildroot}%{_defaultdocdir}/%{name}- %{_datadir}/aclocal/openexr.m4 %files doc -%defattr(-,root,root) %{_docdir}/%{name}-%{version} %changelog