Author: rjones
Update of /cvs/pkgs/rpms/ocaml-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24471
Modified Files:
.cvsignore ocaml-cairo.spec sources
Log Message:
* Mon Dec 7 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1:1.2.0-0.1.gita5c5ee9f
- So we are wrong, version numbers did NOT roll backwards.
- Revert to current git head (a5c5ee9f) which is a pre-release of 1.2.0
(RHBZ#541542).
- Replace %%define with %%global.
- Patch0 is now upstream.
- Checked package with rpmlint - no problems.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 8 Oct 2009 11:51:34 -0000 1.3
+++ .cvsignore 7 Dec 2009 15:00:58 -0000 1.4
@@ -1 +1 @@
-cairo-ocaml-1.0.0.tar.bz2
+ocaml-cairo-1.2.0-gita5c5ee9f.tar.gz
Index: ocaml-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-cairo.spec 26 Nov 2009 09:39:41 -0000 1.15
+++ ocaml-cairo.spec 7 Dec 2009 15:00:58 -0000 1.16
@@ -1,10 +1,19 @@
-%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}
+
+# There are no source releases for ocaml-cairo > 1.0.0. To get the
+# source matching this you have to do:
+#
+# git clone git://anongit.freedesktop.org/cairo-ocaml
+# cd cairo-ocaml
+# git archive --prefix=ocaml-cairo-%{version}/ %{commit} | \
+# gzip > ../ocaml-cairo-1.2.0-git%{commit}.tar.gz
+%global commit a5c5ee9f
Name: ocaml-cairo
Epoch: 1
-Version: 1.0.0
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 0.1.git%{commit}%{?dist}
Summary: OCaml library for accessing cairo graphics
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,15 +23,14 @@ Group: Development/Libraries
License: LGPLv2
URL: http://cairographics.org/cairo-ocaml/
-Source0: cairo-ocaml-%{version}.tar.bz2
+Source0: ocaml-cairo-%{version}-git%{commit}.tar.gz
Source1: ocaml-cairo-META
-Patch0: cairo-ocaml-1.0.0-bigarray.patch
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-lablgtk-devel
-BuildRequires: cairo-devel
+BuildRequires: cairo-devel >= 1.2.0
BuildRequires: automake
BuildRequires: gtk2-devel
BuildRequires: chrpath
@@ -60,8 +68,7 @@ developing applications that use %{name}
%prep
-%setup -q -n cairo-ocaml-%{version}
-%patch0 -p1
+%setup -q
aclocal -I support
autoconf
@@ -116,6 +123,14 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Dec 7 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1:1.2.0-0.1.gita5c5ee9f
+- So we are wrong, version numbers did NOT roll backwards.
+- Revert to current git head (a5c5ee9f) which is a pre-release of 1.2.0
+ (RHBZ#541542).
+- Replace %%define with %%global.
+- Patch0 is now upstream.
+- Checked package with rpmlint - no problems.
+
* Thu Nov 26 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1:1.0.0-2
- ocaml-cairo-devel requires ocaml-lablgtk-devel (RHBZ#541427).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 8 Oct 2009 11:51:35 -0000 1.3
+++ sources 7 Dec 2009 15:00:58 -0000 1.4
@@ -1 +1 @@
-2b7e6f4dc7b78236eadaac16e16af0a9 cairo-ocaml-1.0.0.tar.bz2
+0ff91ee5e4360e84305b66226362b2ca ocaml-cairo-1.2.0-gita5c5ee9f.tar.gz
_______________________________________________
Fedora-ocaml-list mailing list
Fedora-ocaml-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-ocaml-list
