rpms/ocaml/devel ocaml.spec,1.45,1.46

[Rex Dieter]

Author: rdieter

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

Modified Files:
	ocaml.spec 
Log Message:
* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.11.0-0.3.beta1
- fix NVR to match packaging guidelines



Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ocaml.spec	20 Nov 2008 17:52:37 -0000	1.45
+++ ocaml.spec	20 Nov 2008 19:02:24 -0000	1.46
@@ -1,8 +1,12 @@
 %define _default_patch_fuzz 2
 
+# when beta/prerelease goes away, so also can these macros
+%define beta beta1
+%define beta_tag +%{beta}
+
 Name:           ocaml
-Version:        3.11.0+beta1
-Release:        2%{?dist}
+Version:        3.11.0
+Release:        0.3%{?beta:.%{beta}}%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -11,7 +15,7 @@
 
 URL:            http://www.ocaml.org
 
-Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}.tar.bz2
+Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}%{?beta_tag}.tar.bz2
 Source1:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.html.tar.gz
 Source2:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.pdf
 Source3:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.info.tar.gz
@@ -203,9 +207,9 @@
 
 
 %prep
-%setup -q -T -b 0
-%setup -q -T -D -a 1
-%setup -q -T -D -a 3
+%setup -q -T -b 0 -n %{name}-%{version}%{?beta_tag}
+%setup -q -T -D -a 1 -n %{name}-%{version}%{?beta_tag}
+%setup -q -T -D -a 3 -n %{name}-%{version}%{?beta_tag}
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .cflags
 #%patch2 -p1 -b .tclver
@@ -453,6 +457,9 @@
 
 
 %changelog
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.11.0-0.3.beta1
+- fix NVR to match packaging guidelines
+
 * Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 3.11.0+beta1-2
 - Fix Invalid_argument("String.index_from") with patch from upstream.