denisarnaud pushed to xapian-core (epel7). "Fix multilib conflict (bug 43471)"

[notifications at fedoraproject.org]

From 8d3aafafef52503068f49b7213c5619e37f45ee4 Mon Sep 17 00:00:00 2001
From: drago01 <drago01 at fedoraproject.org>
Date: Thu, 25 Oct 2007 21:15:59 +0000
Subject: Fix multilib conflict (bug 43471)


diff --git a/multilib-devel-conflict-fix.patch b/multilib-devel-conflict-fix.patch
new file mode 100644
index 0000000..3537a4a
--- /dev/null
+++ b/multilib-devel-conflict-fix.patch
@@ -0,0 +1,11 @@
+diff -upNr xapian-core-1.0.2.orign/xapian-config.in xapian-core-1.0.2/xapian-config.in
+--- xapian-core-1.0.2.orign/xapian-config.in	2007-07-05 02:39:51.000000000 +0200
++++ xapian-core-1.0.2/xapian-config.in	2007-10-25 23:10:59.000000000 +0200
+@@ -68,7 +68,6 @@ set_F_to_extra_ldflags() {
+ # -L option required (if any).
+ set_L_to_library_path() {
+     L=
+-    [ /usr/lib != "@libdir@" ] && L="-L at libdir@ "
+ }
+ 
+ # -I options for compiling against an uninstalled xapian.
diff --git a/xapian-core.spec b/xapian-core.spec
index f0ad99b..490a2ce 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,12 +1,13 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
 Version: 1.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Databases
 URL: http://www.xapian.org/
 Requires: %{name}-libs = %{version}
 Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0: multilib-devel-conflict-fix.patch
 BuildRequires: autoconf automake libtool
 BuildRequires: zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,6 +41,7 @@ files needed for building packages which use Xapian
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .multilibfix
 
 %build
 # FC6 (at least) has a patched libtool which knows not to set rpath for
@@ -118,6 +120,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Thu Oct 25 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-6
+- Fix multilib conflict in devel package (RH #343471)
+
 * Tue Aug 21 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-5
 - Rebuild for BuildID and ppc32 bug
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xapian-core.git/commit/?h=epel7&id=8d3aafafef52503068f49b7213c5619e37f45ee4