This commit is contained in:
parent
4ef3495a6c
commit
44e61edaec
@ -99,6 +99,9 @@ Source2: xtp-%{xtp_version}.tar.bz2
|
|||||||
Source3: baselibs.conf
|
Source3: baselibs.conf
|
||||||
Patch1: ImageMagick-6.6.8.9-examples.patch
|
Patch1: ImageMagick-6.6.8.9-examples.patch
|
||||||
Patch2: ImageMagick-6.6.8.9-doc.patch
|
Patch2: ImageMagick-6.6.8.9-doc.patch
|
||||||
|
# remove inc-struct.diff as soon as it will be not comfortable to port
|
||||||
|
# see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include
|
||||||
|
# for upstream progress
|
||||||
Patch3: ImageMagick-6.6.9.1-inc-struct.diff
|
Patch3: ImageMagick-6.6.9.1-inc-struct.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Provides: imagemag = %{version}
|
Provides: imagemag = %{version}
|
||||||
@ -202,6 +205,10 @@ rm -rf xtp-%{xtp_version}
|
|||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
# remove together with inc-struct.diff ----
|
||||||
|
echo>header-test.c '#include "wand.h"' #
|
||||||
|
echo>wand.h '#include "wand/MagickWand.h"' #
|
||||||
|
%{__make} header-test.o #
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%define CFLAGS ${RPM_OPT_FLAGS} -fstack-protector-all
|
%define CFLAGS ${RPM_OPT_FLAGS} -fstack-protector-all
|
||||||
|
Loading…
x
Reference in New Issue
Block a user