diff --git a/.ocaml-libvirt.metadata b/.ocaml-libvirt.metadata
new file mode 100644
index 0000000..d36edef
--- /dev/null
+++ b/.ocaml-libvirt.metadata
@@ -0,0 +1 @@
+85c088b8558449405fce820d8d0220b297869d3e SOURCES/ocaml-libvirt-0.6.1.2.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
-
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
-
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/0001-remove-parameter-nr_pcpus-of-Libvirt.Domain.get_cpu_.patch b/SOURCES/0001-remove-parameter-nr_pcpus-of-Libvirt.Domain.get_cpu_.patch
new file mode 100644
index 0000000..3352a6f
--- /dev/null
+++ b/SOURCES/0001-remove-parameter-nr_pcpus-of-Libvirt.Domain.get_cpu_.patch
@@ -0,0 +1,116 @@
+From 252568550f9bf28b07f4e6d116485205e58afe4a Mon Sep 17 00:00:00 2001
+From: Hu Tao <hutao@cn.fujitsu.com>
+Date: Wed, 9 May 2012 16:48:30 +0800
+Subject: [PATCH 1/2] remove parameter nr_pcpus of
+ Libvirt.Domain.get_cpu_stats
+
+remove the value because we can get it from the libvirt API
+---
+ examples/.depend | 4 ++--
+ examples/get_cpu_stats.ml | 2 +-
+ libvirt/.depend | 6 +++---
+ libvirt/libvirt.ml | 2 +-
+ libvirt/libvirt.mli | 4 ++--
+ libvirt/libvirt_c_oneoffs.c | 10 +++++++---
+ 6 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/examples/.depend b/examples/.depend
+index 831adf6..f58db3d 100644
+--- a/examples/.depend
++++ b/examples/.depend
+@@ -1,6 +1,6 @@
+-node_info.cmo: ../libvirt/libvirt.cmi
+-node_info.cmx: ../libvirt/libvirt.cmx
+ get_cpu_stats.cmo: ../libvirt/libvirt.cmi
+ get_cpu_stats.cmx: ../libvirt/libvirt.cmx
+ list_domains.cmo: ../libvirt/libvirt.cmi
+ list_domains.cmx: ../libvirt/libvirt.cmx
++node_info.cmo: ../libvirt/libvirt.cmi
++node_info.cmx: ../libvirt/libvirt.cmx
+diff --git a/examples/get_cpu_stats.ml b/examples/get_cpu_stats.ml
+index 79d5c3c..d7a8d0c 100644
+--- a/examples/get_cpu_stats.ml
++++ b/examples/get_cpu_stats.ml
+@@ -25,7 +25,7 @@ let () =
+
+ let stats =
+ let dom = D.lookup_by_name conn domname in
+- D.get_cpu_stats dom nr_pcpus in
++ D.get_cpu_stats dom in
+
+ Array.iteri (
+ fun n params ->
+diff --git a/libvirt/.depend b/libvirt/.depend
+index 43a2367..3f2297e 100644
+--- a/libvirt/.depend
++++ b/libvirt/.depend
+@@ -1,6 +1,6 @@
+-libvirt_version.cmi:
+ libvirt.cmi:
+-libvirt_version.cmo: libvirt_version.cmi
+-libvirt_version.cmx: libvirt_version.cmi
++libvirt_version.cmi:
+ libvirt.cmo: libvirt.cmi
+ libvirt.cmx: libvirt.cmi
++libvirt_version.cmo: libvirt_version.cmi
++libvirt_version.cmx: libvirt_version.cmi
+diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml
+index 53c5bb4..07542a9 100644
+--- a/libvirt/libvirt.ml
++++ b/libvirt/libvirt.ml
+@@ -417,7 +417,7 @@ struct
+ external set_vcpus : [>`W] t -> int -> unit = "ocaml_libvirt_domain_set_vcpus"
+ external pin_vcpu : [>`W] t -> int -> string -> unit = "ocaml_libvirt_domain_pin_vcpu"
+ external get_vcpus : [>`R] t -> int -> int -> int * vcpu_info array * string = "ocaml_libvirt_domain_get_vcpus"
+- external get_cpu_stats : [>`R] t -> int -> typed_param list array = "ocaml_libvirt_domain_get_cpu_stats"
++ external get_cpu_stats : [>`R] t -> typed_param list array = "ocaml_libvirt_domain_get_cpu_stats"
+ external get_max_vcpus : [>`R] t -> int = "ocaml_libvirt_domain_get_max_vcpus"
+ external attach_device : [>`W] t -> xml -> unit = "ocaml_libvirt_domain_attach_device"
+ external detach_device : [>`W] t -> xml -> unit = "ocaml_libvirt_domain_detach_device"
+diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli
+index 0913a63..5a288c0 100644
+--- a/libvirt/libvirt.mli
++++ b/libvirt/libvirt.mli
+@@ -559,8 +559,8 @@ sig
+ for a domain. See the libvirt documentation for details
+ of the array and bitmap returned from this function.
+ *)
+- val get_cpu_stats : [>`R] t -> int -> typed_param list array
+- (** [get_pcpu_stats dom nr_pcpu] returns the physical CPU stats
++ val get_cpu_stats : [>`R] t -> typed_param list array
++ (** [get_pcpu_stats dom] returns the physical CPU stats
+ for a domain. See the libvirt documentation for details.
+ *)
+ val get_max_vcpus : [>`R] t -> int
+diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c
+index 3d42b73..70cf96f 100644
+--- a/libvirt/libvirt_c_oneoffs.c
++++ b/libvirt/libvirt_c_oneoffs.c
+@@ -532,17 +532,21 @@ extern int virDomainGetCPUStats (virDomainPtr domain,
+ #endif
+
+ CAMLprim value
+-ocaml_libvirt_domain_get_cpu_stats (value domv, value nr_pcpusv)
++ocaml_libvirt_domain_get_cpu_stats (value domv)
+ {
+ #ifdef HAVE_VIRDOMAINGETCPUSTATS
+- CAMLparam2 (domv, nr_pcpusv);
++ CAMLparam1 (domv);
+ CAMLlocal5 (cpustats, param_head, param_node, typed_param, typed_param_value);
+ CAMLlocal1 (v);
+ virDomainPtr dom = Domain_val (domv);
+ virConnectPtr conn = Connect_domv (domv);
+- int nr_pcpus = Int_val (nr_pcpusv);
+ virTypedParameterPtr params;
+ int r, cpu, ncpus, nparams, i, j, pos;
++ int nr_pcpus;
++
++ /* get number of pcpus */
++ NONBLOCKING (nr_pcpus = virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0));
++ CHECK_ERROR (nr_pcpus < 0, conn, "virDomainGetCPUStats");
+
+ /* get percpu information */
+ NONBLOCKING (nparams = virDomainGetCPUStats(dom, NULL, 0, 0, 1, 0));
+--
+1.7.11.4
+
diff --git a/SPECS/ocaml-libvirt.spec b/SPECS/ocaml-libvirt.spec
new file mode 100644
index 0000000..403acc0
--- /dev/null
+++ b/SPECS/ocaml-libvirt.spec
@@ -0,0 +1,262 @@
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
+
+Name: ocaml-libvirt
+Version: 0.6.1.2
+Release: 7%{?dist}
+Summary: OCaml binding for libvirt
+
+Group: Development/Libraries
+License: LGPLv2+
+URL: http://libvirt.org/ocaml/
+Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz
+ExcludeArch: sparc64 s390 s390x
+
+BuildRequires: ocaml >= 3.10.0
+BuildRequires: ocaml-ocamldoc
+BuildRequires: ocaml-findlib-devel
+
+BuildRequires: libvirt-devel >= 0.2.1
+BuildRequires: perl
+BuildRequires: gawk
+
+Patch1: 0001-remove-parameter-nr_pcpus-of-Libvirt.Domain.get_cpu_.patch
+
+
+%description
+OCaml binding for libvirt.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+
+%description devel
+The %{name}-devel package contains libraries and signature files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+%patch1 -p1
+
+
+%build
+%configure
+make all doc
+%if %opt
+make opt
+strip libvirt/dllmllibvirt.so
+%endif
+
+
+%install
+# These rules work if the library uses 'ocamlfind install' to install itself.
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+%if %opt
+make install-opt
+%else
+make install-byte
+%endif
+
+
+%files
+%doc COPYING.LIB README ChangeLog
+%{_libdir}/ocaml/libvirt
+%if %opt
+%exclude %{_libdir}/ocaml/libvirt/*.a
+%exclude %{_libdir}/ocaml/libvirt/*.cmxa
+%exclude %{_libdir}/ocaml/libvirt/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/libvirt/*.mli
+%{_libdir}/ocaml/stublibs/*.so
+%{_libdir}/ocaml/stublibs/*.so.owner
+
+
+%files devel
+%doc COPYING.LIB README TODO.libvirt ChangeLog html/*
+%if %opt
+%{_libdir}/ocaml/libvirt/*.a
+%{_libdir}/ocaml/libvirt/*.cmxa
+%{_libdir}/ocaml/libvirt/*.cmx
+%endif
+%{_libdir}/ocaml/libvirt/*.mli
+
+
+%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Oct 29 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.2-6
+- Rebuild for OCaml 4.00.1.
+
+* Fri Oct 12 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.2-5
+- Modernise the spec file.
+- Add upstream patch to remove unnecessary get_cpu_stats second parameter
+ (thanks Hu Tao).
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jun 09 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.2-2
+- Rebuild for OCaml 4.00.0.
+
+* Fri Mar 23 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.2-1
+- New upstream version 0.6.1.2.
+
+* Tue Mar 6 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.1-1
+- New upstream version 0.6.1.1.
+- Remove mlvirsh subpackage, no longer upstream.
+- Replace custom configure with RPM macro configure.
+- Use RPM global instead of define.
+- Use built-in RPM OCaml dependency generator.
+
+* Fri Jan 06 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-10
+- Rebuild for OCaml 3.12.1.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Jan 05 2011 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-8
+- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
+
+* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-7
+- Rebuild for OCaml 3.11.2.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 15 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-5
+- Force rebuild to test FTBFS issue.
+
+* Fri Jun 12 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-3
+- Force rebuild to test FTBFS issue.
+
+* Sat May 23 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-2
+- Rebuild for OCaml 3.11.1
+
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+ (added sparc64 per request from the sparc maintainer)
+
+* Tue Mar 10 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-1
+- New upstream release 0.6.1.0.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Nov 26 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4.2-3
+- Rebuild for OCaml 3.11.0+rc1.
+
+* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4.2-2
+- Rebuild for OCaml 3.11.0
+
+* Wed Jul 9 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4.2-1
+- New upstream version.
+- In upstream, 'make install' became 'make install-byte' or 'make install-opt'
+
+* Tue Jun 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.2.4-1
+- New upstream version.
+
+* Thu Jun 5 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.2.3-1
+- New upstream version.
+
+* Thu Jun 5 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.2.2-1
+- New upstream version.
+- Removed virt-ctrl, virt-df, virt-top subpackages, since these are
+ now separate Fedora packages.
+
+* Tue May 20 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.1-4
+- Disable virt-top (bz 442871).
+- Disable virt-ctrl (bz 442875).
+
+* Mon May 19 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.1-3
+- Disable virt-df (bz 442873).
+
+* Wed Apr 23 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.1-2
+- Rebuild for OCaml 3.10.2
+
+* Tue Mar 19 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.1-1
+- New upstream release 0.4.1.1.
+- Move configure to build section.
+- Pass RPM_OPT_FLAGS.
+
+* Tue Mar 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.0-2
+- Fix source URL.
+- Install virt-df manpage.
+
+* Tue Mar 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.0-1
+- New upstream release 0.4.1.0.
+- Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0,
+ ocaml-dbus-devel.
+- Enable virt-df.
+
+* Sat Mar 1 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.0.3-3
+- Rebuild for ppc64.
+
+* Wed Feb 13 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.0.3-2
+- Add BR gtk2-devel
+
+* Tue Feb 12 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.0.3-1
+- New upstream version 0.4.0.3.
+- Rebuild for OCaml 3.10.1.
+
+* Tue Nov 20 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.3.4-1
+- New upstream release 0.3.3.4.
+- Upstream website is now http://libvirt.org/ocaml/
+
+* Fri Oct 19 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.3.0-2
+- Mistake: BR is ocaml-calendar-devel.
+
+* Fri Oct 19 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.3.0-1
+- New upstream release 0.3.3.0.
+- Added support for virt-df, but disabled it by default.
+- +BR ocaml-calendar.
+
+* Mon Sep 24 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.8-1
+- New upstream release 0.3.2.8.
+
+* Thu Sep 20 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.7-1
+- New upstream release 0.3.2.7.
+- Ship the upstream ChangeLog file.
+
+* Thu Sep 6 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.6-2
+- Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides
+ scripts.
+
+* Thu Sep 6 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.6-1
+- New upstream version 0.3.2.6.
+
+* Wed Aug 29 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.5-1
+- New upstream version 0.3.2.5.
+- Keep TODO out of the main package, but add (renamed) TODO.libvirt and
+ TODO.virt-top to the devel and virt-top packages respectively.
+- Add BR gawk.
+
+* Thu Aug 23 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.4-1
+- New upstream version 0.3.2.4.
+
+* Thu Aug 23 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.3-2
+- build_* macros so we can choose what subpackages to build.
+
+* Thu Aug 23 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.3-1
+- Upstream version 0.3.2.3.
+- Add missing BR libvirt-devel.
+
+* Wed Aug 22 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.2-1
+- Upstream version 0.3.2.2.
+
+* Wed Aug 22 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.1-2
+- Fix unclosed if-statement in spec file.
+
+* Wed Aug 22 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.1-1
+- Upstream version 0.3.2.1.
+- Put HTML documentation in -devel package.
+
+* Mon Aug 6 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.1.2-1
+- Initial RPM release.