From 3cce747f9da780e0def252737e7da42fd86b959c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 19 Oct 2012 14:16:35 +0100 Subject: [PATCH] Rebuild for OCaml 4.00.1. - Clean up the spec file. --- ocaml-camomile.spec | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec index d28282a..efadb5e 100644 --- a/ocaml-camomile.spec +++ b/ocaml-camomile.spec @@ -1,19 +1,17 @@ -%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%define debug_package %{nil} +%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) +%global debug_package %{nil} Name: ocaml-camomile Version: 0.8.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Unicode library for OCaml -Group: Development/Libraries # Several files are MIT and UCD licensed, but the overall work is LGPLv2+ # and the LGPL/GPL supercedes compatible licenses. # https://www.redhat.com/archives/fedora-legal-list/2008-March/msg00005.html License: LGPLv2+ URL: http://sourceforge.net/projects/camomile/ Source0: http://downloads.sourceforge.net/camomile/camomile-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x BuildRequires: ocaml >= 3.12.1-12 @@ -21,9 +19,6 @@ BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel -%define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description Camomile is a Unicode library for ocaml. Camomile provides Unicode @@ -34,7 +29,6 @@ more. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} @@ -45,7 +39,6 @@ developing applications that use %{name}. %package data Summary: Data files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} @@ -67,7 +60,6 @@ strip tools/*.opt %install -rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs @@ -79,10 +71,6 @@ cp tools/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef %endif -%clean -rm -rf $RPM_BUILD_ROOT - - %files %defattr(-,root,root,-) %doc README @@ -117,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 19 2012 Richard W.M. Jones - 0.8.3-10 +- Rebuild for OCaml 4.00.1. +- Clean up the spec file. + * Sat Jul 28 2012 Richard W.M. Jones - 0.8.3-9 - Bump and rebuild against new OCaml 4.00.0 official release.