Accepting request 82576 from home:jengelh:bl
- Remove redundant tags/sections OBS-URL: https://build.opensuse.org/request/show/82576 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=84
This commit is contained in:
parent
28283668de
commit
dfc0d3a3e6
@ -2,6 +2,7 @@
|
|||||||
Fri Sep 16 17:34:10 UTC 2011 - jengelh@medozas.de
|
Fri Sep 16 17:34:10 UTC 2011 - jengelh@medozas.de
|
||||||
|
|
||||||
- Fix baselibs: add missing requires to ImageMagick-devel
|
- Fix baselibs: add missing requires to ImageMagick-devel
|
||||||
|
- Remove redundant tags/sections
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 7 08:53:45 UTC 2011 - pgajdos@suse.com
|
Wed Sep 7 08:53:45 UTC 2011 - pgajdos@suse.com
|
||||||
|
@ -88,7 +88,6 @@ BuildRequires: libwebp-devel
|
|||||||
%define source_version %{mfr_version}-%{mfr_revision}
|
%define source_version %{mfr_version}-%{mfr_revision}
|
||||||
License: Public Domain, Freeware
|
License: Public Domain, Freeware
|
||||||
Group: Productivity/Graphics/Other
|
Group: Productivity/Graphics/Other
|
||||||
AutoReqProv: on
|
|
||||||
Version: %{mfr_version}.%{mfr_revision}
|
Version: %{mfr_version}.%{mfr_revision}
|
||||||
Release: 1
|
Release: 1
|
||||||
%define libver 4
|
%define libver 4
|
||||||
@ -117,7 +116,6 @@ License: Public Domain, Freeware
|
|||||||
Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version}
|
Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version}
|
||||||
Summary: Perl interface for ImageMagick
|
Summary: Perl interface for ImageMagick
|
||||||
Group: Development/Libraries/Perl
|
Group: Development/Libraries/Perl
|
||||||
AutoReqProv: on
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: PERMISSIVE-OSI-COMPLIANT
|
License: PERMISSIVE-OSI-COMPLIANT
|
||||||
@ -125,7 +123,6 @@ 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++
|
||||||
AutoReqProv: on
|
|
||||||
%if %{with FreeType}
|
%if %{with FreeType}
|
||||||
Requires: freetype2-devel
|
Requires: freetype2-devel
|
||||||
%endif
|
%endif
|
||||||
@ -155,7 +152,6 @@ Summary: Viewer and Converter for Images - extra codecs
|
|||||||
Group: Productivity/Graphics/Other
|
Group: Productivity/Graphics/Other
|
||||||
#delegates configured in delegates.xml that imagemagick can use
|
#delegates configured in delegates.xml that imagemagick can use
|
||||||
Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf
|
Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf
|
||||||
AutoReqProv: on
|
|
||||||
|
|
||||||
%package -n libMagickCore%{libver}
|
%package -n libMagickCore%{libver}
|
||||||
|
|
||||||
@ -163,14 +159,12 @@ License: PERMISSIVE-OSI-COMPLIANT
|
|||||||
Summary: Viewer and Converter for Images - runtime library
|
Summary: Viewer and Converter for Images - runtime library
|
||||||
Group: Productivity/Graphics/Other
|
Group: Productivity/Graphics/Other
|
||||||
Suggests: ImageMagick-extra = %{version}
|
Suggests: ImageMagick-extra = %{version}
|
||||||
AutoReqProv: on
|
|
||||||
|
|
||||||
%package -n libMagickWand%{libver}
|
%package -n libMagickWand%{libver}
|
||||||
|
|
||||||
License: PERMISSIVE-OSI-COMPLIANT
|
License: PERMISSIVE-OSI-COMPLIANT
|
||||||
Summary: Viewer and Converter for Images - runtime library
|
Summary: Viewer and Converter for Images - runtime library
|
||||||
Group: Productivity/Graphics/Other
|
Group: Productivity/Graphics/Other
|
||||||
AutoReqProv: on
|
|
||||||
|
|
||||||
%package -n libMagick++%{libver}
|
%package -n libMagick++%{libver}
|
||||||
|
|
||||||
@ -178,7 +172,6 @@ License: PERMISSIVE-OSI-COMPLIANT
|
|||||||
Requires: ImageMagick
|
Requires: ImageMagick
|
||||||
Summary: C++ Interface for ImageMagick - runtime library
|
Summary: C++ Interface for ImageMagick - runtime library
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
AutoReqProv: on
|
|
||||||
# was last used in openSUSE 10.2
|
# was last used in openSUSE 10.2
|
||||||
Provides: ImageMagick-Magick++ = %{version}
|
Provides: ImageMagick-Magick++ = %{version}
|
||||||
Obsoletes: 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++
|
Group: Development/Libraries/C and C++
|
||||||
Provides: ImageMagick-Magick++-devel = %{version}
|
Provides: ImageMagick-Magick++-devel = %{version}
|
||||||
Obsoletes: ImageMagick-Magick++-devel < %{version}
|
Obsoletes: ImageMagick-Magick++-devel < %{version}
|
||||||
AutoReqProv: on
|
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
License: PERMISSIVE-OSI-COMPLIANT
|
License: PERMISSIVE-OSI-COMPLIANT
|
||||||
@ -250,15 +242,15 @@ popd
|
|||||||
--without-perl \
|
--without-perl \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
|
--with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
|
||||||
make %{?jobs:-j%jobs} all
|
make %{?_smp_mflags} all
|
||||||
cd PerlMagick
|
cd PerlMagick
|
||||||
perl Makefile.PL
|
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}
|
%if %{with xtp}
|
||||||
cd ../../xtp-%{xtp_version}
|
cd ../../xtp-%{xtp_version}
|
||||||
%configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}"
|
%configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}"
|
||||||
make %{?jobs:-j%jobs}
|
make %{?_smp_mflags}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
@ -301,9 +293,6 @@ echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"'
|
|||||||
%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api
|
%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%clean
|
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%post -n libMagickCore%{libver} -p /sbin/ldconfig
|
%post -n libMagickCore%{libver} -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -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
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user