diff --git a/ImageMagick.changes b/ImageMagick.changes index cd8589b..a79763e 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -2,6 +2,7 @@ Fri Sep 16 17:34:10 UTC 2011 - jengelh@medozas.de - Fix baselibs: add missing requires to ImageMagick-devel +- Remove redundant tags/sections ------------------------------------------------------------------- Wed Sep 7 08:53:45 UTC 2011 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index e313810..08788c1 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -88,7 +88,6 @@ BuildRequires: libwebp-devel %define source_version %{mfr_version}-%{mfr_revision} License: Public Domain, Freeware Group: Productivity/Graphics/Other -AutoReqProv: on Version: %{mfr_version}.%{mfr_revision} Release: 1 %define libver 4 @@ -117,7 +116,6 @@ License: Public Domain, Freeware Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version} Summary: Perl interface for ImageMagick Group: Development/Libraries/Perl -AutoReqProv: on %package devel License: PERMISSIVE-OSI-COMPLIANT @@ -125,7 +123,6 @@ Requires: libMagickCore%{libver} = %{version} libMagickWand%{libver} = %{v Requires: ImageMagick = %{version} Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -AutoReqProv: on %if %{with FreeType} Requires: freetype2-devel %endif @@ -155,7 +152,6 @@ Summary: Viewer and Converter for Images - extra codecs Group: Productivity/Graphics/Other #delegates configured in delegates.xml that imagemagick can use Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf -AutoReqProv: on %package -n libMagickCore%{libver} @@ -163,14 +159,12 @@ License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} -AutoReqProv: on %package -n libMagickWand%{libver} License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other -AutoReqProv: on %package -n libMagick++%{libver} @@ -178,7 +172,6 @@ License: PERMISSIVE-OSI-COMPLIANT Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library Group: Development/Libraries/C and C++ -AutoReqProv: on # was last used in openSUSE 10.2 Provides: ImageMagick-Magick++ = %{version} Obsoletes: ImageMagick-Magick++ < %{version} @@ -190,7 +183,6 @@ Summary: C++ Interface for ImageMagick - files mandatory for development Group: Development/Libraries/C and C++ Provides: ImageMagick-Magick++-devel = %{version} Obsoletes: ImageMagick-Magick++-devel < %{version} -AutoReqProv: on %package doc License: PERMISSIVE-OSI-COMPLIANT @@ -250,15 +242,15 @@ popd --without-perl \ --disable-static \ --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" -make %{?jobs:-j%jobs} all +make %{?_smp_mflags} all cd PerlMagick perl Makefile.PL -make %{?jobs:-j%jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" +make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" # %if %{with xtp} cd ../../xtp-%{xtp_version} %configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}" -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %endif %check @@ -301,9 +293,6 @@ echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"' %fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api %endif -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %post -n libMagickCore%{libver} -p /sbin/ldconfig %postun -n libMagickCore%{libver} -p /sbin/ldconfig @@ -570,4 +559,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog