SPECS: Canna.spec - lib64 fix

[glen]

Author: glen                         Date: Fri Apr 14 11:08:21 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lib64 fix

---- Files affected:
SPECS:
   Canna.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/Canna.spec
diff -u SPECS/Canna.spec:1.20 SPECS/Canna.spec:1.21
--- SPECS/Canna.spec:1.20	Thu Apr 13 17:41:27 2006
+++ SPECS/Canna.spec	Fri Apr 14 13:08:15 2006
@@ -7,7 +7,7 @@
 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
@@ -15,6 +15,8 @@
 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
@@ -22,7 +24,6 @@
 #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/
@@ -115,7 +116,10 @@
 %prep
 %setup -q -n %{name}%{_ver}%{_rc}
 %patch0 -p1
-%patch8 -p1
+%if "%{_lib}" == "lib64"
+%patch1 -p1
+%endif
+#%patch2 -p1
 
 %build
 xmkmf -a
@@ -236,6 +240,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2006/04/14 11:08:15  glen
+- lib64 fix
+
 Revision 1.20  2006/04/13 15:41:27  glen
 - -DESTDIR patch unused
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Canna.spec?r1=1.20&r2=1.21&f=u