rpms/xapian-core/F-7 multilib-devel-conflict-fix.patch, NONE, 1.1 xapian-core.spec, 1.3, 1.4
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Thu Oct 25 22:42:47 UTC 2007
Author: drago01
Update of /cvs/pkgs/rpms/xapian-core/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27136
Modified Files:
xapian-core.spec
Added Files:
multilib-devel-conflict-fix.patch
Log Message:
Fix multilib conflict (bug 43471)
multilib-devel-conflict-fix.patch:
--- NEW FILE multilib-devel-conflict-fix.patch ---
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.
Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-7/xapian-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xapian-core.spec 8 Aug 2007 14:08:49 -0000 1.3
+++ xapian-core.spec 25 Oct 2007 22:42:13 -0000 1.4
@@ -1,12 +1,13 @@
Summary: The Xapian Probabilistic Information Retrieval Library
Name: xapian-core
Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?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 @@
%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 @@
%{_mandir}/man1/xapian-config.1*
%changelog
+* Fri Oct 26 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-2
+- Fix multilib conflict in devel package (RH #343471)
+
* Wed Aug 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-1
- Update to 1.0.2
- Fix License tag
More information about the scm-commits
mailing list