From 8b13e82bda8a3ec9df941dedc6b9813e5a10425c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 18 May 2017 20:03:48 -0600 Subject: [PATCH] New upstream version. License change: QPL with exceptions to GPLv2. --- ocaml-menhir.spec | 21 +++++++++++++-------- sources | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ocaml-menhir.spec b/ocaml-menhir.spec index b25297d..b58b4f1 100644 --- a/ocaml-menhir.spec +++ b/ocaml-menhir.spec @@ -7,12 +7,12 @@ %endif Name: ocaml-menhir -Version: 20170101 -Release: 3%{?dist} +Version: 20170509 +Release: 1%{?dist} Summary: LR(1) parser generator for OCaml -# The generator is QPL, with an exception granted to clause 6c. -License: QPL with exceptions +# The generator is GPLv2 +License: GPLv2 URL: http://gallium.inria.fr/~fpottier/menhir/ Source0: http://gallium.inria.fr/~fpottier/menhir/menhir-%{version}.tar.gz @@ -28,8 +28,8 @@ Yann RĂ©gis-Gianas. %package devel Summary: Development files for %{name} -# The library is LGPLv2+ with a linking exception. -License: LGPLv2+ with exceptions +# The library is LGPLv2 with a linking exception. +License: LGPLv2 with exceptions Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -40,7 +40,7 @@ for developing applications that use %{name}. %setup -q -n menhir-%{version} # Fix encodings -for f in AUTHORS menhir.1; do +for f in menhir.1; do iconv -f ISO8859-1 -t UTF-8 $f > $f.fixed touch -r $f $f.fixed mv -f $f.fixed $f @@ -66,7 +66,7 @@ make install PREFIX=%{buildroot}%{_prefix} TARGET=%{target} rm -fr %{buildroot}%{_docdir}/menhir %files -%doc AUTHORS CHANGES manual.pdf demos +%doc CHANGES.md README.md manual.pdf demos %license LICENSE %{_bindir}/menhir %{_mandir}/man1/menhir.1* @@ -74,8 +74,13 @@ rm -fr %{buildroot}%{_docdir}/menhir %files devel %{_libdir}/ocaml/menhirLib/ +%{_libdir}/ocaml/menhirSdk/ %changelog +* Fri May 19 2017 Jerry James - 20170509-1 +- New upstream version +- License change: QPL with exceptions to GPLv2 + * Fri May 12 2017 Richard W.M. Jones - 20170101-3 - OCaml 4.04.1 rebuild. diff --git a/sources b/sources index 77e0418..cf05cf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (menhir-20170101.tar.gz) = 810d9863873519b9052464e522894579ffd2f9685851ba32c34cf772570710e7dde2a4629ab6407c2404d2587132488aeebed97db2dad1a456e28104c230bbac +SHA512 (menhir-20170509.tar.gz) = 51d7a9f83dc8b31c3745c4eb86d5b6d952e54a4468e23aab7f413c316e40472612fe6ddb9503231ca93b14f6097e9624d7cd581d6ca5d7067fe3e98d0a3c10e1