Petr Gajdos 2013-06-03 15:43:22 +00:00 committed by Git OBS Bridge
parent b8b7f2e6e5
commit 685b11c056
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 3 15:37:32 UTC 2013 - pgajdos@suse.com
- mark no-XPMCompliance.patch as suse specific
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 23 09:55:52 UTC 2013 - pgajdos@suse.com Thu May 23 09:55:52 UTC 2013 - pgajdos@suse.com

View File

@ -63,11 +63,12 @@ Patch0: ImageMagick-6.6.8.9-examples.patch
Patch1: ImageMagick-6.6.8.9-doc.patch Patch1: ImageMagick-6.6.8.9-doc.patch
Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch
Patch3: ImageMagick-6.8.4.0-rpath.patch Patch3: ImageMagick-6.8.4.0-rpath.patch
# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462
# upstream insists on XPMCompliance, so leaving this for compatibility reasons
Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch
# bugs # bugs
# will ask upstream if needed, or if other solution exists # will ask upstream if needed, or if other solution exists
Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch
# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462
Patch12: ImageMagick-6.8.5.7-no-XPMCompliance.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick %package -n perl-PerlMagick
@ -129,8 +130,8 @@ BuildArch: noarch
%patch1 %patch1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
@ -397,4 +398,6 @@ HTML documentation for ImageMagick library and scene examples.
%changelog %changelog