rpms/ocaml-gettext/devel .cvsignore, 1.2, 1.3 ocaml-gettext.spec, 1.1, 1.2 sources, 1.2, 1.3 ocaml-gettext-0.2.0-20080321.patch, 1.1, NONE

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19393/devel

Modified Files:
	.cvsignore ocaml-gettext.spec sources 
Removed Files:
	ocaml-gettext-0.2.0-20080321.patch 
Log Message:
* Wed Apr 30 2008 Richard W.M. Jones <rjones at redhat.com> - 0.3.0-1
- New upstream version 0.3.0.
- Big patch no longer required (integrated with upstream).
- findlib < 1.2.1-3 known not to work with this.
- build/ -> _build/
- Re-enable documentation.
- Prevent *.o files from being distributed.
- Distribute *.cmx and *.mli files.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gettext/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Apr 2008 21:50:16 -0000	1.2
+++ .cvsignore	30 Apr 2008 09:03:51 -0000	1.3
@@ -1 +1 @@
-ocaml-gettext-0.2.0.tar.gz
+ocaml-gettext-0.3.0.tar.gz


Index: ocaml-gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gettext/devel/ocaml-gettext.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-gettext.spec	27 Apr 2008 21:50:16 -0000	1.1
+++ ocaml-gettext.spec	30 Apr 2008 09:03:51 -0000	1.2
@@ -1,11 +1,9 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
-%define alphatag 20080321patch
-
 Name:           ocaml-gettext
-Version:        0.2.0
-Release:        3.%{alphatag}%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        OCaml library for i18n
 
 Group:          Development/Libraries
@@ -14,10 +12,8 @@
 Source0:        http://sylvain.le-gall.net/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         ocaml-gettext-0.2.0-20080321.patch
-
 BuildRequires:  ocaml >= 3.10.0
-BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-findlib-devel >= 1.2.1-3
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-fileutils-devel
@@ -91,7 +87,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -99,15 +94,14 @@
 CFLAGS="$RPM_OPT_FLAGS" \
 ./configure \
   --libdir=%{_libdir} \
-  --disable-doc
+  --with-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets
 %else
 CFLAGS="$RPM_OPT_FLAGS" \
 ./configure \
   --libdir=%{_libdir} \
-  --disable-doc \
   --disable-camomile \
+  --with-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets
 %endif
-# --with-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets
 make
 
 
@@ -121,12 +115,15 @@
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 
-ocamlfind install gettext build/lib/gettext/*
-ocamlfind install gettext-stub build/lib/gettext-stub/*
+# Remove *.o files - these shouldn't be distributed.
+find _build -name '*.o' -exec rm {} \;
+
+ocamlfind install gettext _build/lib/gettext/*
+ocamlfind install gettext-stub _build/lib/gettext-stub/*
 %ifnarch ppc64
-ocamlfind install gettext-camomile build/lib/gettext-camomile/*
+ocamlfind install gettext-camomile _build/lib/gettext-camomile/*
 %endif
-install -m 0755 build/bin/* $RPM_BUILD_ROOT%{_bindir}/
+install -m 0755 _build/bin/* $RPM_BUILD_ROOT%{_bindir}/
 
 
 strip $OCAMLFIND_DESTDIR/stublibs/dll*.so
@@ -146,9 +143,13 @@
 %if %opt
 %exclude %{_libdir}/ocaml/gettext/*.a
 %exclude %{_libdir}/ocaml/gettext/*.cmxa
+%exclude %{_libdir}/ocaml/gettext/*.cmx
 %exclude %{_libdir}/ocaml/gettext-stub/*.a
 %exclude %{_libdir}/ocaml/gettext-stub/*.cmxa
+%exclude %{_libdir}/ocaml/gettext-stub/*.cmx
 %endif
+%exclude %{_libdir}/ocaml/gettext/*.mli
+%exclude %{_libdir}/ocaml/gettext-stub/*.mli
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 
@@ -160,9 +161,13 @@
 %if %opt
 %{_libdir}/ocaml/gettext/*.a
 %{_libdir}/ocaml/gettext/*.cmxa
+%{_libdir}/ocaml/gettext/*.cmx
 %{_libdir}/ocaml/gettext-stub/*.a
 %{_libdir}/ocaml/gettext-stub/*.cmxa
+%{_libdir}/ocaml/gettext-stub/*.cmx
 %endif
+%{_libdir}/ocaml/gettext/*.mli
+%{_libdir}/ocaml/gettext-stub/*.mli
 %{_bindir}/ocaml-gettext
 %{_bindir}/ocaml-xgettext
 
@@ -175,7 +180,9 @@
 %if %opt
 %exclude %{_libdir}/ocaml/gettext-camomile/*.a
 %exclude %{_libdir}/ocaml/gettext-camomile/*.cmxa
+%exclude %{_libdir}/ocaml/gettext-camomile/*.cmx
 %endif
+%exclude %{_libdir}/ocaml/gettext-camomile/*.mli
 
 
 %files camomile-devel
@@ -184,11 +191,22 @@
 %if %opt
 %{_libdir}/ocaml/gettext-camomile/*.a
 %{_libdir}/ocaml/gettext-camomile/*.cmxa
+%{_libdir}/ocaml/gettext-camomile/*.cmx
 %endif
+%{_libdir}/ocaml/gettext-camomile/*.mli
 %endif
 
 
 %changelog
+* Wed Apr 30 2008 Richard W.M. Jones <rjones at redhat.com> - 0.3.0-1
+- New upstream version 0.3.0.
+- Big patch no longer required (integrated with upstream).
+- findlib < 1.2.1-3 known not to work with this.
+- build/ -> _build/
+- Re-enable documentation.
+- Prevent *.o files from being distributed.
+- Distribute *.cmx and *.mli files.
+
 * Sat Apr 26 2008 Richard W.M. Jones <rjones at redhat.com> - 0.2.0-3.20080321patch
 - Change the naming scheme to conform with "Snapshot packages" guideline.
 - Don't duplicate all the docs in camomile-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gettext/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Apr 2008 21:50:16 -0000	1.2
+++ sources	30 Apr 2008 09:03:51 -0000	1.3
@@ -1 +1 @@
-4e95d69e6910c4c0dcafb7e2f8dc5491  ocaml-gettext-0.2.0.tar.gz
+06132918591916d742391151636e9b82  ocaml-gettext-0.3.0.tar.gz


--- ocaml-gettext-0.2.0-20080321.patch DELETED ---