rpms/ocaml-camlimages/devel camlimages-2.2.0-stubdest.patch, NONE, 1.1 ocaml-camlimages.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Nigel Jones (nigelj)
fedora-extras-commits at redhat.com
Sat May 5 23:20:35 UTC 2007
Author: nigelj
Update of /cvs/extras/rpms/ocaml-camlimages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20517/devel
Modified Files:
.cvsignore sources
Added Files:
camlimages-2.2.0-stubdest.patch ocaml-camlimages.spec
Log Message:
Import into devel
camlimages-2.2.0-stubdest.patch:
--- NEW FILE camlimages-2.2.0-stubdest.patch ---
diff -ru camlimages-2.2.old/Makefile camlimages-2.2/Makefile
--- camlimages-2.2.old/Makefile 2004-10-03 04:49:05.000000000 +1300
+++ camlimages-2.2/Makefile 2007-05-04 09:55:10.000000000 +1200
@@ -92,15 +92,15 @@
installopt: install
install: all
- mkdir -p $(LIBDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
if test -w $(CAMLDIR)/ld.conf \
&& test `grep -s -c '^$(LIBDIR)$$' $(CAMLDIR)/ld.conf` = 0; then \
echo $(LIBDIR) >> $(CAMLDIR)/ld.conf; \
fi
- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done
- $(CP) Makefile.config $(LIBDIR)
- $(CP) config.h $(LIBDIR)
- $(RANLIB) $(LIBDIR)/*.a
+ for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR)) || exit $$?; done
+ $(CP) Makefile.config $(DESTDIR)$(LIBDIR)
+ $(CP) config.h $(DESTDIR)$(LIBDIR)
+ $(RANLIB) $(DESTDIR)$(LIBDIR)/*.a
depend:
for i in $(BUILDDIRS); do (cd $$i; $(MAKE) depend) || exit $$?; done
diff -ru camlimages-2.2.old/Makefile.shared camlimages-2.2/Makefile.shared
--- camlimages-2.2.old/Makefile.shared 2004-10-03 03:20:09.000000000 +1300
+++ camlimages-2.2/Makefile.shared 2007-05-04 09:53:32.000000000 +1200
@@ -45,8 +45,10 @@
rm -f *.cm[iox] *.o *.cma *.cmxa *.a *.so *~
install:: all
- - mkdir -p $(LIBDIR)
- - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(LIBDIR)
+ - mkdir -p $(DESTDIR)$(LIBDIR)
+ - mkdir -p $(DESTDIR)$(CAMLDIR)/stublibs
+ - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a $(DESTDIR)$(LIBDIR)
+ - cp -p *.so $(DESTDIR)$(CAMLDIR)/stublibs
#######
--- NEW FILE ocaml-camlimages.spec ---
Name: ocaml-camlimages
Version: 2.2.0
Release: 7%{?dist}
Summary: OCaml image processing library
Group: Development/Libraries
License: LGPL
URL: http://pauillac.inria.fr/camlimages/
Source0: ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/camlimages-%{version}.tgz
Source1: camlimages-2.2.0-htmlref.tar.gz
Patch0: camlimages-2.2.0-stubdest.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: lablgtk libpng-devel libjpeg-devel ocaml
BuildRequires: libXpm-devel ghostscript-devel freetype-devel
BuildRequires: giflib-devel
Requires: ocaml
%define buildlibs ppm bmp xvthumb jpeg gif png xpm ps graphics freetype
%description
CamlImages is an image processing library for Objective CAML, which provides:
basic functions for image processing and loading/saving, various image file
formats (hence providing a translation facility from format to format),
and an interface with the Caml graphics library allows to display images
in the Graphics module screen and to mix them with Caml drawings
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
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
%patch -p1
sed -i -e 's|LIBRARYDIRS=ppm bmp xvthumb jpeg tiff gif png xpm ps graphics freetype|LIBRARYDIRS=%buildlibs|' Makefile.build.in
%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
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.mli
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc Announce Announce-2.2 CHANGES LICENSE README doc/
%{_libdir}/ocaml/stublibs/*.so
%files devel
%defattr(-,root,root,-)
%doc htmlref/
%{_libdir}/ocaml/camlimages
%changelog
* Fri May 04 2007 Nigel Jones <dev at nigelj.com> 2.2.0-7
- Change to Makefile patch to move .so files to stublibs
- Rename to ocaml-camlimages
- Other changes per review
* Thu May 03 2007 Nigel Jones <dev at nigelj.com> 2.2.0-6
- Include .*a files just to make sure
* Thu May 03 2007 Nigel Jones <dev at nigelj.com> 2.2.0-5
- Revert -4 changes
- Remove excludedirs patch, replace with a sed
- Provide html documentation generated from running ocaml-ocamldoc
* Thu Apr 26 2007 Nigel Jones <dev at nigelj.com> 2.2.0-4
- Add Provides: camlimages-static, and LICENSE to -devel docs
* Thu Apr 12 2007 Nigel Jones <dev at nigelj.com> 2.2.0-3
- Remove .a & .o files
* Wed Apr 11 2007 Nigel Jones <dev at nigelj.com> 2.2.0-2
- Add missing dependencies
* Tue Apr 10 2007 Nigel Jones <dev at nigelj.com> 2.2.0-1
- Initial spec file
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml-camlimages/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 May 2007 15:58:27 -0000 1.1
+++ .cvsignore 5 May 2007 23:20:00 -0000 1.2
@@ -0,0 +1,2 @@
+camlimages-2.2.0-htmlref.tar.gz
+camlimages-2.2.0.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml-camlimages/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 May 2007 15:58:27 -0000 1.1
+++ sources 5 May 2007 23:20:00 -0000 1.2
@@ -0,0 +1,2 @@
+fb1633c9c8df0b2b2d0f892d8c4ac2ee camlimages-2.2.0-htmlref.tar.gz
+d933eb58c7983f70b1a000fa01893aa4 camlimages-2.2.0.tgz
More information about the fedora-extras-commits
mailing list