[ocaml-pxp] New upstream version 1.2.4.

Richard W.M. Jones rjones at fedoraproject.org
Thu Sep 19 13:24:32 UTC 2013


commit 03a3b3c2ddbfb28a54aff3c78054ad4e6d50663f
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 19 14:24:20 2013 +0100

    New upstream version 1.2.4.
    
    - OCaml 4.01.0 rebuild.
    - Modernize the spec file.

 .gitignore     |    1 +
 ocaml-pxp.spec |   31 ++++++++++++++-----------------
 sources        |    2 +-
 3 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b47842..9e420bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pxp-1.2.1.tar.gz
 /pxp-1.2.2.tar.gz
 /pxp-1.2.3.tar.gz
+/pxp-1.2.4.tar.gz
diff --git a/ocaml-pxp.spec b/ocaml-pxp.spec
index 43d0bb9..7f0461a 100644
--- a/ocaml-pxp.spec
+++ b/ocaml-pxp.spec
@@ -1,15 +1,14 @@
-%define debug_package %{nil}
+%global debug_package %{nil}
 
 Name:           ocaml-pxp
-Version:        1.2.3
-Release:        7%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Validating XML parser
-
-Group:          Development/Libraries
 License:        BSD
+
 URL:            http://projects.camlcity.org/projects/pxp.html
 Source0:        http://download.camlcity.org/download/pxp-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 ExcludeArch:    sparc64 s390 s390x
 ExcludeArch:    ppc64
 
@@ -21,9 +20,7 @@ BuildRequires:  ocaml-ulex-devel
 BuildRequires:  ocaml-pcre-devel, pcre-devel
 BuildRequires:  ocaml-camlp4-devel
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree -i Pxp_rea
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%global __ocaml_requires_opts -i Asttypes -i Outcometree -i Parsetree -i Pxp_rea
 
 
 %description
@@ -36,7 +33,6 @@ ability to create XML trees with polymorphic type parameters.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -54,24 +50,21 @@ developing applications that use %{name}.
 
 
 %build
+# Parallel builds don't work:
+unset MAKEFLAGS
+
 make all
 make opt
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR
 make install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_libdir}/ocaml/pxp-engine/*.cma
 %{_libdir}/ocaml/pxp-engine/*.cmi
@@ -86,7 +79,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_libdir}/ocaml/pxp-engine/META
 %{_libdir}/ocaml/pxp-engine/*.a
@@ -107,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 19 2013 Richard W.M. Jones <rjones at redhat.com> - 1.2.4-1
+- New upstream version 1.2.4.
+- OCaml 4.01.0 rebuild.
+- Modernize the spec file.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 44c7d46..a5f43f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83347420dae0ee495bb0ac2fbab7b74b  pxp-1.2.3.tar.gz
+bd6f7608797cbcb44d4495d92e69f9c6  pxp-1.2.4.tar.gz


More information about the scm-commits mailing list