rpms/yap/F-7 yap.spec,1.15,1.16

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/pkgs/rpms/yap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4670

Modified Files:
	yap.spec 
Log Message:
fix library path for 64-bit platforms


Index: yap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yap/F-7/yap.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- yap.spec	5 Jul 2007 15:48:55 -0000	1.15
+++ yap.spec	21 Oct 2007 09:58:22 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		yap
 Version:	5.1.1
-Release:	5%{?dist}
+Release:	8%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
@@ -15,8 +15,8 @@
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gmp-devel, texinfo
-Requires(post):	  /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post):	  /sbin/install-info, /sbin/ldconfig
+Requires(postun): /sbin/install-info, /sbin/ldconfig
 
 %description
 A high-performance Prolog compiler developed at LIACC, Universidade do
@@ -49,7 +49,10 @@
 %patch1 -p1
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr
 # remove redundant rpath
-sed -i "/-Wl,-R/d" configure
+sed -i '/-Wl,-R/d' configure
+sed -i 's/SHLIB_LD=.*/SHLIB_LD="gcc -shared"/' configure
+find -name Makefile.in | xargs sed -i 's|$(ROOTDIR)/lib|$(ROOTDIR)/%{_lib}|'
+find -name Makefile.in | xargs sed -i 's|$(EROOTDIR)/lib|$(EROOTDIR)/%{_lib}|'
 
 
 %build
@@ -85,6 +88,7 @@
 %post
 /sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || :
+/sbin/ldconfig
 
 
 %postun
@@ -92,6 +96,7 @@
   /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/pillow_doc.info %{_infodir}/dir 2>/dev/null || :
 fi
+/sbin/ldconfig
 
 
 %clean
@@ -104,14 +109,14 @@
 %doc changes*
 %{_bindir}/yap
 %{_datadir}/Yap
-%{_prefix}/lib/Yap
-%{_prefix}/lib/libYap.so
+%{_libdir}/Yap
+%{_libdir}/libYap.so
 %{_infodir}/*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_prefix}/lib/libYap.a
+%{_libdir}/libYap.a
 %{_includedir}/Yap
 
 
@@ -126,6 +131,15 @@
 
 
 %changelog
+* Sat Oct 20 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.1.1-8
+- fix library path for 64-bit platforms
+
+* Wed Aug 29 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.1.1-7
+- replaced ld -shared with gcc -shared
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.1.1-6
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jul  5 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.1.1-5
 - also build libYap.so