Accepting request 108686 from home:yecril71pl:branches:graphics
- removed %if 0 - used make check instead OBS-URL: https://build.opensuse.org/request/show/108686 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=122
This commit is contained in:
Git OBS Bridge
parent
0c0b160f51
commit
bc9bc643f0
3
ImageMagick-6.6.9-9.tar.bz2
Normal file
3
ImageMagick-6.6.9-9.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5db6e2fd512cec2f6889cba001720ed67b6c37ef00fc7833270a9419e5e8b685
|
||||
size 10157812
|
||||
@ -1,3 +1,5 @@
|
||||
<<<<<<< .mine
|
||||
=======
|
||||
Only in old: AUTHORS.txt
|
||||
Only in old: ChangeLog
|
||||
Only in old: ImageMagick.spec.in
|
||||
@ -823,3 +825,4 @@ Index: ImageMagick-6.7.1-0/wand/pixel-iterator.h
|
||||
|
||||
typedef struct _PixelIterator
|
||||
PixelIterator;
|
||||
>>>>>>> .new
|
||||
|
||||
1043
ImageMagick-6.6.9.8-inc-struct.diff
Normal file
1043
ImageMagick-6.6.9.8-inc-struct.diff
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 9 9:4:11 UTC 2012 - giecrilj@stegny.2a.pl
|
||||
|
||||
- moved the libtool archives to the main package
|
||||
- separated the bulk documentation
|
||||
- added a regression %check for the locale comma crash
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 09:02:14 UTC 2012 - cfarrell@suse.com
|
||||
|
||||
|
||||
109
ImageMagick.spec
109
ImageMagick.spec
@ -15,6 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%bcond_with xtp
|
||||
%bcond_without DCraw
|
||||
%bcond_without FreeType
|
||||
@ -32,6 +33,20 @@
|
||||
%bcond_without RSVG
|
||||
|
||||
Name: ImageMagick
|
||||
%define xtp_version 5.4.3
|
||||
%define mfr_version 6.6.9
|
||||
%define mfr_revision 9
|
||||
%define source_version %{mfr_version}-%{mfr_revision}
|
||||
%define source_locator http://image_magick.veidrodis.com/image_magick/ImageMagick-%{source_version}.tar.bz2
|
||||
|
||||
License: Apache-2.0
|
||||
Group: Productivity/Graphics/Other
|
||||
AutoReqProv: on
|
||||
Version: %{mfr_version}.%{mfr_revision}
|
||||
Release: 0
|
||||
%define libver 4
|
||||
Summary: Viewer and Converter for Images
|
||||
Url: http://www.imagemagick.org
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libbz2-devel
|
||||
@ -96,20 +111,17 @@ BuildRequires: librsvg-devel
|
||||
%define mfr_version 6.7.4
|
||||
%define mfr_revision 7
|
||||
%define source_version %{mfr_version}-%{mfr_revision}
|
||||
Version: %{mfr_version}.%{mfr_revision}
|
||||
Release: 0
|
||||
%define libver 5
|
||||
Summary: Viewer and Converter for Images
|
||||
License: SUSE-ImageMagick
|
||||
Group: Productivity/Graphics/Other
|
||||
Url: http://www.imagemagick.org
|
||||
Source: ImageMagick-%{source_version}.tar.bz2
|
||||
Source: http://image_magick.veidrodis.com/image_magick/ImageMagick-%{source_version}.tar.bz2
|
||||
# To get mtime of file
|
||||
Source1: ImageMagick.changes
|
||||
%if %{with xtp}
|
||||
Source2: xtp-%{xtp_version}.tar.bz2
|
||||
%endif
|
||||
Source3: baselibs.conf
|
||||
Source4: wlb.tar.bz
|
||||
Patch1: ImageMagick-6.6.8.9-examples.patch
|
||||
Patch2: ImageMagick-6.6.8.9-doc.patch
|
||||
# remove inc-struct.diff as soon as it will be not comfortable to port
|
||||
@ -119,6 +131,7 @@ Patch3: ImageMagick-6.6.9.1-inc-struct.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: imagemag = %{version}
|
||||
Obsoletes: imagemag < %{version}
|
||||
Recommends: %{name}-doc = %{version}
|
||||
|
||||
%package -n perl-PerlMagick
|
||||
Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version}
|
||||
@ -173,19 +186,23 @@ Provides: ImageMagick-Magick++-devel = %{version}
|
||||
Obsoletes: ImageMagick-Magick++-devel < %{version}
|
||||
|
||||
%package doc
|
||||
Summary: Document Files for ImageMagick Library
|
||||
Summary: ImageMagick application suite documentation
|
||||
License: SUSE-ImageMagick
|
||||
Group: Development/Libraries/C and C++
|
||||
Group: Documentation/HTML
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%if !0%{?make_jobs:1}
|
||||
%define make_jobs %{__make} %{?_smp_mflags} V=1
|
||||
%endif
|
||||
|
||||
%prep
|
||||
rm -rf xtp-%{xtp_version}
|
||||
%if %{with xtp}
|
||||
%setup -n ImageMagick-%{source_version} -b 2
|
||||
%else
|
||||
%setup -n ImageMagick-%{source_version}
|
||||
%setup -n ImageMagick-%{source_version} -a 4
|
||||
%endif
|
||||
%patch1
|
||||
%patch2
|
||||
@ -193,7 +210,11 @@ rm -rf xtp-%{xtp_version}
|
||||
# remove together with inc-struct.diff ----
|
||||
echo>header-test.c '#include "wand.h"' #
|
||||
echo>wand.h '#include "wand/MagickWand.h"' #
|
||||
%{__make} header-test.o #
|
||||
%{make_jobs} header-test.o #
|
||||
chmod a-x PerlMagick/demo/*
|
||||
# move demo out of libtool operation
|
||||
%fdupes Magick++/demo
|
||||
%{__cp} -R -twww/Magick++ Magick++/demo
|
||||
|
||||
%build
|
||||
%define CFLAGS ${RPM_OPT_FLAGS}
|
||||
@ -229,15 +250,15 @@ popd
|
||||
--without-perl \
|
||||
--disable-static \
|
||||
--with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
|
||||
make %{?_smp_mflags} all
|
||||
%{make_jobs} all
|
||||
cd PerlMagick
|
||||
perl Makefile.PL
|
||||
make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}"
|
||||
%{make_jobs} 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 %{?_smp_mflags}
|
||||
%{make_jobs}
|
||||
%endif
|
||||
|
||||
%check
|
||||
@ -245,26 +266,24 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs
|
||||
export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs
|
||||
export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs
|
||||
export MAGICK_CONFIGURE_PATH=$PWD/config
|
||||
# LANG set to a value that used to crash IM
|
||||
LANG=pl_PL.UTF-8 %{make_jobs} check
|
||||
cd PerlMagick
|
||||
make test
|
||||
%{make_jobs} test
|
||||
|
||||
%install
|
||||
%{__install} -d "${RPM_BUILD_ROOT%}"'{_defaultdocdir}/%{name}/images'
|
||||
%{__make} install \
|
||||
%{makeinstall} \
|
||||
DESTDIR=$RPM_BUILD_ROOT \
|
||||
pkgdocdir=%{_defaultdocdir}/%{name}/
|
||||
cd PerlMagick
|
||||
%{__make} "DESTDIR=${RPM_BUILD_ROOT}" 'LD_RUN_PATH=%{_libdir}:%{_prefix}/X11R6/%{_lib}' install_vendor
|
||||
%{make_jobs} "DESTDIR=${RPM_BUILD_ROOT}" 'LD_RUN_PATH=%{_libdir}:%{_prefix}/X11R6/%{_lib}' install_vendor
|
||||
%perl_process_packlist
|
||||
cd '../Magick++'
|
||||
%{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat}
|
||||
PATH='/bin:/usr/bin' find demo -type f -perm +111 -execdir %{__rm} -rf '{}' ';'
|
||||
%{__mv} demo/makefile.2 demo/Makefile
|
||||
cd ..
|
||||
|
||||
%if %{with xtp}
|
||||
pushd ../xtp-%{xtp_version}
|
||||
%{__make} DESTDIR=$RPM_BUILD_ROOT install
|
||||
%{make_jobs} DESTDIR=$RPM_BUILD_ROOT install
|
||||
popd
|
||||
%endif
|
||||
|
||||
@ -276,8 +295,7 @@ PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \
|
||||
%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la
|
||||
echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"'
|
||||
%if 0%{?suse_version} > 1020
|
||||
%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}/wand
|
||||
%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api
|
||||
%fdupes '%{buildroot}%{_prefix}'
|
||||
%endif
|
||||
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
|
||||
|
||||
@ -295,29 +313,31 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%docdir %{_docdir}/%{name}
|
||||
%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE
|
||||
%{_bindir}/[^MW]*
|
||||
%doc %{_mandir}/man1/*
|
||||
%exclude %{_mandir}/man1/*-config.1.gz
|
||||
# moved to doc
|
||||
%exclude %{_docdir}/*
|
||||
|
||||
%files -n libMagickCore%{libver}
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE
|
||||
%dir %{_sysconfdir}/ImageMagick*
|
||||
%config %{_sysconfdir}/ImageMagick*/*
|
||||
%{_libdir}/libMagickCore.so.%{libver}*
|
||||
%dir %{_libdir}/ImageMagick*
|
||||
%dir %{_libdir}/ImageMagick*/modules*
|
||||
%dir %{_libdir}/ImageMagick*/modules*/*
|
||||
%{_libdir}/ImageMagick*/config
|
||||
%{_libdir}/ImageMagick*/modules*/*/*.so
|
||||
%exclude %{_libdir}/ImageMagick*/modules*/*/wmf.*
|
||||
%exclude %{_libdir}/ImageMagick*/modules*/*/jp2.*
|
||||
%exclude %{_libdir}/ImageMagick*/modules*/*/djvu.*
|
||||
%{_libdir}/ImageMagick*/modules*/*/*.so
|
||||
# don't remove la files, see bnc#579798
|
||||
%{_libdir}/ImageMagick*/modules*/*/*.la
|
||||
|
||||
%files -n libMagickCore%{libver}
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE
|
||||
%{_libdir}/libMagickCore.so.%{libver}*
|
||||
|
||||
%files -n libMagickWand%{libver}
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE
|
||||
@ -374,7 +394,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
|
||||
%files -n libMagick++-devel
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE
|
||||
%doc Magick++/demo
|
||||
%doc www/Magick++/demo
|
||||
%doc Magick++/NEWS Magick++/README Magick++/AUTHORS
|
||||
%{_libdir}/libMagick++.so
|
||||
%{_includedir}/ImageMagick/Magick++.h
|
||||
@ -386,13 +406,12 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root)
|
||||
%dir %{_docdir}/%{name}
|
||||
%if 0
|
||||
%{_docdir}/%{name}/index.html
|
||||
%{_docdir}/%{name}/www
|
||||
%{_docdir}/%{name}/images
|
||||
%{_docdir}/%{name}/scenes
|
||||
%endif
|
||||
%doc %{_docdir}/%{name}
|
||||
%exclude %{_docdir}/%{name}/ChangeLog
|
||||
%exclude %{_docdir}/%{name}/LICENSE
|
||||
%exclude %{_docdir}/%{name}/NEWS.txt
|
||||
%exclude %{_docdir}/%{name}/QuickStart.txt
|
||||
%exclude %{_docdir}/%{name}/README.txt
|
||||
|
||||
%description
|
||||
ImageMagick is a robust collection of tools and libraries to read,
|
||||
@ -499,6 +518,24 @@ HTML documentation for ImageMagick library and scene examples.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
BIN
wlb.tar.bz
Normal file
BIN
wlb.tar.bz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user