commit ddac754a33d178effdf3fc890f5a04591eb953d9
Author: Jan Rękorajski <[email protected]>
Date: Sun Apr 12 14:57:54 2015 +0200
- fix install on x32
- rel 5
Canna-libx32.patch | 21 +++++++++++++++++++++
Canna.spec | 6 +++++-
2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/Canna.spec b/Canna.spec
index 0685871..340fda9 100644
--- a/Canna.spec
+++ b/Canna.spec
@@ -4,7 +4,7 @@ Summary(ja.UTF-8): 日本語入力システム
Summary(pl.UTF-8): System wprowadzania znaków japońskich
Name: Canna
Version: 3.7p3
-Release: 4
+Release: 5
License: BSD-like
Group: Libraries
#Source0Download: http://canna.sourceforge.jp/
@@ -15,6 +15,7 @@ Source2: %{name}-dot-canna
Patch0: %{name}-conf.patch
Patch1: %{name}-format.patch
Patch2: %{name}-lib64.patch
+Patch3: %{name}-libx32.patch
URL: http://canna.sourceforge.jp/
BuildRequires: cpp
BuildRequires: rpmbuild(macros) >= 1.268
@@ -111,6 +112,9 @@ Ten pakiet zawiera statyczne biblioteki Canna.
%if "%{_lib}" == "lib64"
%patch2 -p1
%endif
+%if "%{_lib}" == "libx32"
+%patch3 -p1
+%endif
%build
xmkmf -a
diff --git a/Canna-libx32.patch b/Canna-libx32.patch
new file mode 100644
index 0000000..859cab8
--- /dev/null
+++ b/Canna-libx32.patch
@@ -0,0 +1,21 @@
+--- Canna37p3/Canna.conf~ 2006-04-13 18:46:53.000000000 +0300
++++ Canna37p3/Canna.conf 2006-04-14 14:00:58.000000000 +0300
+@@ -107,15 +107,15 @@
+ #ifdef InstallAsUser
+ # define DefCannaPrefix $(HOME)/canna
+ # define DefErrDir $(cannaPrefix)/log
+-# define DefLibCannaDir $(cannaExecPrefix)/lib
++# define DefLibCannaDir $(cannaExecPrefix)/libx32
+ #else
+ # define DefCannaPrefix /usr
+ # ifdef ObsoleteInstallDir
+ # define DefErrDir /usr/spool/canna
+-# define DefLibCannaDir /usr/lib
++# define DefLibCannaDir /usr/libx32
+ # else
+ # define DefErrDir /var/log/canna
+-# define DefLibCannaDir $(cannaExecPrefix)/lib
++# define DefLibCannaDir $(cannaExecPrefix)/libx32
+ # endif
+ #endif
+ #ifdef ObsoleteInstallDir
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Canna.git/commitdiff/ddac754a33d178effdf3fc890f5a04591eb953d9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
