From 46df22f397a90e30695c9f6968d2ce693c3251db9418f8a461e3f8d3da90825f Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 26 Sep 2019 08:30:24 +0000 Subject: [PATCH 01/13] - version update to 2.4.0 * Completely re-written CMake configuration files * Improved support for building on Windows, via CMake * Improved support for building on macOS, via CMake * All code compiles without warnings on gcc, clang, msvc * Cleanup of license and copyright notices * floating-point exception handling is disabled by default * New Slice::Make method to reliably compute base pointer for a slice. * Miscellaneous bug fixes * CVE-2018-18444 Issue #351 Out of Memory * CVE-2018-18443 Issue #350 heap-buffer-overflow - upstream does not provide gpg signature anymore https://github.com/openexr/openexr/issues/565 - modified sources % baselibs.conf - deleted patches - testBox.patch (upstreamed) - testBoxAlgo.patch (upstreamed) - deleted sources - ilmbase-2.3.0.tar.gz.sig (not needed) - ilmbase.keyring (not needed) OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=29 --- baselibs.conf | 4 +- openexr-2.3.0.tar.gz | 3 - openexr-2.3.0.tar.gz.sig | Bin 566 -> 0 bytes openexr-CVE-2017-14988.patch | 15 --- openexr-CVE-2017-9111,9113,9115.patch | 28 ----- openexr-CVE-2018-18444.patch | 13 -- openexr.changes | 26 ++++ openexr.keyring | 171 -------------------------- openexr.spec | 108 +++++++--------- v2.4.0.tar.gz | 3 + 10 files changed, 76 insertions(+), 295 deletions(-) delete mode 100644 openexr-2.3.0.tar.gz delete mode 100644 openexr-2.3.0.tar.gz.sig delete mode 100644 openexr-CVE-2017-14988.patch delete mode 100644 openexr-CVE-2017-9111,9113,9115.patch delete mode 100644 openexr-CVE-2018-18444.patch delete mode 100644 openexr.keyring create mode 100644 v2.4.0.tar.gz diff --git a/baselibs.conf b/baselibs.conf index 8e2a8a5..a1475c8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libIlmImf-2_3-24 -libIlmImfUtil-2_3-24 +libIlmImf-2_4-24 +libIlmImfUtil-2_4-24 obsoletes "OpenEXR- < " diff --git a/openexr-2.3.0.tar.gz b/openexr-2.3.0.tar.gz deleted file mode 100644 index d6935fc..0000000 --- a/openexr-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd6cb3a87f8c1a233be17b94c74799e6241d50fc5efd4df75c7a4b9cf4e25ea6 -size 18412067 diff --git a/openexr-2.3.0.tar.gz.sig b/openexr-2.3.0.tar.gz.sig deleted file mode 100644 index 86c6eaccb699a2f77f3dd29303eca454070fb63f85c9261a5bb5a2f5ce3b9611..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*UAYy0qaeZ*Fs6tAxD;(dV_##&Y0$ZSg8UP9j5U?v8 z-=g>;S0BI+{SdNSW_ZOF-nmLy=B|TC=olIY9z@v3;6`2?Aex&ETeu?4(fg> zz_!0is}7X+a>cj=pofAt;_W$o35h!5bsrhMIan9=p}7sKBQwz%sBWclk$PwOUNsO& z!(Sk{kib*8!zk3Sz@sUsgo97+n;UiM;=2H7=7fZpW(e^S20R5j%>K&BNfESTADa%b z`Yt@8kvDD_hut$%xSkpmb^9K5BLjE*e+|4Jh$xu8d`i=ala+#UA>?XA*!m=GoIDeLVo-DVwSVB|Ajx-ye;d%ml7mFKi1Ap8^*CgLs6>-hzcS56Fo zX?WCL;o&sGU7PBRHJuh>#+P<<85b(-oQ;P4 zV3lCRNxf@=pXzU&EC?JdT=xfTRup=Z`=iKy^GemK(wd@F%m&+#SHRYn@S%0=aMYCO zEnQpaIipmOlWGPJf%k8g&{h4vYeNUl%Jnyt4kf3%WCQJnhD*KQbLW7G%P9)CGeXN| z{o0Mxt61P4L@-fMm{?QQONtsP (is, size); - -+ if( size < 0 ) -+ { -+ throw IEX_NAMESPACE::InputExc("Invalid size field in header attribute"); -+ } -+ - AttributeMap::iterator i = _map.find (name); - - if (i != _map.end()) - diff --git a/openexr-CVE-2017-9111,9113,9115.patch b/openexr-CVE-2017-9111,9113,9115.patch deleted file mode 100644 index 5f56f8f..0000000 --- a/openexr-CVE-2017-9111,9113,9115.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: openexr-2.3.0/exrmakepreview/makePreview.cpp -=================================================================== ---- openexr-2.3.0.orig/exrmakepreview/makePreview.cpp 2018-08-10 03:35:00.000000000 +0200 -+++ openexr-2.3.0/exrmakepreview/makePreview.cpp 2019-06-14 19:18:36.159142127 +0200 -@@ -110,6 +110,9 @@ generatePreview (const char inFileName[] - int h = dw.max.y - dw.min.y + 1; - - Array2D pixels (h, w); -+ if (INT_MAX / abs(w) < abs(dw.min.y) || -+ INT_MAX - abs(dw.min.x) < abs(dw.min.y * w)) -+ throw IEX_NAMESPACE::ArgExc ("Invalid data window in image header."); - in.setFrameBuffer (&pixels[0][0] - dw.min.y * w - dw.min.x, 1, w); - in.readPixels (dw.min.y, dw.max.y); - -Index: openexr-2.3.0/exrmaketiled/Image.h -=================================================================== ---- openexr-2.3.0.orig/exrmaketiled/Image.h 2018-08-10 03:35:00.000000000 +0200 -+++ openexr-2.3.0/exrmaketiled/Image.h 2019-06-14 19:19:02.451287048 +0200 -@@ -192,6 +192,9 @@ TypedImageChannel::slice () const - const IMATH_NAMESPACE::Box2i &dw = image().dataWindow(); - int w = dw.max.x - dw.min.x + 1; - -+ if (INT_MAX / abs(w) < abs(dw.min.y) || -+ INT_MAX - abs(dw.min.x) < abs(dw.min.y * w)) -+ throw IEX_NAMESPACE::ArgExc ("Invalid data window in image header."); - return OPENEXR_IMF_INTERNAL_NAMESPACE::Slice (pixelType(), - (char *) (&_pixels[0][0] - dw.min.y * w - dw.min.x), - sizeof (T), diff --git a/openexr-CVE-2018-18444.patch b/openexr-CVE-2018-18444.patch deleted file mode 100644 index 2c10172..0000000 --- a/openexr-CVE-2018-18444.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: openexr-2.3.0/exrmultiview/Image.h -=================================================================== ---- openexr-2.3.0.orig/exrmultiview/Image.h 2018-08-10 03:35:00.000000000 +0200 -+++ openexr-2.3.0/exrmultiview/Image.h 2018-11-07 09:07:48.072431858 +0100 -@@ -227,7 +227,7 @@ template - void - TypedImageChannel::black () - { -- memset(&_pixels[0][0],0,image().width()/_xSampling*image().height()/_ySampling*sizeof(T)); -+ memset(&_pixels[0][0],0,image().width()/_xSampling*(image().height()/_ySampling)*sizeof(T)); - } - - diff --git a/openexr.changes b/openexr.changes index e192860..9392c3f 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Sep 26 08:28:56 UTC 2019 - pgajdos@suse.com + +- version update to 2.4.0 + * Completely re-written CMake configuration files + * Improved support for building on Windows, via CMake + * Improved support for building on macOS, via CMake + * All code compiles without warnings on gcc, clang, msvc + * Cleanup of license and copyright notices + * floating-point exception handling is disabled by default + * New Slice::Make method to reliably compute base pointer for a slice. + * Miscellaneous bug fixes + * CVE-2018-18444 Issue #351 Out of Memory + * CVE-2018-18443 Issue #350 heap-buffer-overflow +- upstream does not provide gpg signature anymore + https://github.com/openexr/openexr/issues/565 +- modified sources + % baselibs.conf +- deleted patches + - openexr-CVE-2017-14988.patch (upstreamed) + - openexr-CVE-2017-9111,9113,9115.patch (upstreamed) + - openexr-CVE-2018-18444.patch (upstreamed) +- deleted sources + - openexr-2.3.0.tar.gz.sig (not needed) + - openexr.keyring (not needed) + ------------------------------------------------------------------- Fri Sep 20 12:41:26 UTC 2019 - pgajdos@suse.com diff --git a/openexr.keyring b/openexr.keyring deleted file mode 100644 index bcaacfe..0000000 --- a/openexr.keyring +++ /dev/null @@ -1,171 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.4 (GNU/Linux) - -mQGiBELe08IRBADRcyhvO2JBlGeQ+i5k2ZImOB0kDgAhFTvJDKT4N8qTGM58NO6R -D6c2jMoa2yRQYQHLnJj7bhhwnj2s0MHG///EoiSu18bHksCM+1HjE/vEC07u04iZ -H6jL6ai0sX8DgRvG/P+IhdI2t3IzA9BWyHw/scwAO/IktKxXRsy9M2u8vwCgljn/ -XZwwudBHSe4vRhOHesXZoOEEAMYIy2uy/xzJmYjM85pXJ9Uzgetx6khTGOPyOVas -ryoSuBN98+unmoX4o8d8MiN6bZsmmWS/QAg11X4CRnkpvEyYozs6jL63L06vFQDH -Z0wHUktNG96xSf7DDg5MwvUMk2IfGLQkd/rjBe3nbleLLci9crU3cB20wT+mj8ee -TYv2A/9Dq7YfzDsMYZt7sEqticxLBF7FjT/JKo1u8tTh9sLWzeHRxJw2S7gXlirA -25SYXaEyZ8eSY+sF5nPUvR26q06znHmOvpakfmYNKBLhCkkf4ZnxUdRgqlQVfPMl -fTxOtuCge35n3i6Np15bUusRVJjfAGTg1pC5iLPH6LLMKJ/Op7QdRmxvcmlhbiBL -YWlueiA8a2FpbnpAaWxtLmNvbT6IXgQTEQIAHgUCQt7TwgIbAwYLCQgHAwIDFQID -AxYCAQIeAQIXgAAKCRCdH4aPjTT+upfPAJ0fuKMSAPC5J4LXESLLhOZVqCc4nACf -dR0rngFe72FHRQcaYqsmZmHr6we5Ag0EQt7TyhAIAPlzmtDC4Hcul2d7dd3wjl7z -AP7tg/evbvCp53yjLFcRzAHLpdqZh2cewQp9OdFRuBItNySsfF/VdZ/efroc56ur -zYGCHq2DWKvDPiPLwfHAaQ5XmgWNyxTi1vcPGtNdnT7liJn3sIIp2nl+SgihQMgH -AysKAxJDFHYZXfzS0RBYE24t59gIQJHtvqzbRlWWl7skP7IdCacx3F9wMuGbM2lc -QVj709YaayTAagvn4bu7nv27sTqe+2LFmftT8wXNrIeiFMNDXXSTVesD3Ysbp5SP -gP+8JNd3raWHHub6klzLrqBx5jWl4yg5N4tWiOoq8kwGMFK1/5vGm5PoO1tCDKcA -AwUH/0b5S8yaFExIoMtfIzPHo0dopdxeSUJtaI/7Uqe4h6Y51B77hQUgF3dKKXAp -N/TONSDwQuV56HgZMOUXNdrewYnDshxroeoaJiyIyk7a8Co85Exrvmzev+FGnJg3 -eVQt9pCttvTfzIy7nDEG/aomc7fVnwRRMpk7pEFkBwCbScO3sMsiEGRIIKfqjZ1v -y2iKZNlSxK5XHbvpKTfwNxcSDf4Oh8oz54yk1/Jqre8A8UJpape0Wsfwy0Mcpncy -+RjBR3gc3VihIE+zPCEWmdMDXA0h3it8xYjSObVg1Xms7Im6S5JqUlAgTz6VIQv6 -3L5foRpnTUove0NPDrtprUZdQ3OISQQYEQIACQUCQt7TygIbDAAKCRCdH4aPjTT+ -ulO8AJ9CnSE2uEZ4TT616ZNmyr0xbsJ1ewCghlKzmQRYaucO0trKFWb3Oni3U5M= -=TTbV ------END PGP PUBLIC KEY BLOCK----- - - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) - -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 -sONtVqIpLnbrkj529hbyMjKi9X/i3K0NBA/LmA== -=XC5I ------END PGP PUBLIC KEY BLOCK----- - - -mQGiBExI/Z8RBACCuviWxXBgTDrz+x2zCBPBnjcMvMD5BUd0JZ1T8jDhv5FR2rW+ -+FTj2NYi5k8UTmQn1n7HLqrBjO9RyronTumjHwQQw14wMN9Jj20HDduczhBZrPz2 -BglR+t8xHdFjuHHnIaIlopudu+ycAEwf/w81Lbuv/He4wMSBi833rsTELwCgswrp -KlLDYi1wpOPG3pDPJrwhP3cD/3Rxeoc5grLwldApB3EiW+Xg3BOYuUp3s8kcZviz -92ijxDJ8Fa6a6VG6gOvtk1RnrgJXCardORVebnIfs0s9q1av6c6k8IGye9gicVvn -IOywL0fz9V4GE81UqulxqYjFmRCp26NhjMPpB5NDLC9fQoxpqfA0WecDbcwFZHBF -1SdGA/9uTid5XX/782Rq/29vcGnAajMj889skMlTOkBQYU+bQIS0IKHvUHuGIV6I -CBLn3V+5SkwuexMSsAH9k2/uvLbk/CQYffKQG5fRgzjAOLdAAxHaGZkPTIESsU3U -R+S5TJe/A+tp2mODc5I3osrcMud0pDey1+Ct5iYaHmGNqxbJKrQZUGlvdHIgPHBz -dGFuY3p5a0BpbG0uY29tPohgBBMRAgAgBQJMSP2fAhsjBgsJCAcDAgQVAggDBBYC -AwECHgECF4AACgkQsSZXcKSdz2qOXQCcC7A71LU0c9PfpWJNAq445zQJ7h0Amwbm -kDupQXXJTUrsqLeFw+lOk1d/uQENBExI/aEQBADCK3KdRlH13eIt5lTeVUKOcpGd -cboxrSMjqa4YfrWovzbGwfDIR/1F9VBuVJNhtbY13sTdsy+cfuiVFTFkoWbKAiP5 -dkRnSFaCFo6HJ7hbiKCMUBUybz3tqjyurIepPPgnEdj3sbf7lZvKKiqUdD+LCyw9 -DNc3bK+V0PMex9X8MwADBQP/cnrHrVUvk0DQjDQPT6XfqPtcLtOiRk3/DsP7//rq -SLYDxQpAPcOgxyXZw7LKpZJfmmZXW77iSCLD5TbvF28IPX+6NVj9vk+w5HUhLBXp -JlV4ZtqzjQQkzf9rEZpndsxPXIpnq8XO/ruf8Az45higSBfFSwOsJyUlOApB18va -bEGISQQYEQIACQUCTEj9oQIbDAAKCRCxJldwpJ3PapxkAJ9r8f8mqcLu27oMZ4Hx -Omu3ypvNvACeOUp0AYy4GYbpdNXDwGnyqeKNEdY= -=at9E - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.14 (GNU/Linux) - -mQENBFPRjoMBCAC2c1Yu5wEKKTCuidtXfRBDwllExKvR4DCClRzzRxlHmoK6asSf -I7426uPIF9mXyjoFNtcpucQgVyoeKyZZxxs/6QXpP9gsaeebSybwO+t1hrvZebh6 -+A9ZuMqci72QxVLKXVnzRFaj0cQDENl89EJ149I/cX/c3T8C3NOXMWAWahu4oPjJ -+8zIdvWU+GpZdC5JvSz+67u5XBoA8HlTBcy27UFRYXKXNjyut8ByoIStpiC4/rYb -fCbvQIVoKxPZzF4dARNEK3yL9j0gw3Jse2Pgd7GzRhwKDrg5ZUe0ZPS69tfsaw/6 -SncCtxgKyX/MPzrB340ou3riVzX1Bkae/WsVABEBAAG0K0VkIEhhbndheSAoT3Bl -bkVYUiBBZG1pbikgPGVoYW53YXlAaWxtLmNvbT6JATgEEwECACIFAlPRjoMCGwMG -CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEM52VHusEDqNARwH/1oApCO37p+U -RUdR3NbYRV8361Ssosj142yPrzM4w7nvViQLiYrZ8jRlGuecP/f1qEw5rx9wB4Lx -UZopH/kwsWJjSueWmJsTxoKAE5tLVqwkwVvvNyGtSWmdwdiuUV1wBK4KjdyNWYpy -dUc28cstDq8Njn2FjOFu2LR5zmf3T97G9I+5Epe20L34k/DqenyNnjFzod2AD/K1 -94sYaoZ23rzU0DRxwTf48Evr/za81gKAw8YWcVl/8iu2KCZWAexys65dXNypM2HI -u9M4WWTnfTRFTU0Ut6NQGPsDZwAEjHGMz53jdEO3jaYyvuGuPin0lSqmuw+v15R0 -r0bpgmMjqpm5AQ0EU9GOgwEIAM8mn7KBZKzvzR8aoGiDCupdRMtrh75UaG8Cplpr -RlVks0ufw0d72HNCl/uIA0OVKUz62CgDPMJJkA931ChhITScCUnaWhXZ8MYDMINh -BYeLp6ugwVncDeACTjwLqbtW5UL316gNDh/+3GlLmQwULLTtrRe29O+XMNO6hzJU -6zWsIOBDlrNJMcrF/kL3knxPaWoSkQNv/lD7pTUHk2aCmuxG/+/I7t/bzmDjjXtA -/cC1yl2ztS+KNBXW+FAu+bl3kX8QtYGs1m+SQ4Wj3Cdcqtrtk2CmYb5KoZ1UlN6Q -4AhKGIEA8EHMvssC4JwK8LnhTkkLaj4dYg0wGaNXsUGy/cUAEQEAAYkBHwQYAQIA -CQUCU9GOgwIbDAAKCRDOdlR7rBA6jeesCACGmdosP/jr6H6mDP5PDlLDGDp84f+Q -ECoMWjDF1YoYekCdpNaePZNW2loS0P9iRKmMin7/167VJ447DEmwlavHW71md7uW -mJ/w50jGZF0KhhduYiajOcF1FpnvmtbGW/ICeFBg6ZzVljxLGib9STz6hH34SzwN -mO3LfYt4vD/N22UlTPylV1sQqVtj6Vq/AyQHNR6V8DE431zEYhEMHbzqLBhAIwMD -bRRBQ6LLUuTs7F5G9Lm6/uF4ZqxOz18/X2fuSSI2a5xveScTFN5NunUymxOpWvfn -1q6ue36nptgg+6QuYGqwyKOku/8G7rVLB6Xb41N8CnJ3KOMPrvpU7wBw -=+7rR ------END PGP PUBLIC KEY BLOCK----- - - diff --git a/openexr.spec b/openexr.spec index b73c3b0..94875c9 100644 --- a/openexr.spec +++ b/openexr.spec @@ -20,26 +20,17 @@ %define asan_build 0 %define debug_build 0 %define sonum 24 -%global so_suffix -2_3-24 +%global so_suffix -2_4 Name: openexr -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause Group: Productivity/Graphics/Other URL: http://www.openexr.com/ -Source0: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz -Source1: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz.sig +Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz Source2: baselibs.conf -Source3: openexr.keyring -# https://github.com/openexr/openexr/pull/401 -Patch0: openexr-CVE-2018-18444.patch -# https://github.com/openexr/openexr/pull/401 -# CVE-2017-9111 [bsc#1040109], CVE-2017-9113 [bsc#1040113], CVE-2017-9115 [bsc#1040115] -Patch1: openexr-CVE-2017-9111,9113,9115.patch -# CVE-2017-14988 [bsc#1061305] -Patch2: openexr-CVE-2017-14988.patch -BuildRequires: automake +BuildRequires: cmake BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ @@ -50,11 +41,11 @@ Obsoletes: OpenEXR <= 1.6.1 Provides: OpenEXR = %{version} %if %{asan_build} || %{debug_build} BuildRequires: ilmbase-debugsource -BuildRequires: libHalf%{sonum}-debuginfo -BuildRequires: libIex%{so_suffix}-debuginfo -BuildRequires: libIexMath%{so_suffix}-debuginfo -BuildRequires: libIlmThread%{so_suffix}-debuginfo -BuildRequires: libImath%{so_suffix}-debuginfo +BuildRequires: libHalf%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libIex%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libIexMath%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libIlmThread%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libImath%{so_suffix}-%{sonum}-debuginfo %endif %description @@ -70,45 +61,31 @@ contains a set of utilities to work with this format. * exr2aces, converter to ACES format * exrmultiview, combine two or more images into one multi-view -%package -n libIlmImf%{so_suffix} +%package -n libIlmImf%{so_suffix}-%{sonum} Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format Group: System/Libraries -%description -n libIlmImf%{so_suffix} +%description -n libIlmImf%{so_suffix}-%{sonum} OpenEXR is a high dynamic-range (HDR) image file format developed by 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} -%license LICENSE -%{_libdir}/libIlmImf-*.so.* - -%package -n libIlmImfUtil%{so_suffix} +%package -n libIlmImfUtil%{so_suffix}-%{sonum} Summary: Library to simplify development of OpenEXR utilities Group: System/Libraries -%description -n libIlmImfUtil%{so_suffix} +%description -n libIlmImfUtil%{so_suffix}-%{sonum} OpenEXR is a high dynamic-range (HDR) image file format developed by 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} -%license LICENSE -%{_libdir}/libIlmImfUtil-*.so.* - %package devel Summary: Development files for the 16-bit FP EXR picture handling library Group: Development/Libraries/C and C++ -Requires: libIlmImf%{so_suffix} = %{version} -Requires: libIlmImfUtil%{so_suffix} = %{version} +Requires: libIlmImf%{so_suffix}-%{sonum} = %{version} +Requires: libIlmImfUtil%{so_suffix}-%{sonum} = %{version} Requires: libilmbase-devel >= 2.3.0 Requires: pkgconfig Requires: pkgconfig(zlib) @@ -125,7 +102,7 @@ This package contains header files. %package doc Summary: Documentatino for the 16-bit FP EXR picture handling library -Group: Documentation/PDF +Group: Documentation/Other Obsoletes: OpenEXR-doc <= 1.6.1 Provides: OpenEXR-doc = %{version} @@ -136,22 +113,15 @@ Industrial Light & Magic for use in computer imaging applications. This package contains documentation. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n openexr-%{version}/OpenEXR %build export PTHREAD_LIBS="-lpthread" %if %{debug_build} export CXXFLAGS="%{optflags} -O0" %endif -%configure \ - --docdir=%{_docdir}/%{name} \ - --disable-static \ - --enable-large-stack \ - --enable-imfexamples \ - --enable-imfhugetest +%cmake \ + -DCMAKE_INSTALL_DOCDIR="%{_docdir}/%{name}" %if %{asan_build} vmemlimit=$(ulimit -v) if [ $vmemlimit != unlimited ]; then @@ -167,17 +137,22 @@ done make %{?_smp_mflags} %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +%cmake_install %check -%ifarch x86_64 -make %{?_smp_mflags} check -%endif +# tests takes LOONG, e. g. 20 min +export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" +%ctest + +%post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libIlmImfUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libIlmImfUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig %files -%license LICENSE -%doc AUTHORS ChangeLog NEWS README* +%license ../LICENSE.md +%doc ../{CHANGES.md,CODE_OF_CONDUCT.md,CODEOWNERS,CONTRIBUTING.md,CONTRIBUTORS.md,README.md,SECURITY.md} %{_bindir}/exrenvmap %{_bindir}/exrheader %{_bindir}/exrmakepreview @@ -185,19 +160,26 @@ make %{?_smp_mflags} check %{_bindir}/exrstdattr %{_bindir}/exrmultiview %{_bindir}/exrmultipart +%{_bindir}/exr2aces %files devel %{_includedir}/OpenEXR -%{_libdir}/libIlmImf.so -%{_libdir}/libIlmImfUtil.so +%{_libdir}/libIlmImf%{so_suffix}.so +%{_libdir}/libIlmImfUtil%{so_suffix}.so %{_libdir}/pkgconfig/OpenEXR.pc -%{_datadir}/aclocal/openexr.m4 +%dir %{_libdir}/cmake/OpenEXR +%{_libdir}/cmake/OpenEXR/*.cmake %files doc %{_docdir}/%{name} -%exclude %{_docdir}/%{name}/AUTHORS -%exclude %{_docdir}/%{name}/ChangeLog -%exclude %{_docdir}/%{name}/NEWS -%exclude %{_docdir}/%{name}/README* +%exclude %{_docdir}/%{name}/{CHANGES.md,CODE_OF_CONDUCT.md,CODEOWNERS,CONTRIBUTING.md,CONTRIBUTORS.md,README.md,SECURITY.md} + +%files -n libIlmImf%{so_suffix}-%{sonum} +%license ../LICENSE.md +%{_libdir}/libIlmImf-*.so.* + +%files -n libIlmImfUtil%{so_suffix}-%{sonum} +%license ../LICENSE.md +%{_libdir}/libIlmImfUtil-*.so.* %changelog diff --git a/v2.4.0.tar.gz b/v2.4.0.tar.gz new file mode 100644 index 0000000..f433c74 --- /dev/null +++ b/v2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4904c5ea7914a58f60a5e2fbc397be67e7a25c380d7d07c1c31a3eefff1c92f1 +size 26806627 From 5f2efe65e48af43e1a7a5765e9bbe4e29b5637427a3e084a8a699edae71b9e3c Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 26 Sep 2019 08:39:12 +0000 Subject: [PATCH 02/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=30 --- openexr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openexr.spec b/openexr.spec index 94875c9..40f2e53 100644 --- a/openexr.spec +++ b/openexr.spec @@ -35,7 +35,7 @@ BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: pkgconfig(IlmBase) >= 2.3.0 +BuildRequires: pkgconfig(IlmBase) >= %{version} BuildRequires: pkgconfig(zlib) Obsoletes: OpenEXR <= 1.6.1 Provides: OpenEXR = %{version} From d8a157ebf6ec9e4cb033653a48628ed07f7f504af63660d837f8f7c3d3631a55 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 4 Oct 2019 07:37:47 +0000 Subject: [PATCH 03/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=31 --- openexr.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openexr.spec b/openexr.spec index 40f2e53..75fcc23 100644 --- a/openexr.spec +++ b/openexr.spec @@ -140,9 +140,11 @@ make %{?_smp_mflags} %cmake_install %check +%ifarch x86_64 # tests takes LOONG, e. g. 20 min export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest +%endif %post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig From 07cfb07b25f7a2dc7fbc8b012d781b98bc7670cdb738854d927cd58b91a0aec2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 4 Oct 2019 09:18:57 +0000 Subject: [PATCH 04/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=32 --- openexr.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/openexr.spec b/openexr.spec index 75fcc23..40f2e53 100644 --- a/openexr.spec +++ b/openexr.spec @@ -140,11 +140,9 @@ make %{?_smp_mflags} %cmake_install %check -%ifarch x86_64 # tests takes LOONG, e. g. 20 min export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest -%endif %post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig From 77ded4a45317611024dcf3b5a9ebe1650ae7dfe0660eccea22bd495fea01bef7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 4 Oct 2019 14:21:16 +0000 Subject: [PATCH 05/13] - increase timeout for IlmImf test OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=33 --- openexr.changes | 5 +++++ openexr.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/openexr.changes b/openexr.changes index 9392c3f..373b1b6 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 4 14:20:41 UTC 2019 - pgajdos@suse.com + +- increase timeout for IlmImf test + ------------------------------------------------------------------- Thu Sep 26 08:28:56 UTC 2019 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 40f2e53..7002f46 100644 --- a/openexr.spec +++ b/openexr.spec @@ -140,7 +140,9 @@ make %{?_smp_mflags} %cmake_install %check -# tests takes LOONG, e. g. 20 min +# tests takes LOONG, e. g. 20 min, in obs even more that +# exceed timeout limit 25 min +echo "\nset_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)" >> IlmImfTest/CMakeLists.txt export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest From 60ad31142788cff5ae78278dedbdda37c87436b3c44f4ae87c3bfefb38650d11 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 7 Oct 2019 08:16:27 +0000 Subject: [PATCH 06/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=34 --- openexr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openexr.spec b/openexr.spec index 7002f46..f89fef5 100644 --- a/openexr.spec +++ b/openexr.spec @@ -84,9 +84,9 @@ This package contains shared library libIlmImfUtil %package devel Summary: Development files for the 16-bit FP EXR picture handling library Group: Development/Libraries/C and C++ +Requires: ilmbase-devel >= 2.3.0 Requires: libIlmImf%{so_suffix}-%{sonum} = %{version} Requires: libIlmImfUtil%{so_suffix}-%{sonum} = %{version} -Requires: libilmbase-devel >= 2.3.0 Requires: pkgconfig Requires: pkgconfig(zlib) Obsoletes: OpenEXR-devel <= 1.6.1 From 9143e5e63030bc80988344e5abc0901db325a271f52b5471e88116fbe678da48 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 7 Oct 2019 08:17:36 +0000 Subject: [PATCH 07/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=35 --- openexr.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openexr.spec b/openexr.spec index f89fef5..196fbb1 100644 --- a/openexr.spec +++ b/openexr.spec @@ -140,11 +140,13 @@ make %{?_smp_mflags} %cmake_install %check +%if 0 # tests takes LOONG, e. g. 20 min, in obs even more that # exceed timeout limit 25 min echo "\nset_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)" >> IlmImfTest/CMakeLists.txt export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest +%endif %post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig From 666a112cb7e0e6bbb5c4b85a3bc84c67501abf2bb583fbfd3cf52bda011ff9a2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 7 Oct 2019 09:56:58 +0000 Subject: [PATCH 08/13] - fix OpenEXR.pc OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=36 --- openexr.changes | 5 +++++ openexr.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/openexr.changes b/openexr.changes index 373b1b6..4f08d93 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 7 09:56:42 UTC 2019 - pgajdos@suse.com + +- fix OpenEXR.pc + ------------------------------------------------------------------- Fri Oct 4 14:20:41 UTC 2019 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 196fbb1..df93f30 100644 --- a/openexr.spec +++ b/openexr.spec @@ -121,7 +121,8 @@ export PTHREAD_LIBS="-lpthread" export CXXFLAGS="%{optflags} -O0" %endif %cmake \ - -DCMAKE_INSTALL_DOCDIR="%{_docdir}/%{name}" + -DCMAKE_INSTALL_DOCDIR="%{_docdir}/%{name}" \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} %if %{asan_build} vmemlimit=$(ulimit -v) if [ $vmemlimit != unlimited ]; then From 8948f368a2f1456983b87a357dd6911f81938bba67081b0b371ada9d8fbd4f85 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 7 Oct 2019 10:43:54 +0000 Subject: [PATCH 09/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=37 --- openexr.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/openexr.spec b/openexr.spec index df93f30..d554cf5 100644 --- a/openexr.spec +++ b/openexr.spec @@ -141,13 +141,11 @@ make %{?_smp_mflags} %cmake_install %check -%if 0 # tests takes LOONG, e. g. 20 min, in obs even more that # exceed timeout limit 25 min echo "\nset_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)" >> IlmImfTest/CMakeLists.txt export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest -%endif %post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig From 785a2402db258e6d5c7b7cf9bca181a773a5bc1945dcdb7d8d629dd29bc6981e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 7 Oct 2019 11:53:22 +0000 Subject: [PATCH 10/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=38 --- openexr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openexr.spec b/openexr.spec index d554cf5..9581706 100644 --- a/openexr.spec +++ b/openexr.spec @@ -143,7 +143,7 @@ make %{?_smp_mflags} %check # tests takes LOONG, e. g. 20 min, in obs even more that # exceed timeout limit 25 min -echo "\nset_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)" >> IlmImfTest/CMakeLists.txt +echo "set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)" >> IlmImfTest/CMakeLists.txt export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest From a88ef0d8d1fb54ad15a6995b8a1cc1074079b3173892a263f36b54ca4203fe0a Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 7 Oct 2019 14:52:03 +0000 Subject: [PATCH 11/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=39 --- openexr.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openexr.spec b/openexr.spec index 9581706..375fe88 100644 --- a/openexr.spec +++ b/openexr.spec @@ -141,11 +141,13 @@ make %{?_smp_mflags} %cmake_install %check +%ifarch x86_64 # tests takes LOONG, e. g. 20 min, in obs even more that # exceed timeout limit 25 min echo "set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)" >> IlmImfTest/CMakeLists.txt export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest +%endif %post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig From b4cbe267fe1b06f87d45e4dd144bf960aa200fa74e9a573b156cbe000781c641 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 8 Oct 2019 09:01:58 +0000 Subject: [PATCH 12/13] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=40 --- openexr.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openexr.spec b/openexr.spec index 375fe88..1e13d4b 100644 --- a/openexr.spec +++ b/openexr.spec @@ -144,9 +144,8 @@ make %{?_smp_mflags} %ifarch x86_64 # tests takes LOONG, e. g. 20 min, in obs even more that # exceed timeout limit 25 min -echo "set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)" >> IlmImfTest/CMakeLists.txt export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" -%ctest +%ctest --timeout 3000 %endif %post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig From b62ddc35fef02dd8a6d166c14e540cb5d258c05e77547762f58a03bd58d283c2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 14 Nov 2019 19:45:07 +0000 Subject: [PATCH 13/13] Accepting request 748749 from home:cgiboudeaux:branches:graphics - Add Fix-the-symlinks-creation.patch to fix the symlinks creation. OBS-URL: https://build.opensuse.org/request/show/748749 OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=41 --- Fix-the-symlinks-creation.patch | 36 +++++++++++++++++++++++++++++++++ openexr.changes | 5 +++++ openexr.spec | 22 ++++++++++++++------ 3 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 Fix-the-symlinks-creation.patch diff --git a/Fix-the-symlinks-creation.patch b/Fix-the-symlinks-creation.patch new file mode 100644 index 0000000..73a195e --- /dev/null +++ b/Fix-the-symlinks-creation.patch @@ -0,0 +1,36 @@ +From 4e54bde78f65c0fef8a9f794aaacea07813fba09 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Sat, 19 Oct 2019 09:58:10 +0200 +Subject: [PATCH] Take DESTDIR into account when creating library symlinks + +--- + IlmBase/config/LibraryDefine.cmake | 2 +- + OpenEXR/config/LibraryDefine.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake +index 0502825f..9fb92c1c 100644 +--- a/IlmBase/config/LibraryDefine.cmake ++++ b/IlmBase/config/LibraryDefine.cmake +@@ -100,7 +100,7 @@ function(ILMBASE_DEFINE_LIBRARY libname) + if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") + install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") + set(verlibname) + set(baselibname) +diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake +index 6946ca94..c5b6096a 100644 +--- a/OpenEXR/config/LibraryDefine.cmake ++++ b/OpenEXR/config/LibraryDefine.cmake +@@ -94,7 +94,7 @@ function(OPENEXR_DEFINE_LIBRARY libname) + if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") + install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") + set(verlibname) + set(baselibname) diff --git a/openexr.changes b/openexr.changes index 4f08d93..51e2cdc 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 14 17:57:37 UTC 2019 - Christophe Giboudeaux + +- Add Fix-the-symlinks-creation.patch to fix the symlinks creation. + ------------------------------------------------------------------- Mon Oct 7 09:56:42 UTC 2019 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 1e13d4b..49757a0 100644 --- a/openexr.spec +++ b/openexr.spec @@ -1,7 +1,7 @@ # # spec file for package openexr # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ Group: Productivity/Graphics/Other URL: http://www.openexr.com/ Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz Source2: baselibs.conf +Patch0: Fix-the-symlinks-creation.patch BuildRequires: cmake BuildRequires: fltk-devel BuildRequires: freeglut-devel @@ -113,9 +114,11 @@ Industrial Light & Magic for use in computer imaging applications. This package contains documentation. %prep -%setup -q -n openexr-%{version}/OpenEXR +%setup -q +%patch0 -p1 %build +pushd OpenEXR export PTHREAD_LIBS="-lpthread" %if %{debug_build} export CXXFLAGS="%{optflags} -O0" @@ -136,16 +139,21 @@ for i in $(find -name Makefile); do done %endif make %{?_smp_mflags} +popd %install +pushd OpenEXR %cmake_install +popd %check %ifarch x86_64 +pushd OpenEXR # tests takes LOONG, e. g. 20 min, in obs even more that # exceed timeout limit 25 min export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" %ctest --timeout 3000 +popd %endif %post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig @@ -155,8 +163,8 @@ export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH %postun -n libIlmImfUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig %files -%license ../LICENSE.md -%doc ../{CHANGES.md,CODE_OF_CONDUCT.md,CODEOWNERS,CONTRIBUTING.md,CONTRIBUTORS.md,README.md,SECURITY.md} +%license LICENSE.md +%doc CHANGES.md CODE_OF_CONDUCT.md CODEOWNERS CONTRIBUTING.md CONTRIBUTORS.md README.md SECURITY.md %{_bindir}/exrenvmap %{_bindir}/exrheader %{_bindir}/exrmakepreview @@ -168,7 +176,9 @@ export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH %files devel %{_includedir}/OpenEXR +%{_libdir}/libIlmImf.so %{_libdir}/libIlmImf%{so_suffix}.so +%{_libdir}/libIlmImfUtil.so %{_libdir}/libIlmImfUtil%{so_suffix}.so %{_libdir}/pkgconfig/OpenEXR.pc %dir %{_libdir}/cmake/OpenEXR @@ -179,11 +189,11 @@ export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH %exclude %{_docdir}/%{name}/{CHANGES.md,CODE_OF_CONDUCT.md,CODEOWNERS,CONTRIBUTING.md,CONTRIBUTORS.md,README.md,SECURITY.md} %files -n libIlmImf%{so_suffix}-%{sonum} -%license ../LICENSE.md +%license LICENSE.md %{_libdir}/libIlmImf-*.so.* %files -n libIlmImfUtil%{so_suffix}-%{sonum} -%license ../LICENSE.md +%license LICENSE.md %{_libdir}/libIlmImfUtil-*.so.* %changelog