rpms/xapian-core/F-7 multilib-devel-conflict-fix.patch, 1.3, 1.4 xapian-core.spec, 1.5, 1.6
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Thu Dec 27 11:24:40 UTC 2007
Author: drago01
Update of /cvs/pkgs/rpms/xapian-core/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22542
Modified Files:
multilib-devel-conflict-fix.patch xapian-core.spec
Log Message:
update to 1.0.5
multilib-devel-conflict-fix.patch:
Index: multilib-devel-conflict-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-7/multilib-devel-conflict-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multilib-devel-conflict-fix.patch 25 Nov 2007 10:08:19 -0000 1.3
+++ multilib-devel-conflict-fix.patch 27 Dec 2007 11:24:33 -0000 1.4
@@ -1,7 +1,32 @@
-diff -upNr xapian-core-1.0.4.orign/xapian-config.in xapian-core-1.0.4/xapian-config.in
---- xapian-core-1.0.4.orign/xapian-config.in 2007-10-30 06:46:39.000000000 +0100
-+++ xapian-core-1.0.4/xapian-config.in 2007-10-30 13:55:39.000000000 +0100
-@@ -68,7 +68,6 @@ set_F_to_extra_ldflags() {
+diff -upNr xapian-core-1.0.5.orign/xapian-config.in xapian-core-1.0.5/xapian-config.in
+--- xapian-core-1.0.5.orign/xapian-config.in 2007-12-21 04:01:25.000000000 +0100
++++ xapian-core-1.0.5/xapian-config.in 2007-12-26 23:58:34.000000000 +0100
+@@ -61,24 +61,6 @@ is_uninstalled()
+
+ need_explicit_dependencies()
+ {
+- # For static libraries, we need to explicitly link with dependency_libs
+- # on all platforms. If we only have static libraries, then "$dlname"
+- # will be empty.
+- extract_dlname "@libdir@/libxapian.la"
+- [ -n "$dlname" ] || return 0 # "true"
+-
+- # If libtool has been patched to give link_all_deplibs=no, don't link them.
+- [ no != "@link_all_deplibs_CXX@" ] || return 1 # "false"
+-
+- # Handle cases which libtool thinks are "unknown", but we know are "no".
+- if [ yes != "@link_all_deplibs_CXX@" ]; then
+- case "@host_os@" in
+- linux* | k*bsd*-gnu)
+- # We don't need dependency_libs for shared libraries on these
+- # platforms, but upstream libtool doesn't know this (yet).
+- return 1 ;; # "false"
+- esac
+- fi
+ return 0 # "true"
+ }
+
+@@ -91,7 +73,6 @@ set_F_to_extra_ldflags() {
# -L option required (if any).
set_L_to_library_path() {
L=
@@ -9,40 +34,37 @@
}
# -I options for compiling against an uninstalled xapian.
-@@ -203,24 +202,7 @@ while [ 0 != "$#" ] ; do
- fi
+@@ -227,10 +208,6 @@ while [ 0 != "$#" ] ; do
set_F_to_extra_ldflags
set_L_to_library_path
-- extract_dlname "@libdir@/libxapian.la"
-- # For static libraries, we need to explicitly link with dependency_libs
-- # on all platforms. For shared libraries, only pull in dependency_libs
-- # if libtool would.
-- explicit_dependencies=yes
-- if [ -n "$dlname" ] && [ no != "@link_all_deplibs_CXX@" ]; then
-- case "@host_os@" in
-- linux* | k*bsd*-gnu)
-- # We don't need dependency_libs for shared libraries on these
-- # platforms, but upstream libtool doesn't know this (yet).
-- explicit_dependencies=no ;;
-- esac
-- fi
D=
-- if [ yes = "$explicit_dependencies" ] ; then
+- if need_explicit_dependencies ; then
- extract_dependency_libs "@libdir@/libxapian.la"
- [ -n "$dependency_libs" ] && D=" $dependency_libs"
- fi
echo "$F$L-lxapian$D"
;;
-@@ -234,11 +216,6 @@ while [ 0 != "$#" ] ; do
+@@ -245,22 +222,6 @@ while [ 0 != "$#" ] ; do
continue
fi
-- if [ -f "@libdir@/libxapian.la" ]; then
-- echo "${F}@libdir@/libxapian.la"
-- continue
-- fi
+- # If we need to pull in dependency_libs, we need libxapian.la.
+- # Otherwise just use the appropriate -L and -l options.
+- # Upstream libtool currently never sets link_all_deplibs_CXX=no.
+- # Some Linux distros patch libtool to return no, and some have an
+- # unhelpful policy of not packaging .la files in an attempt to work
+- # around this. So avoiding using libtool here gives more consistent
+- # behaviour.
+- if need_explicit_dependencies ; then
+- if [ -f "@libdir@/libxapian.la" ]; then
+- echo "${F}@libdir@/libxapian.la"
+- continue
+- fi
-
- # If we need to pull in dependency_libs, we need libxapian.la.
- # Otherwise we can cope with out it, which is useful as some Linux
- # distros have an unhelpful policy of not packaging .la files.
+- echo "$0: Can't find libxapian.la to link against." 1>&2
+- exit 1
+- fi
+
+ set_L_to_library_path
+ echo "$F$L-lxapian"
Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-7/xapian-core.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xapian-core.spec 25 Nov 2007 10:08:19 -0000 1.5
+++ xapian-core.spec 27 Dec 2007 11:24:33 -0000 1.6
@@ -1,6 +1,6 @@
Summary: The Xapian Probabilistic Information Retrieval Library
Name: xapian-core
-Version: 1.0.4
+Version: 1.0.5
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Databases
@@ -120,7 +120,10 @@
%{_mandir}/man1/xapian-config.1*
%changelog
-* Sun Nov 25 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.4-1
+* Thu Dec 27 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.5-1
+- Update to 1.0.5
+
+* Tue Oct 30 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.4-1
- Update to 1.0.4
* Fri Oct 25 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-7
More information about the fedora-extras-commits
mailing list