From e7dcc0a16ea7ace2895cdae1bf762c40e6f3bfccba9dcb908c670287881c09ff Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 13 Jun 2018 08:17:57 +0000 Subject: [PATCH 1/5] - update to 7.0.8-0: * Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts (credit to OSS Fuzz). * Heap buffer overflow fix (reference https://github.com/ImageMagick/ImageMagick/issues/1156). * Boundary issues with -gamma option when HDRI is enabled (reference https://github.com/ImageMagick/ImageMagick/issues/1151). * Properly initialize SVG color style. * A SVG rectangle with a width and height of 1 is a point. * Fixed memory corruption for MVG paths. - consider test to be completely broken on i586, removing: - ImageMagick-relax-filter.t.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=366 --- ImageMagick-7.0.7-34.tar.bz2 | 3 --- ImageMagick-7.0.7-34.tar.bz2.asc | 16 ---------------- ImageMagick-7.0.8-0.tar.bz2 | 3 +++ ImageMagick-7.0.8-0.tar.bz2.asc | 16 ++++++++++++++++ ImageMagick.changes | 16 ++++++++++++++++ ImageMagick.spec | 25 ++----------------------- 6 files changed, 37 insertions(+), 42 deletions(-) delete mode 100644 ImageMagick-7.0.7-34.tar.bz2 delete mode 100644 ImageMagick-7.0.7-34.tar.bz2.asc create mode 100644 ImageMagick-7.0.8-0.tar.bz2 create mode 100644 ImageMagick-7.0.8-0.tar.bz2.asc diff --git a/ImageMagick-7.0.7-34.tar.bz2 b/ImageMagick-7.0.7-34.tar.bz2 deleted file mode 100644 index 15c757a..0000000 --- a/ImageMagick-7.0.7-34.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7ba3a66bc9ac495fff11784c068031aa12bc1a095d5f74c5b05e175a70209e6 -size 10792320 diff --git a/ImageMagick-7.0.7-34.tar.bz2.asc b/ImageMagick-7.0.7-34.tar.bz2.asc deleted file mode 100644 index 8f873d9..0000000 --- a/ImageMagick-7.0.7-34.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJbAhleAAoJEImrY9SCdzd6ZJ4P/0HwmOBNQzH87i5LoQd6xjj8 -2UiEnRiNenDwV5JBLzVWNAekWgFB5LgvrEeXyXv2J+Xt3ygKZRqBtBzsPxGghC7v -1Z3octPUbqLK8L7PKd8NrtLhED7KC/3wttOb8Wj+DHGMr8ucxU71SS5MEZkqS8TS -REXuwkwwuvjL4JRqNCoDa/GJt+JplOHSMODkL1I7gp+pyE+SbIBlt0nVPAublGAI -NLPvAQnEunT4ZQxjsUjwzB/I/ZRRFSjagmmxHSq9AL306nIu47ibWPBnK1ReSG01 -VhzM8gXHcuOXNPAubzDhgvDGfE0wsVS+sd/CVRMuPLzoe4v7uqCjj3BsSYaJpBka -fP/2PhjICtROjyo6aaT+pLKZkGwhu7pbB0qomkN70qKw1+iOqM2qUvKrKFZ3UGJG -aRoxhvykLubxHPhCR8hyTQcsVsH0TzuOGNZmMWqVmP/tWBzUCl6bDrF2EDCiF1s7 -dehwc4UFVXt9uQOvnVc55/CLQ/i3M92KEeggvzJhzyPPZqiidIy1slXA5CkSv14R -fpr3BCxpsyuRrp++5jjq3wE+hOLqhQmk43pGikLYaFTQj0rDXcdltSpCVNHTh1L6 -SJB6vqlYjb9IbryM05zvpzRbkI+R6pAVGJpOXfMOdhKvteY/IF0QOVy77WUdTrDo -M77AxUCM6q2rE9+2598e -=JG+P ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-0.tar.bz2 b/ImageMagick-7.0.8-0.tar.bz2 new file mode 100644 index 0000000..57f2168 --- /dev/null +++ b/ImageMagick-7.0.8-0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:951631df6fe045bbb6c7f2276bd4b5ed2790a04bd6b40f945359020d2df584c2 +size 10772261 diff --git a/ImageMagick-7.0.8-0.tar.bz2.asc b/ImageMagick-7.0.8-0.tar.bz2.asc new file mode 100644 index 0000000..9e4af8d --- /dev/null +++ b/ImageMagick-7.0.8-0.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJbIGdBAAoJEImrY9SCdzd6EPsQAIkEkMUlJn4Z8HivxBnAJEEi +bBXNGLvZ0YLEgSFBcHYoMpXbo/rpessvJYRG1jcnUdJP55MIzHLFEhfUqPlPvRkT +w4i2gCz/b6e32jsWyQ+bDQU/DNQKgCls0aohf2QD2cGuUyiOj6/MtI6CmxWvPsc5 +13sjjRTmJXkqxmUYJcsBnJHsSbt3TTvnPOrAS3/0tZh31IxH7TJadj/Tn0ZeYWOB +QQg/dv6XvweApeqIibaStnzPyoHC/sCTx6xhyR5y4k5/w7Osb9jkSw4XYBicr1MG +96WSdfEFkqg6j9SyqSrZYhOG2QGaN8kD5pur2GRzBuR9ZzRfkAY8NxnsgQw9Haer +mvejfbFb9PRmswjY0xF6Tr57Tc3JKLmBLWJbB/wUMUYoae15dMNKCNZrmZrtyvuK +7l4peWM2RGhsEirkj9UL+ZIOCy7+pGbaWxBQBp277DwB6IufzXugEed5GSiJUdlI +wZrRGkO3PWWaBiYx/Vd984NT4Dgaz3dRH9NIKPuq/HearIuAlb9tKH1V7M2F+DMG +LEcQo+WXmiIwW3RU8w4HHR++8ruVudlWy709vzxHQm7Uatha55Tu7c3PZ95LZ/mv +1izNp7G1mbqg0f2HT5GAbTFDT6y1qKBwkJbGg9JOCZLEd5fZWZd6H1vED+3Ekk+w +a2bbV63aihghY0tlMRQD +=oEDi +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 823efd0..7623444 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Jun 13 08:10:50 UTC 2018 - pgajdos@suse.com + +- update to 7.0.8-0: + * Fixed numerous use of uninitialized values, integer overflow, memory + exceeded, and timeouts (credit to OSS Fuzz). + * Heap buffer overflow fix (reference + https://github.com/ImageMagick/ImageMagick/issues/1156). + * Boundary issues with -gamma option when HDRI is enabled (reference + https://github.com/ImageMagick/ImageMagick/issues/1151). + * Properly initialize SVG color style. + * A SVG rectangle with a width and height of 1 is a point. + * Fixed memory corruption for MVG paths. +- consider test to be completely broken on i586, removing: + - ImageMagick-relax-filter.t.patch + ------------------------------------------------------------------- Mon May 21 08:08:20 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index b8e6d45..718670c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -17,8 +17,8 @@ %define maj 7 -%define mfr_version %{maj}.0.7 -%define mfr_revision 34 +%define mfr_version %{maj}.0.8 +%define mfr_revision 0 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 @@ -41,20 +41,10 @@ Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-% Source3: ImageMagick.keyring # suse specific patches Patch0: ImageMagick-disable-insecure-coders.patch -# workaround, see https://github.com/ImageMagick/ImageMagick/issues/439 -#%%ifarch i586 -#%%if %%{?suse_version} == 1500 -Patch1: ImageMagick-relax-filter.t.patch -#%%endif -#%%endif Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch #%%endif -# https://github.com/ImageMagick/ImageMagick/issues/1019 -#%%ifarch i586 -Patch5: ImageMagick-tests.tap-attributes.patch -#%%endif BuildRequires: chrpath BuildRequires: dos2unix BuildRequires: fdupes @@ -298,18 +288,10 @@ HTML documentation for ImageMagick library and scene examples. %prep %setup -q -n ImageMagick-%{source_version} %patch0 -p1 -%ifarch i586 -%if %{?suse_version} == 1500 -%patch1 -p1 -%endif -%endif %patch2 -p1 %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif -%ifarch i586 -%patch5 -p1 -%endif %build # bsc#1088463 @@ -374,10 +356,7 @@ chmod -x PerlMagick/demo/*.pl # https://github.com/ImageMagick/ImageMagick/issues/1019 # https://github.com/ImageMagick/ImageMagick/issues/1058 # https://github.com/ImageMagick/ImageMagick/issues/1059 -# (but keep patches for a while before giving up completely) exit 0 -# https://github.com/ImageMagick/ImageMagick/issues/1059 -rm PerlMagick/t/montage.t %endif make %{?_smp_mflags} check export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs From a60a315a103a4360ab37e6566f615f69c9478850f8837ce49cf030c8cbe6305b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 26 Jun 2018 09:50:56 +0000 Subject: [PATCH 2/5] - update to 7.0.8-3: * Apply translate component of SVG transform rotate. * More robust SVG text handling. * Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts (credit to OSS Fuzz). * Fixed an issue with stroke and label OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=367 --- ImageMagick-7.0.8-0.tar.bz2 | 3 --- ImageMagick-7.0.8-0.tar.bz2.asc | 16 ---------------- ImageMagick-7.0.8-3.tar.bz2 | 3 +++ ImageMagick-7.0.8-3.tar.bz2.asc | 16 ++++++++++++++++ ImageMagick-relax-filter.t.patch | 21 --------------------- ImageMagick.changes | 10 ++++++++++ ImageMagick.spec | 2 +- 7 files changed, 30 insertions(+), 41 deletions(-) delete mode 100644 ImageMagick-7.0.8-0.tar.bz2 delete mode 100644 ImageMagick-7.0.8-0.tar.bz2.asc create mode 100644 ImageMagick-7.0.8-3.tar.bz2 create mode 100644 ImageMagick-7.0.8-3.tar.bz2.asc delete mode 100644 ImageMagick-relax-filter.t.patch diff --git a/ImageMagick-7.0.8-0.tar.bz2 b/ImageMagick-7.0.8-0.tar.bz2 deleted file mode 100644 index 57f2168..0000000 --- a/ImageMagick-7.0.8-0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:951631df6fe045bbb6c7f2276bd4b5ed2790a04bd6b40f945359020d2df584c2 -size 10772261 diff --git a/ImageMagick-7.0.8-0.tar.bz2.asc b/ImageMagick-7.0.8-0.tar.bz2.asc deleted file mode 100644 index 9e4af8d..0000000 --- a/ImageMagick-7.0.8-0.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJbIGdBAAoJEImrY9SCdzd6EPsQAIkEkMUlJn4Z8HivxBnAJEEi -bBXNGLvZ0YLEgSFBcHYoMpXbo/rpessvJYRG1jcnUdJP55MIzHLFEhfUqPlPvRkT -w4i2gCz/b6e32jsWyQ+bDQU/DNQKgCls0aohf2QD2cGuUyiOj6/MtI6CmxWvPsc5 -13sjjRTmJXkqxmUYJcsBnJHsSbt3TTvnPOrAS3/0tZh31IxH7TJadj/Tn0ZeYWOB -QQg/dv6XvweApeqIibaStnzPyoHC/sCTx6xhyR5y4k5/w7Osb9jkSw4XYBicr1MG -96WSdfEFkqg6j9SyqSrZYhOG2QGaN8kD5pur2GRzBuR9ZzRfkAY8NxnsgQw9Haer -mvejfbFb9PRmswjY0xF6Tr57Tc3JKLmBLWJbB/wUMUYoae15dMNKCNZrmZrtyvuK -7l4peWM2RGhsEirkj9UL+ZIOCy7+pGbaWxBQBp277DwB6IufzXugEed5GSiJUdlI -wZrRGkO3PWWaBiYx/Vd984NT4Dgaz3dRH9NIKPuq/HearIuAlb9tKH1V7M2F+DMG -LEcQo+WXmiIwW3RU8w4HHR++8ruVudlWy709vzxHQm7Uatha55Tu7c3PZ95LZ/mv -1izNp7G1mbqg0f2HT5GAbTFDT6y1qKBwkJbGg9JOCZLEd5fZWZd6H1vED+3Ekk+w -a2bbV63aihghY0tlMRQD -=oEDi ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-3.tar.bz2 b/ImageMagick-7.0.8-3.tar.bz2 new file mode 100644 index 0000000..d99e90a --- /dev/null +++ b/ImageMagick-7.0.8-3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16facacd5eacdea5a020ad6d046e001f7b613418c216f2d2211049b4f022e3bc +size 10777752 diff --git a/ImageMagick-7.0.8-3.tar.bz2.asc b/ImageMagick-7.0.8-3.tar.bz2.asc new file mode 100644 index 0000000..acb2db0 --- /dev/null +++ b/ImageMagick-7.0.8-3.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJbML2pAAoJEImrY9SCdzd6ojEP/Atr2o78OIYx9YSBD0lzs8QY +pI2mD4wmzL1Jsy5k5cXGVMaqxQfrx9xmHd2dfhlRwQMVLmNW3JEEp2AR7yrf0GCO +NUYsQcST8SyAs5Pv6PubjJfgMRwTIcCX6E7+eVOKVtCCqSdtB8ckw98h1GcZNswU +Z82uOEF8CUIb+xlMlEO/XHsOrqAESbNpH+96nySDBRCuB0pUNmfU189qIEmvOqeB +SSd6StTlcpsgTGQ/0/raTyrRPBBFbxWJ3lOELmgp31SDp+eZPqAol145NjnN11pu +heM7JaaKjopsFVo+H/g382jRCn3QKyl84oC2MexjtItekj0avCf5bzxUy37m9da/ +RKjmWEL4+ZeMGCD6A7KG7F1MGiRqdl5hNDo9aS9btt5QtkxVQFSLeE+sdXwtYLOb +YKkBL7Ls0F7GenTf4gYav7wXHxmWie0K7SpEj4bUfYU0F6TotXiqzjheM29Dmyj6 +tsK7/4xykSQbRhmx7UMagEryeWtrrGNSfI2eAsLUf4rZhVcnr/UfNivsrGiueuzJ +TnEil1xleEEFhoe4/94+3sGk14PpWc8B+vZ448MXWeNwa5nRfMYKvbG53xnr5bg6 +EOr7dtvpcibUS7GuS3cKsuBPRRX68VA98awbRFULYvnluvcaz3iR5AAOEya5H6RG +trPoxyrjdte51rpAuBNN +=Nxzy +-----END PGP SIGNATURE----- diff --git a/ImageMagick-relax-filter.t.patch b/ImageMagick-relax-filter.t.patch deleted file mode 100644 index e7ccad1..0000000 --- a/ImageMagick-relax-filter.t.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN ImageMagick-7.0.6-0.orig/PerlMagick/t/filter.t ImageMagick-7.0.6-0/PerlMagick/t/filter.t ---- ImageMagick-7.0.6-0.orig/PerlMagick/t/filter.t 2017-06-11 13:39:49.000000000 +0200 -+++ ImageMagick-7.0.6-0/PerlMagick/t/filter.t 2017-08-10 02:24:02.823623000 +0200 -@@ -57,7 +57,7 @@ - testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Colorize.miff', 'Colorize', q/fill=>"red", blend=>"50%"/, 0.0, 0.0 ); - ++$test; - --testFilterCompare('input.miff', q//, 'reference/filter/Contrast.miff', 'Contrast', q//, 0.0, 0.0); -+testFilterCompare('input.miff', q//, 'reference/filter/Contrast.miff', 'Contrast', q//, 0.001, 0.4); - ++$test; - - testFilterCompare('input.miff', q//, 'reference/filter/Convolve.miff', 'Convolve', q/[0.0625, 0.0625, 0.0625, 0.0625, 0.5, 0.0625, 0.0625, 0.0625, 0.0625]/, 0.1, 0.7); -@@ -138,7 +138,7 @@ - testFilterCompare('input.miff', q//, 'reference/filter/OilPaint.miff', 'OilPaint', q//, 0.03, 1.0); - ++$test; - --testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Opaque.miff', 'Opaque', q/color=>"#e23834", fill=>"green"/, 0.0, 0.0); -+testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Opaque.miff', 'Opaque', q/color=>"#e23834", fill=>"green"/, 0.05, 0.5); - ++$test; - - testFilterCompare('input.miff', q//, 'reference/filter/Quantize.miff', 'Quantize', q//, 0.2, 0.7); diff --git a/ImageMagick.changes b/ImageMagick.changes index 7623444..1842f05 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 26 09:49:48 UTC 2018 - pgajdos@suse.com + +- update to 7.0.8-3: + * Apply translate component of SVG transform rotate. + * More robust SVG text handling. + * Fixed numerous use of uninitialized values, integer overflow, memory + exceeded, and timeouts (credit to OSS Fuzz). + * Fixed an issue with stroke and label + ------------------------------------------------------------------- Wed Jun 13 08:10:50 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 718670c..0600212 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -18,7 +18,7 @@ %define maj 7 %define mfr_version %{maj}.0.8 -%define mfr_revision 0 +%define mfr_revision 3 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 From 7559171c2ccd1ccdbb566fac0565c899db463061fdc0cf9bbd3649c7a393331e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 26 Jun 2018 10:00:36 +0000 Subject: [PATCH 3/5] - ImageMagick-tests.tap-attributes.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=368 --- ImageMagick.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index 1842f05..3fbaab2 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -23,6 +23,7 @@ Wed Jun 13 08:10:50 UTC 2018 - pgajdos@suse.com * Fixed memory corruption for MVG paths. - consider test to be completely broken on i586, removing: - ImageMagick-relax-filter.t.patch + - ImageMagick-tests.tap-attributes.patch ------------------------------------------------------------------- Mon May 21 08:08:20 UTC 2018 - pgajdos@suse.com From 306a0b55b6bf444b96ff085de756923957c90a1de98af79a2f05170e815c240c Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 26 Jun 2018 10:00:46 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=369 --- ImageMagick-tests.tap-attributes.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 ImageMagick-tests.tap-attributes.patch diff --git a/ImageMagick-tests.tap-attributes.patch b/ImageMagick-tests.tap-attributes.patch deleted file mode 100644 index 8423f82..0000000 --- a/ImageMagick-tests.tap-attributes.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: ImageMagick-7.0.7-28/Magick++/tests/tests.tap -=================================================================== ---- ImageMagick-7.0.7-28.orig/Magick++/tests/tests.tap 2018-03-25 20:18:56.000000000 +0200 -+++ ImageMagick-7.0.7-28/Magick++/tests/tests.tap 2018-04-04 15:07:22.292261487 +0200 -@@ -8,14 +8,14 @@ - # - subdir=Magick++/tests - . ./common.shi --echo "1..13" -+echo "1..12" - - SRCDIR=${top_srcdir}/${subdir}/ - export SRCDIR - - cd ${subdir} || exit 1 - --for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages -+for mytest in appendImages averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages - do - ./${mytest} && echo "ok" || echo "not ok" - done From 60f944aec1c68517c9576d0c5a9b18c54911b507737ed93a420692dcce5138f1 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 3 Jul 2018 04:45:30 +0000 Subject: [PATCH 5/5] Accepting request 620324 from home:kstreitova:branches:graphics - use "BuildRequires: p7zip-full" for TW as 7za binary needed by ImageMagick was moved to this package (see bsc#899627 for more details about this change) OBS-URL: https://build.opensuse.org/request/show/620324 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=370 --- ImageMagick.changes | 7 +++++++ ImageMagick.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index 3fbaab2..fad3f8f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 2 17:39:31 UTC 2018 - kstreitova@suse.com + +- use "BuildRequires: p7zip-full" for TW as 7za binary needed by + ImageMagick was moved to this package (see bsc#899627 for more + details about this change) + ------------------------------------------------------------------- Tue Jun 26 09:49:48 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 0600212..6379d1b 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -64,7 +64,11 @@ BuildRequires: dejavu-fonts BuildRequires: libjbig-devel %endif %if 0%{?suse_version} >= 1315 +%if 0%{?suse_version} > 1500 +BuildRequires: p7zip-full +%else BuildRequires: p7zip +%endif BuildRequires: pkgconfig %endif %if 0%{?suse_version} >= 1315