Attachment 6934 Details for Bug 32999 – ImageMagick.spec patch to make bootstrap mode possible

[patch] ImageMagick.spec patch to make bootstrap mode possible

ImageMagick.spec.diff (text/plain), 3.22 KB, created by Michael Shigorin on 2017-01-13 20:05:45 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2017-01-13 20:05:45 MSK

Size: 3.22 KB

patch

obsolete

>diff --git a/ImageMagick.spec b/ImageMagick.spec
>index 13e31f2..32abfb6 100644
>--- a/ImageMagick.spec
>+++ b/ImageMagick.spec
>@@ -10,7 +10,7 @@
> 
> Name: ImageMagick
> Version: %dversion.%drelease
>-Release: alt1
>+Release: alt1.1
> 
> Summary: An X application for displaying and manipulating images
> License: OpenSource
>@@ -36,9 +36,12 @@ BuildPreReq: libpng-devel
> #BuildRequires: ImageMagick-tools
> 
> # Automatically added by buildreq on Wed Nov 03 2010
>-BuildRequires: bzlib-devel curl gcc-c++ glibc-devel-static graphviz groff-base imake libXext-devel libXt-devel libdjvu-devel libjasper-devel libjbig-devel liblcms-devel liblqr-devel librsvg-devel libtiff-devel libwmf-devel libxml2-devel openexr-devel perl-devel transfig xdg-utils xorg-cf-files 
>+BuildRequires: bzlib-devel curl gcc-c++ glibc-devel-static graphviz groff-base imake libXext-devel libXt-devel libjasper-devel libjbig-devel liblcms-devel liblqr-devel librsvg-devel libtiff-devel libwmf-devel libxml2-devel perl-devel xdg-utils xorg-cf-files 
>+
>+BuildRequires: libjpeg-devel liblcms2-devel liblzma-devel libwebp-devel libgraphviz-devel libjasper-devel libjbig-devel liblcms-devel libtiff-devel libwmf-devel libxml2-devel perl-devel chrpath liblqr-devel libltdl-devel perl-parent
>+
>+%{?!_with_bootstrap:BuildRequires: openexr-devel transfig libdjvu-devel libopenjpeg2.0-devel}
> 
>-BuildRequires: libjpeg-devel liblcms2-devel liblzma-devel libwebp-devel libgraphviz-devel libjasper-devel libjbig-devel liblcms-devel libtiff-devel libwmf-devel libxml2-devel perl-devel chrpath openexr-devel liblqr-devel libdjvu-devel libltdl-devel perl-parent libopenjpeg2.0-devel
> %if_enabled librsvg
> BuildRequires: librsvg-devel libpixman-devel
> %endif
>@@ -121,7 +124,7 @@ Documentation for %name
> %def_disable static
> 
> %prep
>-%setup -q -n %name-%dversion-%drelease
>+%setup -n %name-%dversion-%drelease
> #patch1 -p2
> touch config.rpath
> 
>@@ -158,17 +161,18 @@ popd
> %make transform='' DESTDIR=%buildroot INSTALLDIRS=vendor install
> 
> 
>-%__subst "s,%_libdir/libMagickCore.la,-L%_libdir -lMagickCore," %buildroot%_libdir/%mgkdir-%dversion/modules-%qlev/*/*.la
>+sed -i "s,%_libdir/libMagickCore.la,-L%_libdir -lMagickCore," %buildroot%_libdir/%mgkdir-%dversion/modules-%qlev/*/*.la
> 
>-%__install -pD -m644 %SOURCE1 %buildroot%_datadir/applications/%name.desktop
>-%__install -pD -m644 %SOURCE2 %buildroot%_miconsdir/%name.png
>-%__install -pD -m644 %SOURCE3 %buildroot%_niconsdir/%name.png
>-%__install -pD -m644 %SOURCE4 %buildroot%_liconsdir/%name.png
>+install -pD -m644 %SOURCE1 %buildroot%_datadir/applications/%name.desktop
>+install -pD -m644 %SOURCE2 %buildroot%_miconsdir/%name.png
>+install -pD -m644 %SOURCE3 %buildroot%_niconsdir/%name.png
>+install -pD -m644 %SOURCE4 %buildroot%_liconsdir/%name.png
> 
> chrpath -d %buildroot%perl_vendor_archlib/auto/Image/Magick/Magick.so
> chrpath -d %buildroot%perl_vendor_archlib/auto/Image/Magick//Q16/Q16.so
> 
> mv %buildroot%_docdir/%name-6 %buildroot%_docdir/%name-%dversion
>+
> %files
> 
> %files tools
>@@ -226,6 +230,9 @@ mv %buildroot%_docdir/%name-6 %buildroot%_docdir/%name-%dversion
> %endif
> 
> %changelog
>+* Fri Jan 13 2017 Michael Shigorin <mike@altlinux.org> 6.9.6.2-alt1.1
>+- BOOTSTRAP: drop hairy BRs if requested to
>+
> * Wed Oct 12 2016 Anton Farygin <rider@altlinux.ru> 6.9.6.2-alt1
> - new version
>

Actions: View | Diff

Attachments on bug 32999: 6934