[packages/mana] - added no-ocamlopt patch, use it on archs without ocamlopt - release 8

[qboosh]

commit 549d02655b0fc1114b134bc939603d5ef9b21546
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 18 08:25:42 2015 +0200

    - added no-ocamlopt patch, use it on archs without ocamlopt
    - release 8

 mana-no-ocamlopt.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mana.spec              | 10 ++++++++--
 2 files changed, 61 insertions(+), 2 deletions(-)
---
diff --git a/mana.spec b/mana.spec
index 51ad300..2a68fa0 100644
--- a/mana.spec
+++ b/mana.spec
@@ -1,12 +1,16 @@
 #
 # Conditional build:
 %bcond_with	bootstrap	# don't require dictionary for package build
+%bcond_without	ocaml_opt	# native code
 #
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9 
+%undefine	with_ocaml_opt
+%endif
 Summary:	A kana(romaji)-kanji conversion engine using ChaSen algorithm
 Summary(pl.UTF-8):	Silnik konwersji kana(romaji)-kanji, wykorzystujący algorytm ChaSen
 Name:		mana
 Version:	0.2.1
-Release:	7
+Release:	8
 License:	GPL v2+
 Group:		Applications/Text
 Source0:	http://dl.sourceforge.jp/shinji/20514/%{name}-%{version}.tar.bz2
@@ -15,9 +19,10 @@ Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-change_scheme_dir.patch
 Patch2:		%{name}-chasen.patch
 Patch3:		%{name}-no-libiconv.patch
+Patch4:		%{name}-no-ocamlopt.patch
 URL:		http://sourceforge.jp/projects/shinji/
 BuildRequires:	autoconf >= 2.13
-BuildRequires:	automake
+BuildRequires:	automake >= 1.4
 BuildRequires:	gdbm-devel
 BuildRequires:	glib2-devel
 BuildRequires:	iconv
@@ -55,6 +60,7 @@ Wsparcie Mana dla UIM-a.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%{!?with_ocaml_opt:%patch4 -p1}
 
 mv lib/{,mana-}chasen.h
 
diff --git a/mana-no-ocamlopt.patch b/mana-no-ocamlopt.patch
new file mode 100644
index 0000000..12f4120
--- /dev/null
+++ b/mana-no-ocamlopt.patch
@@ -0,0 +1,53 @@
+--- mana-0.2.1/gdbm/Makefile.orig	2005-11-19 08:09:01.000000000 +0100
++++ mana-0.2.1/gdbm/Makefile	2015-07-18 07:59:38.030636773 +0200
+@@ -1,7 +1,7 @@
+ SOURCES = cldbm.c gdbm.mli gdbm.ml
+ RESULT = gdbm
+ 
+-all : bcl ncl
++all : bcl
+ 
+ export OCAMLMAKEFILE = ../OCamlMakefile
+-include OCamlMakefile
+\ No newline at end of file
++include OCamlMakefile
+--- mana-0.2.1/schoca/OCaml.mk.orig	2006-04-24 17:24:44.000000000 +0200
++++ mana-0.2.1/schoca/OCaml.mk	2015-07-18 08:15:44.277574698 +0200
+@@ -56,7 +56,7 @@
+ NCOBJECTS=$(patsubst %.ml,%.cmx,$(MLFILES))
+ COBJS=$(patsubst %.c,%.o,$(CSOURCES))
+ 
+-compile: $(CMIFILES) $(BCOBJECTS) $(NCOBJECTS)
++compile: $(CMIFILES) $(BCOBJECTS)
+ 
+ endif
+ 
+@@ -94,7 +94,7 @@
+ NCLDLIBS=$(patsubst %,%.cmxa,$(LIBS))
+ 
+ 
+-program: $(PROGRAM) $(PROGRAM).opt
++program: $(PROGRAM)
+ 
+ $(PROGRAM): $(BCOBJETS) $(COBJS) $(CMIFILES)
+ 	$(OCAMLFIND) ocamlc -linkpkg -o $(PROGRAM) $(COBJS)  $(OCAMLLDFLAGS) \
+@@ -122,7 +122,7 @@
+ TODO += library
+ CLEANUP += $(LIBRARY).cma $(LIBRARY).cmxa
+ 
+-library: $(LIBRARY).cma $(LIBRARY).cmxa
++library: $(LIBRARY).cma
+ 
+ $(LIBRARY).cma: $(BCOBJECTS) $(COBJS)
+ 	$(OCAMLFIND) ocamlc -a -linkpkg -o $(LIBRARY).cma $(OCAMLLDFLAGS) \
+--- mana-0.2.1/mana/Makefile.orig	2015-07-18 08:18:13.085316761 +0200
++++ mana-0.2.1/mana/Makefile	2015-07-18 08:21:36.702577069 +0200
+@@ -15,7 +15,7 @@
+ OCAMLBLDFLAGS = -g -verbose -cc "$(LINK)"
+ OCAMLBCFLAGS = -g
+ 
+-all : nc
++all : bc
+ install : mana
+ 	$(INSTALL_PROGRAM) mana $(DESTDIR)$(bindir)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mana.git/commitdiff/549d02655b0fc1114b134bc939603d5ef9b21546