[ocaml-menhir] New upstream version. Fix standard.mly character encoding.

Jerry James jjames at fedoraproject.org
Wed Apr 30 14:41:31 UTC 2014


commit 532ffa3e6205e6390a6a228ba0a336e39150de46
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Wed Apr 30 08:41:40 2014 -0600

    New upstream version.
    Fix standard.mly character encoding.

 .gitignore        |    2 +-
 ocaml-menhir.spec |   13 +++++++++----
 sources           |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75ca73a..06a351b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/menhir-20130911.tar.gz
+/menhir-20140422.tar.gz
diff --git a/ocaml-menhir.spec b/ocaml-menhir.spec
index cc56d77..351af51 100644
--- a/ocaml-menhir.spec
+++ b/ocaml-menhir.spec
@@ -3,11 +3,12 @@
 %global target native
 %else
 %global target byte
+%global debug_package %{nil}
 %endif
 
 Name:           ocaml-menhir
-Version:        20130911
-Release:        3%{?dist}
+Version:        20140422
+Release:        1%{?dist}
 Summary:        LR(1) parser generator for OCaml
 
 # The library is LGPLv2+ with a linking exception.
@@ -41,7 +42,7 @@ for developing applications that use %{name}.
 %patch0 -p1
 
 # Fix encodings
-for f in AUTHORS menhir.1; do
+for f in AUTHORS menhir.1 src/standard.mly; do
   iconv -f ISO8859-1 -t UTF-8 $f > $f.fixed
   touch -r $f $f.fixed
   mv -f $f.fixed $f
@@ -67,7 +68,7 @@ make -C demos clean
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix} TARGET=%{target}
-rm -fr $RPM_BUILD_ROOT%{_defaultdocdir}/menhir
+rm -fr $RPM_BUILD_ROOT%{_docdir}/menhir
 
 # Install the ocamldep wrapper
 mv demos/ocamldep.wrapper $RPM_BUILD_ROOT%{_bindir}/menhir-ocamldep
@@ -82,6 +83,10 @@ mv demos/ocamldep.wrapper $RPM_BUILD_ROOT%{_bindir}/menhir-ocamldep
 %{_libdir}/ocaml/menhirLib/
 
 %changelog
+* Wed Apr 30 2014 Jerry James <loganjerry at gmail.com> - 20140422-1
+- New upstream version
+- Fix standard.mly character encoding
+
 * Fri Apr 18 2014 Jerry James <loganjerry at gmail.com> - 20130911-3
 - Remove ocaml_arches macro (bz 1087794)
 
diff --git a/sources b/sources
index eeabc93..e72330b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66374f3626f9403b37eed43819210113  menhir-20130911.tar.gz
+86c410cb088423cec7e20965e70cd8b4  menhir-20140422.tar.gz


More information about the scm-commits mailing list