rpms/cduce/devel .cvsignore, 1.5, 1.6 cduce.spec, 1.9, 1.10 sources, 1.5, 1.6

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28027

Modified Files:
	.cvsignore cduce.spec sources 
Log Message:
- Add ocamlduce subpackage.
- Capitalize the summary line as per packaging guidelines.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Dec 2008 14:44:43 -0000	1.5
+++ .cvsignore	17 Jan 2009 14:26:40 -0000	1.6
@@ -1,3 +1,4 @@
 cduce-0.5.2.1.tar.gz
 ocaml-3.10.2.tar.bz2
 ocaml-3.11.0.tar.bz2
+ocamlduce-3.11.0.0rc1.tar.gz


Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cduce.spec	14 Jan 2009 18:43:29 -0000	1.9
+++ cduce.spec	17 Jan 2009 14:26:40 -0000	1.10
@@ -1,21 +1,26 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
+
 %define ocaml_major 3.11
 %define ocaml_minor 0
 
+%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0rc1
+
 Name:           cduce
 Version:        0.5.2.1
-Release:        12%{?dist}
-Summary:        modern XML-oriented functional language
+Release:        13%{?dist}
+Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cduce.org/
-Source0:        http://www.cduce.org/download/%{name}-%{version}.tar.gz
-Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
+Source0:        http://www.cduce.org/download/%{name}-%{version}.tar.gz
+Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
+Source2:        https://forge.ocamlcore.org/frs/download.php/107/ocamlduce-%{ocamlduce_version}.tar.gz
+
 Patch0:         cduce-0.5.2.1-ocaml-3.11.0.patch
 
 BuildRequires:  ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -37,12 +42,16 @@
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
+
 %description
 CDuce is a modern XML-oriented functional language with innovative
 features. A compiler is available under the terms of an open-source
 license. CDuce is type-safe, efficient, and offers powerful
 constructions to work with XML documents.
 
+For ocamlduce (the modified OCaml language which incorporates CDuce
+extensions), please install the cduce-ocamlduce package.
+
 
 %package        devel
 Summary:        Development files for %{name}
@@ -55,8 +64,20 @@
 developing applications that use %{name}.
 
 
+%package        ocamlduce
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+
+%description    ocamlduce
+This package contains a modified version of the OCaml language which
+incorporates CDuce extensions for working with XML documents.
+
+
 %prep
 %setup -q -n cduce-0.5.2
+%setup -q -n cduce-0.5.2 -T -D -a 2
 
 %patch0 -p1
 
@@ -74,6 +95,23 @@
 strip cduce dtd2cduce
 chrpath --delete cduce
 
+# Building ocamlduce is a bit more involved ...
+pushd ocamlduce-%{ocamlduce_version}
+make prepare \
+  OCAML_VERSION=%{ocaml_major}.%{ocaml_minor} \
+  OCAML_SOURCE=%{SOURCE1} \
+  OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}
+cd ocaml-%{ocaml_major}.%{ocaml_minor}
+  # Configure must match the one from base ocaml.spec
+CFLAGS="$RPM_OPT_FLAGS" ./configure \
+    -bindir %{_bindir} \
+    -libdir %{_libdir}/ocaml \
+    -x11lib %{_libdir} \
+    -x11include %{_includedir} \
+    -mandir %{_mandir}/man1
+make -f Makefile.ocamlduce world world.opt
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +123,15 @@
   MANDIR=$RPM_BUILD_ROOT%{_mandir} \
   DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
 
+# Install ocamlduce.
+pushd ocamlduce-%{ocamlduce_version}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlduce
+cd ocaml-%{ocaml_major}.%{ocaml_minor}
+make -f Makefile.ocamlduce installbyte installopt \
+  DUCE_LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlduce \
+  BINDIR=$RPM_BUILD_ROOT%{_bindir}
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,7 +158,17 @@
 %{_docdir}/%{name}-devel-%{version}/
 
 
+%files ocamlduce
+%defattr(-,root,root,-)
+%{_bindir}/ocamlduce*
+%{_libdir}/ocaml/ocamlduce/
+
+
 %changelog
+* Sat Jan 17 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-13
+- Add ocamlduce subpackage.
+- Capitalize the summary line as per packaging guidelines.
+
 * Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-12
 - Improve the OCaml 3.11.0 patch (suggested by Kim Nguyen).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Dec 2008 14:44:43 -0000	1.5
+++ sources	17 Jan 2009 14:26:40 -0000	1.6
@@ -1,2 +1,3 @@
 d2d52bf536c1a8f4397b4c64794d9322  cduce-0.5.2.1.tar.gz
 6ed1c3ed660a15408362242fa8fa4668  ocaml-3.11.0.tar.bz2
+0e36873aa7c3ae9684a49e3e831446ed  ocamlduce-3.11.0.0rc1.tar.gz