- Home page moved (fixes rhbz 468158).
- New upstream version 3.0.1 and multiple build fixes for this. - License is really LGPLv2 with the OCaml linking exception. - Removed the DESTDIR patch. - Build tiff support. - Run it through rpmlint and fix all problems.
This commit is contained in:
parent
8d9849f7cf
commit
94506545e7
@ -1,2 +1,3 @@
|
|||||||
camlimages-2.2.0-htmlref.tar.gz
|
camlimages-2.2.0-htmlref.tar.gz
|
||||||
camlimages-2.2.0.tgz
|
camlimages-2.2.0.tgz
|
||||||
|
camlimages-3.0.1.tar.gz
|
||||||
|
@ -3,24 +3,26 @@
|
|||||||
%define _default_patch_fuzz 2
|
%define _default_patch_fuzz 2
|
||||||
|
|
||||||
Name: ocaml-camlimages
|
Name: ocaml-camlimages
|
||||||
Version: 2.2.0
|
Version: 3.0.1
|
||||||
Release: 13%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: OCaml image processing library
|
Summary: OCaml image processing library
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: LGPLv2+ with exceptions
|
License: LGPLv2 with exceptions
|
||||||
URL: http://pauillac.inria.fr/camlimages/
|
URL: http://gallium.inria.fr/camlimages/
|
||||||
Source0: ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/camlimages-%{version}.tgz
|
Source0: http://gallium.inria.fr/camlimages/camlimages-%{version}.tar.gz
|
||||||
Source1: camlimages-2.2.0-htmlref.tar.gz
|
Source1: camlimages-2.2.0-htmlref.tar.gz
|
||||||
Patch0: camlimages-2.2.0-stubdest.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
Patch0: camlimages-3.0.1-display-module.patch
|
||||||
|
|
||||||
BuildRequires: ocaml >= 3.10.1
|
BuildRequires: ocaml >= 3.10.1
|
||||||
BuildRequires: ocaml-lablgtk-devel
|
BuildRequires: ocaml-lablgtk-devel
|
||||||
BuildRequires: lablgtk, libpng-devel, libjpeg-devel
|
BuildRequires: lablgtk, libpng-devel, libjpeg-devel
|
||||||
BuildRequires: libXpm-devel, ghostscript-devel, freetype-devel
|
BuildRequires: libXpm-devel, ghostscript-devel, freetype-devel
|
||||||
BuildRequires: giflib-devel
|
BuildRequires: giflib-devel
|
||||||
%define buildlibs ppm bmp xvthumb jpeg gif png xpm ps graphics freetype
|
BuildRequires: libtiff-devel
|
||||||
|
BuildRequires: libtool, automake, autoconf
|
||||||
|
|
||||||
%define _use_internal_dependency_generator 0
|
%define _use_internal_dependency_generator 0
|
||||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
||||||
@ -38,31 +40,43 @@ In addition, the library can handle huge images that cannot be (or can hardly
|
|||||||
be) stored into the main memory (the library then automatically creates swap
|
be) stored into the main memory (the library then automatically creates swap
|
||||||
files and escapes them to reduce the memory usage).
|
files and escapes them to reduce the memory usage).
|
||||||
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for camlimages
|
Summary: Development files for camlimages
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The camlimages-devel package provides libraries and headers for
|
The camlimages-devel package provides libraries and headers for
|
||||||
developing applications using camlimages
|
developing applications using camlimages
|
||||||
|
|
||||||
Includes documentation provided by ocamldoc
|
Includes documentation provided by ocamldoc
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n camlimages-2.2 -a 1
|
%setup -q -n camlimages-%{version} -a 1
|
||||||
|
|
||||||
|
# Gdk.Display submodule clashes with the Display module in
|
||||||
|
# the examples/liv directory, so rename it:
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
sed -i -e 's|LIBRARYDIRS=ppm bmp xvthumb jpeg tiff gif png xpm ps graphics freetype|LIBRARYDIRS=%buildlibs|' Makefile.build.in
|
aclocal -I .
|
||||||
|
automake
|
||||||
|
autoconf
|
||||||
|
mv examples/liv/display.ml examples/liv/livdisplay.ml
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
make
|
make
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install ocamlsitelibdir=%{_libdir}/ocaml/camlimages DESTDIR=$RPM_BUILD_ROOT
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.o
|
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.cmo
|
strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllcamlimages.so
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -70,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc Announce Announce-2.2 CHANGES LICENSE README doc/
|
%doc INSTALL README
|
||||||
%{_libdir}/ocaml/camlimages
|
%{_libdir}/ocaml/camlimages
|
||||||
%{_libdir}/ocaml/stublibs/*.so
|
%{_libdir}/ocaml/stublibs/*.so
|
||||||
%if %opt
|
%if %opt
|
||||||
@ -79,9 +93,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
%exclude %{_libdir}/ocaml/camlimages/*.mli
|
%exclude %{_libdir}/ocaml/camlimages/*.mli
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc htmlref/
|
%doc doc/*.{html,jpg}
|
||||||
%if %opt
|
%if %opt
|
||||||
%{_libdir}/ocaml/camlimages/*.a
|
%{_libdir}/ocaml/camlimages/*.a
|
||||||
%{_libdir}/ocaml/camlimages/*.cmxa
|
%{_libdir}/ocaml/camlimages/*.cmxa
|
||||||
@ -90,6 +105,14 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 3 2008 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-1
|
||||||
|
- Home page moved (fixes rhbz 468158).
|
||||||
|
- New upstream version 3.0.1 and multiple build fixes for this.
|
||||||
|
- License is really LGPLv2 with the OCaml linking exception.
|
||||||
|
- Removed the DESTDIR patch.
|
||||||
|
- Build tiff support.
|
||||||
|
- Run it through rpmlint and fix all problems.
|
||||||
|
|
||||||
* Thu Aug 28 2008 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-13
|
* Thu Aug 28 2008 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-13
|
||||||
- Rebuild with patch fuzz.
|
- Rebuild with patch fuzz.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user