rpms/malaga/devel malaga.spec,1.8,1.9

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/malaga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9257

Modified Files:
	malaga.spec 
Log Message:
* Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 7.12-6
- Remove rpath which was set for the malaga binaries in 64 bit architechtures



Index: malaga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga/devel/malaga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- malaga.spec	25 Jul 2009 11:41:57 -0000	1.8
+++ malaga.spec	16 Sep 2009 17:44:34 -0000	1.9
@@ -1,14 +1,16 @@
 Name:           malaga
 Version:        7.12 
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A programming language for automatic language analysis
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://home.arcor.de/bjoern-beutel/malaga/
 Source0:        http://home.arcor.de/bjoern-beutel/malaga/%{name}-%{version}.tgz
-# Fix map_file symbol conflict with samba, the Voikko project will handle
-# possible upstream submission after going through the other symbols as well
+# Fix map_file symbol conflict with samba. Upstream can be considered
+# inactive but as libvoikko >= 2.2 doesn't use libmalaga anymore, these kind
+# of problems won't probably come up. The only executables in Fedora which
+# link to libmalaga currently are the malaga tools.
 Patch0:         malaga-rename-map_file.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +59,10 @@ sed -i.silent -e 's|--silent||' Makefile
 
 %build
 %configure --with-readline
+# Remove rpath,
+# https://fedoraproject.org/wiki/Packaging/Guidelines#Removing_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -108,6 +114,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 7.12-6
+- Remove rpath which was set for the malaga binaries in 64 bit architechtures
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.12-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild