SPECS: myspell.spec - fix amd64 build

[glen]

Author: glen                         Date: Sun Mar  4 17:22:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix amd64 build

---- Files affected:
SPECS:
   myspell.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/myspell.spec
diff -u SPECS/myspell.spec:1.3 SPECS/myspell.spec:1.4
--- SPECS/myspell.spec:1.3	Sun Mar  4 18:14:27 2007
+++ SPECS/myspell.spec	Sun Mar  4 18:22:14 2007
@@ -78,15 +78,22 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_prefix},%{_pkgconfigdir},%{_mandir}/man1}
-%{__make} install STATICLIB=libmyspell-%{version}.a PREFIX=$RPM_BUILD_ROOT%{_prefix}
-%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_pkgconfigdir},%{_mandir}/man1}
+%if "lib" != "%{_lib}"
+ln -s %{_lib} $RPM_BUILD_ROOT%{_prefix}/lib
+%endif
+%{__make} install \
+	STATICLIB=libmyspell.a \
+	PREFIX=$RPM_BUILD_ROOT%{_prefix}
+%{__make} install \
+	STATICLIB=libmyspell_pic.a \
+	PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 # create the links since the Makefile does create them in the dir
 # but does not install them
 cd $RPM_BUILD_ROOT%{_libdir} && \
-	ln -s libmyspell.so.%{version} libmyspell.so.%{_major} && \
-	ln -s libmyspell.so.%{version} libmyspell.so
+	ln -s $(echo libmyspell.so.*.*) libmyspell.so.%{_major} && \
+	ln -s $(echo libmyspell.so.*.*) libmyspell.so
 cd -
 
 install utils/ispellaff2myspell $RPM_BUILD_ROOT%{_bindir}
@@ -129,8 +136,8 @@
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libmyspell-3.0.a
-%{_libdir}/libmyspell-3.1_pic.a
+%{_libdir}/libmyspell.a
+%{_libdir}/libmyspell_pic.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -138,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2007/03/04 17:22:14  glen
+- fix amd64 build
+
 Revision 1.3  2007/03/04 17:14:27  glen
 - upload debian patches
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/myspell.spec?r1=1.3&r2=1.4&f=u