Accepting request 100582 from graphics

- Add explicit libbz2-devel BuildRequires
- Support LZMA
- Use libcms2 now.
- Cleanup huge dependency bloat in -devel package, this 
  will likely cause build fails on dependant packages
  the solution is to fix your BuildRequires. (forwarded request 100498 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/100582
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=77
This commit is contained in:
Stephan Kulow 2012-01-19 09:35:02 +00:00 committed by Git OBS Bridge
commit eee963031e
2 changed files with 24 additions and 29 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Jan 17 19:42:15 UTC 2012 - crrodriguez@opensuse.org
- Add explicit libbz2-devel BuildRequires
- Support LZMA
- Use libcms2 now.
- Cleanup huge dependency bloat in -devel package, this
will likely cause build fails on dependant packages
the solution is to fix your BuildRequires.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 31 13:51:57 UTC 2011 - pgajdos@suse.com Mon Oct 31 13:51:57 UTC 2011 - pgajdos@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ImageMagick # spec file for package ImageMagick
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -36,7 +36,8 @@ Name: ImageMagick
BuildRequires: fdupes pkgconfig BuildRequires: fdupes pkgconfig
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libbz2-devel
BuildRequires: lzma-devel
%if %{with DCraw} %if %{with DCraw}
BuildRequires: dcraw BuildRequires: dcraw
%endif %endif
@ -54,7 +55,7 @@ BuildRequires: ghostscript-fonts-other ghostscript-fonts-std ghostscript-librar
%endif %endif
%if %{with LCMS} %if %{with LCMS}
BuildRequires: liblcms-devel BuildRequires: liblcms2-devel
%endif %endif
%if %{with TIFF} %if %{with TIFF}
@ -129,30 +130,7 @@ Requires: libMagickCore%{libver} = %{version} libMagickWand%{libver} = %{v
Requires: ImageMagick = %{version} Requires: ImageMagick = %{version}
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%if %{with FreeType} Requires: glibc-devel
Requires: freetype2-devel
%endif
%if %{with LCMS}
Requires: liblcms-devel
%endif
%if %{with TIFF}
Requires: libtiff-devel
%endif
%if %{with WMF}
Requires: libwmf-devel
%endif
%if %{with EXIF}
Requires: libexif-devel
%endif
%if %{with JPEG}
Requires: libjasper-devel
%endif
%if %{with WEBP}
Requires: libwebp-devel
%endif
%if %{with RSVG}
Requires: librsvg-devel
%endif
%package extra %package extra
License: PERMISSIVE-OSI-COMPLIANT License: PERMISSIVE-OSI-COMPLIANT
@ -214,7 +192,7 @@ echo>wand.h '#include "wand/MagickWand.h"' #
%{__make} header-test.o # %{__make} header-test.o #
%build %build
%define CFLAGS ${RPM_OPT_FLAGS} -fstack-protector-all %define CFLAGS ${RPM_OPT_FLAGS}
%define LDFLAGS -L%{_libdir} %define LDFLAGS -L%{_libdir}
%define system_ltdl 0 %define system_ltdl 0
%if %system_ltdl %if %system_ltdl
@ -238,7 +216,7 @@ popd
# openmp does not work with perl module # openmp does not work with perl module
OPENMP="--disable-openmp" OPENMP="--disable-openmp"
%endif %endif
%configure \ %configure --with-pic \
--enable-shared \ --enable-shared \
--without-frozenpaths \ --without-frozenpaths \
--with-magick_plus_plus \ --with-magick_plus_plus \
@ -509,4 +487,11 @@ HTML documentation for ImageMagick library and scene examples.
%changelog %changelog