rpms/ocaml-camlimages/devel .cvsignore, 1.2, 1.3 ocaml-camlimages.spec, 1.7, 1.8 sources, 1.2, 1.3

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13189

Modified Files:
	.cvsignore ocaml-camlimages.spec sources 
Log Message:
* Mon Nov  3 2008 Richard W.M. Jones <rjones at 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 May 2007 23:20:00 -0000	1.2
+++ .cvsignore	3 Nov 2008 17:49:30 -0000	1.3
@@ -1,2 +1,3 @@
 camlimages-2.2.0-htmlref.tar.gz
 camlimages-2.2.0.tgz
+camlimages-3.0.1.tar.gz


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-camlimages.spec	28 Aug 2008 16:45:54 -0000	1.7
+++ ocaml-camlimages.spec	3 Nov 2008 17:49:30 -0000	1.8
@@ -3,24 +3,26 @@
 %define _default_patch_fuzz 2
 
 Name:           ocaml-camlimages
-Version:        2.2.0
-Release:        13%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
-License:        LGPLv2+ with exceptions
-URL:            http://pauillac.inria.fr/camlimages/
-Source0:        ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/camlimages-%{version}.tgz
+License:        LGPLv2 with exceptions
+URL:            http://gallium.inria.fr/camlimages/
+Source0:        http://gallium.inria.fr/camlimages/camlimages-%{version}.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)
 
+Patch0:         camlimages-3.0.1-display-module.patch
+
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  lablgtk, libpng-devel, libjpeg-devel
 BuildRequires:  libXpm-devel, ghostscript-devel, freetype-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 __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -38,31 +40,43 @@
 be) stored into the main memory (the library then automatically creates swap
 files and escapes them to reduce the memory usage).
 
+
 %package        devel
 Summary:        Development files for camlimages
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} 
 
+
 %description    devel
 The camlimages-devel package provides libraries and headers for 
 developing applications using camlimages
 
 Includes documentation provided by ocamldoc
 
+
 %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
-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
 %configure
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.o
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.cmo
+make install ocamlsitelibdir=%{_libdir}/ocaml/camlimages DESTDIR=$RPM_BUILD_ROOT
+
+strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllcamlimages.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +84,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Announce Announce-2.2 CHANGES LICENSE README doc/
+%doc INSTALL README
 %{_libdir}/ocaml/camlimages
 %{_libdir}/ocaml/stublibs/*.so
 %if %opt
@@ -79,9 +93,10 @@
 %endif
 %exclude %{_libdir}/ocaml/camlimages/*.mli
 
+
 %files devel
 %defattr(-,root,root,-)
-%doc htmlref/
+%doc doc/*.{html,jpg}
 %if %opt
 %{_libdir}/ocaml/camlimages/*.a
 %{_libdir}/ocaml/camlimages/*.cmxa
@@ -90,6 +105,14 @@
 
 
 %changelog
+* Mon Nov  3 2008 Richard W.M. Jones <rjones at 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 at redhat.com> - 2.2.0-13
 - Rebuild with patch fuzz.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 May 2007 23:20:00 -0000	1.2
+++ sources	3 Nov 2008 17:49:30 -0000	1.3
@@ -1,2 +1,2 @@
 fb1633c9c8df0b2b2d0f892d8c4ac2ee  camlimages-2.2.0-htmlref.tar.gz
-d933eb58c7983f70b1a000fa01893aa4  camlimages-2.2.0.tgz
+ecacc0ecac17b5b9af1da97f68a814a0  camlimages-3.0.1.tar.gz