- New upstream version 1.2.0.

- This includes OCaml and Perl bindings, so add these as subpackages.

.cvsignore

@@ -1 +1 @@
-hivex-1.1.2.tar.gz
+hivex-1.2.0.tar.gz

hivex.spec

@@ -1,6 +1,6 @@
 Name:           hivex
-Version:        1.1.2
+Version:        1.2.0
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 Group:          Development/Libraries
@@ -10,6 +10,8 @@ Source0:        http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl
+BuildRequires:  ocaml
+BuildRequires:  ocaml-findlib-devel
 BuildRequires:  readline-devel
 BuildRequires:  libxml2-devel
 
@@ -37,6 +39,10 @@ also provides a useful high-level tool called 'virt-win-reg' (based on
 hivex technology) which can be used to query specific registry keys in
 an existing Windows VM.
 
+For Perl bindings, see 'perl-hivex'.
+
+For OCaml bindings, see 'ocaml-hivex-devel'.
+
 
 %package devel
 Summary:        Development tools and libraries for %{name}
@@ -50,6 +56,41 @@ Requires:       pkgconfig
 for %{name}.
 
 
+%package -n ocaml-%{name}
+Summary:       OCaml bindings for %{name}
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+
+%description -n ocaml-%{name}
+ocaml-%{name} contains OCaml bindings for %{name}.
+
+This is for toplevel and scripting access only.  To compile OCaml
+programs which use %{name} you will also need ocaml-%{name}-devel.
+
+
+%package -n ocaml-%{name}-devel
+Summary:       OCaml bindings for %{name}
+Group:         Development/Libraries
+Requires:      ocaml-%{name} = %{version}-%{release}
+
+
+%description -n ocaml-%{name}-devel
+ocaml-%{name}-devel contains development libraries
+required to use the OCaml bindings for %{name}.
+
+
+%package -n perl-%{name}
+Summary:       Perl bindings for %{name}
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+
+%description -n perl-%{name}
+perl-%{name} contains Perl bindings for %{name}.
+
+
 %prep
 %setup -q
 
@@ -66,6 +107,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # Remove unwanted libtool *.la file:
 rm $RPM_BUILD_ROOT%{_libdir}/libhivex.la
 
+# Remove unwanted Perl files:
+find $RPM_BUILD_ROOT -name perllocal.pod -delete
+find $RPM_BUILD_ROOT -name .packlist -delete
+find $RPM_BUILD_ROOT -name '*.bs' -delete
+
 %find_lang %{name}
 
 
@@ -99,7 +145,37 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/hivex.pc
 
 
+%files -n ocaml-%{name}
+%defattr(-,root,root,-)
+%doc README
+%{_libdir}/ocaml/hivex
+%exclude %{_libdir}/ocaml/hivex/*.a
+%exclude %{_libdir}/ocaml/hivex/*.cmxa
+%exclude %{_libdir}/ocaml/hivex/*.cmx
+%exclude %{_libdir}/ocaml/hivex/*.mli
+%{_libdir}/ocaml/stublibs/*.so
+%{_libdir}/ocaml/stublibs/*.so.owner
+
+
+%files -n ocaml-%{name}-devel
+%defattr(-,root,root,-)
+%{_libdir}/ocaml/hivex/*.a
+%{_libdir}/ocaml/hivex/*.cmxa
+%{_libdir}/ocaml/hivex/*.cmx
+%{_libdir}/ocaml/hivex/*.mli
+
+
+%files -n perl-%{name}
+%defattr(-,root,root,-)
+%{perl_vendorarch}/*
+%{_mandir}/man3/Win::Hivex.3pm*
+
+
 %changelog
+* Mon Mar  1 2010 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
+- New upstream version 1.2.0.
+- This includes OCaml and Perl bindings, so add these as subpackages.
+
 * Mon Feb 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-3
 - Missing Epoch in conflicts version fixed.
 

sources

@@ -1 +1 @@
-a42437dc51789c27214bc745f51129f5  hivex-1.1.2.tar.gz
+7e8d7dea26ad4bd1975305cae0673de0  hivex-1.2.0.tar.gz