Author: rjones
Update of /cvs/pkgs/rpms/ocaml-bitstring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20259
Modified Files:
.cvsignore ocaml-bitstring.spec sources
Removed Files:
ocaml-bitstring-2.0.0-dynlink.patch
ocaml-bitstring-2.0.0-empty-case.patch
Log Message:
* Fri Jan 8 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 2.0.1-1
- New upstream version 2.0.1.
- Remove the two patches which are now upstream.
- Replace %%define with %%global.
- Use upstream RPM 4.8 OCaml dependency generator.
- Recheck package with rpmlint.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 20 Oct 2008 13:20:23 -0000 1.4
+++ .cvsignore 8 Jan 2010 14:59:16 -0000 1.5
@@ -1,2 +1 @@
-ocaml-bitstring-1.9.8.tar.gz
-ocaml-bitstring-2.0.0.tar.gz
+ocaml-bitstring-2.0.1.tar.gz
Index: ocaml-bitstring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/ocaml-bitstring.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-bitstring.spec 30 Dec 2009 13:54:28 -0000 1.14
+++ ocaml-bitstring.spec 8 Jan 2010 14:59:17 -0000 1.15
@@ -1,12 +1,12 @@
-%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}
# CIL tools are deprecated, don't build them on any platform.
-%define build_cil_tools 0
+%global build_cil_tools 0
Name: ocaml-bitstring
-Version: 2.0.0
-Release: 11%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
Summary: OCaml library for matching and constructing bitstrings
Group: Development/Libraries
@@ -15,12 +15,6 @@ License: LGPLv2+ with exceptions
URL: http://code.google.com/p/bitstring/
Source0: http://bitstring.googlecode.com/files/%{name}-%{version}.tar.gz
-# Fix for OCaml 3.11.0+beta1.
-Patch0: ocaml-bitstring-2.0.0-empty-case.patch
-
-# Fix for OCaml 3.11.0 official release.
-Patch1: ocaml-bitstring-2.0.0-dynlink.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
@@ -36,9 +30,8 @@ BuildRequires: ocaml-extlib-devel
BuildRequires: chrpath
BuildRequires: time
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_bitstring
+%global __ocaml_requires_opts -i Asttypes -i Parsetree
+%global __ocaml_provides_opts -i Pa_bitstring
# Upstream project used to be called ocaml-bitmatch.
# Keep these until Fedora 12.
@@ -90,9 +83,6 @@ from C code and header files into %{name
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-
# Keep a pristine copy of the examples directory for distribution.
cp -a examples bitstring-examples
@@ -185,6 +175,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 8 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 2.0.1-1
+- New upstream version 2.0.1.
+- Remove the two patches which are now upstream.
+- Replace %%define with %%global.
+- Use upstream RPM 4.8 OCaml dependency generator.
+- Recheck package with rpmlint.
+
* Wed Dec 30 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 2.0.0-11
- Rebuild for OCaml 3.11.2.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 21 Oct 2008 09:48:24 -0000 1.5
+++ sources 8 Jan 2010 14:59:17 -0000 1.6
@@ -1 +1 @@
-9f597c267318a88f2754ca10450e478f ocaml-bitstring-2.0.0.tar.gz
+621ece6a92a5747d9bf59e9ce8153596 ocaml-bitstring-2.0.1.tar.gz
--- ocaml-bitstring-2.0.0-dynlink.patch DELETED ---
--- ocaml-bitstring-2.0.0-empty-case.patch DELETED ---
_______________________________________________
Fedora-ocaml-list mailing list
Fedora-ocaml-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-ocaml-list
