From 690f2c275dad0ad4977caf618e7348c915a08b24 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 11 Jan 2010 17:48:00 +0000 Subject: [PATCH] - Ignore bogus thread module Provides which the automatic dependency generator was giving us. - Replace %%define with %%global. - Use upstream RPM 4.8 OCaml internal dependency generator. --- ocaml-postgresql.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ocaml-postgresql.spec b/ocaml-postgresql.spec index f452031..aac0e8e 100644 --- a/ocaml-postgresql.spec +++ b/ocaml-postgresql.spec @@ -1,9 +1,9 @@ -%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-postgresql Version: 1.12.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for accessing PostgreSQL databases Group: Development/Libraries @@ -20,9 +20,7 @@ BuildRequires: postgresql-devel BuildRequires: chrpath BuildRequires: rpm >= 4.4.2.3-2 -%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 +%global __ocaml_provides_opts -i Condition -i Event -i Mutex -i Thread -i ThreadUnix %description @@ -92,6 +90,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 11 2010 Richard W.M. Jones - 1.12.3-3 +- Ignore bogus thread module Provides which the automatic dependency + generator was giving us. +- Replace %%define with %%global. +- Use upstream RPM 4.8 OCaml internal dependency generator. + * Wed Dec 30 2009 Richard W.M. Jones - 1.12.3-2 - Rebuild for OCaml 3.11.2.