Author: guillomovitch
Date: Wed Feb 14 17:38:35 2007
New Revision: 121044
Modified:
packages/cooker/ocaml-ocamlrpm/current/SPECS/ocaml-ocamlrpm.spec
Log:
fix dependencies, and use standard ocaml macro
Modified: packages/cooker/ocaml-ocamlrpm/current/SPECS/ocaml-ocamlrpm.spec
==============================================================================
--- packages/cooker/ocaml-ocamlrpm/current/SPECS/ocaml-ocamlrpm.spec
(original)
+++ packages/cooker/ocaml-ocamlrpm/current/SPECS/ocaml-ocamlrpm.spec Wed Feb
14 17:38:35 2007
@@ -1,8 +1,8 @@
%define up_name ocamlrpm
%define name ocaml-%{up_name}
%define version 1.2
-%define release %mkrel 1
-%define ocamllib %(if [ -x /usr/bin/ocamlc ]; then ocamlc -where; fi)/site-lib
+%define release %mkrel 2
+%define ocaml_sitelib %(if [ -x /usr/bin/ocamlc ]; then ocamlc
-where;fi)/site-lib
Name: %{name}
Version: %{version}
@@ -23,7 +23,6 @@
%package devel
Summary: Development files for %{name}
Group: Development/Other
-Requires: %{name} = %{version}
%description devel
This package contains the development files needed to build applications
@@ -37,10 +36,10 @@
%install
rm -rf %{buildroot}
-install -d -m 755 %{buildroot}/%{ocamllib}
-install -d -m 755 %{buildroot}/%{ocamllib}/stublibs
+install -d -m 755 %{buildroot}/%{ocaml_sitelib}
+install -d -m 755 %{buildroot}/%{ocaml_sitelib}/stublibs
ocamlfind \
- install -destdir %{buildroot}/%{ocamllib} \
+ install -destdir %{buildroot}/%{ocaml_sitelib} \
ocamlrpm META ocamlrpm.cmi ocamlrpm.mli ocamlrpm.cma \
ocamlrpm.cmxa ocamlrpm.a libocamlrpm.a dllocamlrpm.so
@@ -50,5 +49,5 @@
%files devel
%doc COPYING
%defattr(-,root,root)
-%{ocamllib}/%{up_name}
-%{ocamllib}/stublibs/*
+%{ocaml_sitelib}/%{up_name}
+%{ocaml_sitelib}/stublibs/*
