SPECS: kicad.spec - more general if - reverted "lib64wx_gtk2u"

[qboosh]

Author: qboosh                       Date: Tue Nov 27 19:32:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more general if
- reverted "lib64wx_gtk2u"

---- Files affected:
SPECS:
   kicad.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/kicad.spec
diff -u SPECS/kicad.spec:1.5 SPECS/kicad.spec:1.6
--- SPECS/kicad.spec:1.5	Tue Nov 27 18:10:24 2007
+++ SPECS/kicad.spec	Tue Nov 27 20:32:43 2007
@@ -35,8 +35,8 @@
 
 %prep
 %setup -q -n %{name}
-%if "%{_lib}" == "lib64"
-	%{__sed} -i -e "s@/lib/@/lib64/@g" libs.linux
+%if "%{_lib}" != "lib"
+	%{__sed} -i -e "s@/lib/@/%{_lib}/@g" libs.linux
 %endif
 
 %build
@@ -44,11 +44,7 @@
 %{__make} -f makefile.gtk \
 	WXXFLAGS="`$WX_CONFIG --cxxflags`" \
 	WXPATH=%{_libdir} \
-%if "%{_lib}" == "lib64"
-	PREFIX_WX_LIBS="lib64`$WX_CONFIG --basename`" \
-%else
 	PREFIX_WX_LIBS="lib`$WX_CONFIG --basename`" \
-%endif
 	SUFFIX_WX_LIBSTD="`$WX_CONFIG --utility=`" \
 	SUFFIX_WX_LIBGL="_gl-`$WX_CONFIG --release`" \
 	LIBVERSION="`$WX_CONFIG --release`" \
@@ -79,6 +75,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007-11-27 19:32:43  qboosh
+- more general if
+- reverted "lib64wx_gtk2u"
+
 Revision 1.5  2007-11-27 17:10:24  shadzik
 - an actually working 64bit fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kicad.spec?r1=1.5&r2=1.6&f=u