- lib64 fix

Changed files:
    Canna-lib64.patch -> 1.1
    Canna.spec -> 1.21

diff --git a/Canna-lib64.patch b/Canna-lib64.patch
new file mode 100644 (file)
index 0000000..4a309dd
--- /dev/null
+++ b/Canna-lib64.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)/lib64
+ #else 
+ # define DefCannaPrefix /usr
+ # ifdef ObsoleteInstallDir
+ #  define DefErrDir /usr/spool/canna
+-#  define DefLibCannaDir /usr/lib
++#  define DefLibCannaDir /usr/lib64
+ # else
+ #  define DefErrDir /var/log/canna
+-#  define DefLibCannaDir $(cannaExecPrefix)/lib
++#  define DefLibCannaDir $(cannaExecPrefix)/lib64
+ # endif
+ #endif
+ #ifdef ObsoleteInstallDir

diff --git a/Canna.spec b/Canna.spec
index 14b583b85e8376abbf6fb47686e02a467e28f350..69d696b6f3ba9d7658b4be77572bbc22a116a064 100644 (file)
--- a/Canna.spec
+++ b/Canna.spec
@@ -6,7 +6,7 @@ Summary(ja):    
 Summary(pl):   System wprowadzania znaków japoñskich
 Name:          Canna
 Version:       3.7
-Release:       0.%{_rc}.%{_rel}
+Release:       %{_rc}.%{_rel}
 License:       BSD-like
 Group:         Libraries
 Source0:       http://downloads.sourceforge.jp/canna/9565/%{name}%{_ver}%{_rc}.tar.bz2
@@ -14,6 +14,8 @@ Source0:      http://downloads.sourceforge.jp/canna/9565/%{name}%{_ver}%{_rc}.tar.bz2
 Source1:       %{name}.init
 Source2:       %{name}-dot-canna
 Patch0:                %{name}-conf.patch
+Patch1:                %{name}-lib64.patch
+#Patch2:               %{name}-wconv.patch # probably outdated sec fix
 #Patch1:               %{name}-DESTDIR.patch # outdated by -conf.patch
 #Patch2:               %{name}-glibc.patch # looks outdated
 #Patch3:               %{name}-stdin.patch # looks outdated
@@ -21,7 +23,6 @@ Patch0:               %{name}-conf.patch
 #Patch5:               %{name}-security.patch # looks outdated
 #Patch6:               %{name}-hosts.canna-fix.patch # looks outdated
 #Patch7:               %{name}-nonstrip.patch # merged into Canna-conf.patch
-Patch8:                %{name}-wconv.patch
 #Patch9:               %{name}-multivul.patch # apparently outdated
 #Patch10:      %{name}-fixes.patch # outdated apparently
 URL:           http://canna.sourceforge.jp/
@@ -114,7 +115,10 @@ Ten pakiet zawiera statyczne biblioteki Canna.
 %prep
 %setup -q -n %{name}%{_ver}%{_rc}
 %patch0 -p1
-%patch8 -p1
+%if "%{_lib}" == "lib64"
+%patch1 -p1
+%endif
+#%patch2 -p1
 
 %build
 xmkmf -a