rpms/xapian-core/F-8 .cvsignore, 1.3, 1.4 multilib-devel-conflict-fix.patch, 1.2, 1.3 sources, 1.3, 1.4 xapian-core.spec, 1.8, 1.9
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Sun Nov 25 10:06:46 UTC 2007
- Previous message (by thread): rpms/pinot/devel .cvsignore, 1.4, 1.5 pinot.spec, 1.18, 1.19 sources, 1.4, 1.5 configure-ssl-curl-libs.patch, 1.2, NONE dbusxapianindex_reload03.patch, 1.1, NONE
- Next message (by thread): rpms/xapian-core/F-7 .cvsignore, 1.2, 1.3 multilib-devel-conflict-fix.patch, 1.2, 1.3 sources, 1.3, 1.4 xapian-core.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: drago01
Update of /cvs/pkgs/rpms/xapian-core/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2791
Modified Files:
.cvsignore multilib-devel-conflict-fix.patch sources
xapian-core.spec
Log Message:
update to 1.0.4
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Aug 2007 09:16:04 -0000 1.3
+++ .cvsignore 25 Nov 2007 10:06:09 -0000 1.4
@@ -1 +1 @@
-xapian-core-1.0.2.tar.gz
+xapian-core-1.0.4.tar.gz
multilib-devel-conflict-fix.patch:
Index: multilib-devel-conflict-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-8/multilib-devel-conflict-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multilib-devel-conflict-fix.patch 25 Oct 2007 22:49:11 -0000 1.2
+++ multilib-devel-conflict-fix.patch 25 Nov 2007 10:06:09 -0000 1.3
@@ -1,6 +1,6 @@
-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-26 00:45:12.000000000 +0200
+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() {
# -L option required (if any).
set_L_to_library_path() {
@@ -9,19 +9,32 @@
}
# -I options for compiling against an uninstalled xapian.
-@@ -204,11 +203,6 @@ while [ 0 != "$#" ] ; do
- # yet.
- ;;
- *)
-- # Only pull in dependency_libs if libtool would.
-- if [ no != "@link_all_deplibs_CXX@" ]; then
-- extract_dependency_libs "@libdir@/libxapian.la"
-- [ -n "$dependency_libs" ] && D=" $dependency_libs"
-- fi
- ;;
- esac
+@@ -203,24 +202,7 @@ while [ 0 != "$#" ] ; do
+ fi
+ 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
+- extract_dependency_libs "@libdir@/libxapian.la"
+- [ -n "$dependency_libs" ] && D=" $dependency_libs"
+- fi
echo "$F$L-lxapian$D"
-@@ -224,11 +218,6 @@ while [ 0 != "$#" ] ; do
+ ;;
+
+@@ -234,11 +216,6 @@ while [ 0 != "$#" ] ; do
continue
fi
@@ -30,6 +43,6 @@
- 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.
+ # 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.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Aug 2007 09:16:04 -0000 1.3
+++ sources 25 Nov 2007 10:06:09 -0000 1.4
@@ -1 +1 @@
-9e7f0498bba8a6dad9474f20a8bd17c1 xapian-core-1.0.2.tar.gz
+57cd26fb4a3677bfe05d4c9df5012357 xapian-core-1.0.4.tar.gz
Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-8/xapian-core.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xapian-core.spec 25 Oct 2007 22:40:03 -0000 1.8
+++ xapian-core.spec 25 Nov 2007 10:06:09 -0000 1.9
@@ -1,7 +1,7 @@
Summary: The Xapian Probabilistic Information Retrieval Library
Name: xapian-core
-Version: 1.0.2
-Release: 6%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Databases
URL: http://www.xapian.org/
@@ -120,6 +120,12 @@
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Nov 25 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
+- Fix up multilib patch
+
* Thu Oct 25 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-6
- Fix multilib conflict in devel package (RH #343471)
- Previous message (by thread): rpms/pinot/devel .cvsignore, 1.4, 1.5 pinot.spec, 1.18, 1.19 sources, 1.4, 1.5 configure-ssl-curl-libs.patch, 1.2, NONE dbusxapianindex_reload03.patch, 1.1, NONE
- Next message (by thread): rpms/xapian-core/F-7 .cvsignore, 1.2, 1.3 multilib-devel-conflict-fix.patch, 1.2, 1.3 sources, 1.3, 1.4 xapian-core.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list