rpms/xapian-core/F-10 xapian-core-1.0.9-includes.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xapian-core.spec, 1.18, 1.19
Peter Robinson
pbrobinson at fedoraproject.org
Thu Aug 27 17:19:02 UTC 2009
Author: pbrobinson
Update of /cvs/pkgs/rpms/xapian-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30562
Modified Files:
.cvsignore sources xapian-core.spec
Added Files:
xapian-core-1.0.9-includes.patch
Log Message:
- Update to 1.0.14
xapian-core-1.0.9-includes.patch:
backends/flint/flint_version.cc | 1 +
bin/quartzcompact.cc | 2 +-
bin/quartzdump.cc | 2 +-
bin/xapian-compact.cc | 2 +-
bin/xapian-inspect.cc | 2 +-
bin/xapian-progsrv.cc | 2 +-
bin/xapian-tcpsrv.cc | 2 +-
common/serialise-double.cc | 2 +-
examples/delve.cc | 2 +-
examples/quest.cc | 2 +-
tests/harness/testsuite.cc | 2 +-
11 files changed, 11 insertions(+), 10 deletions(-)
--- NEW FILE xapian-core-1.0.9-includes.patch ---
diff -ru xapian-core-1.0.9.orig/backends/flint/flint_version.cc xapian-core-1.0.9/backends/flint/flint_version.cc
--- xapian-core-1.0.9.orig/backends/flint/flint_version.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/backends/flint/flint_version.cc 2009-03-04 12:06:34.000000000 +0000
@@ -36,6 +36,7 @@
#include <string>
#include <string.h> // for memcmp
+#include <stdio.h> // for rename
using std::string;
diff -ru xapian-core-1.0.9.orig/bin/quartzcompact.cc xapian-core-1.0.9/bin/quartzcompact.cc
--- xapian-core-1.0.9.orig/bin/quartzcompact.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/quartzcompact.cc 2009-03-04 12:48:51.000000000 +0000
@@ -222,7 +222,7 @@
size_t block_size = 8192;
int c;
- while ((c = gnu_getopt_long(argc, argv, "b:nFhv", long_opts, 0)) != EOF) {
+ while ((c = gnu_getopt_long(argc, argv, "b:nFhv", long_opts, 0)) != -1) {
switch (c) {
case 'b': {
char *p;
diff -ru xapian-core-1.0.9.orig/bin/quartzdump.cc xapian-core-1.0.9/bin/quartzdump.cc
--- xapian-core-1.0.9.orig/bin/quartzdump.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/quartzdump.cc 2009-03-04 12:48:54.000000000 +0000
@@ -91,7 +91,7 @@
};
int c;
- while ((c = gnu_getopt_long(argc, argv, "r:s:e:", long_opts, 0)) != EOF) {
+ while ((c = gnu_getopt_long(argc, argv, "r:s:e:", long_opts, 0)) != -1) {
switch (c) {
case 'r':
revnum = atoi(optarg);
diff -ru xapian-core-1.0.9.orig/bin/xapian-compact.cc xapian-core-1.0.9/bin/xapian-compact.cc
--- xapian-core-1.0.9.orig/bin/xapian-compact.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-compact.cc 2009-03-04 12:49:00.000000000 +0000
@@ -748,7 +748,7 @@
bool renumber = true;
int c;
- while ((c = gnu_getopt_long(argc, argv, "b:nFm", long_opts, 0)) != EOF) {
+ while ((c = gnu_getopt_long(argc, argv, "b:nFm", long_opts, 0)) != -1) {
switch (c) {
case 'b': {
char *p;
diff -ru xapian-core-1.0.9.orig/bin/xapian-inspect.cc xapian-core-1.0.9/bin/xapian-inspect.cc
--- xapian-core-1.0.9.orig/bin/xapian-inspect.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-inspect.cc 2009-03-04 12:49:03.000000000 +0000
@@ -94,7 +94,7 @@
};
int c;
- while ((c = gnu_getopt_long(argc, argv, "", long_opts, 0)) != EOF) {
+ while ((c = gnu_getopt_long(argc, argv, "", long_opts, 0)) != -1) {
switch (c) {
case OPT_HELP:
cout << PROG_NAME" - "PROG_DESC"\n\n";
diff -ru xapian-core-1.0.9.orig/bin/xapian-progsrv.cc xapian-core-1.0.9/bin/xapian-progsrv.cc
--- xapian-core-1.0.9.orig/bin/xapian-progsrv.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-progsrv.cc 2009-03-04 12:49:07.000000000 +0000
@@ -60,7 +60,7 @@
bool syntax_error = false;
int c;
- while ((c = gnu_getopt_long(argc, argv, "t:", opts, NULL)) != EOF) {
+ while ((c = gnu_getopt_long(argc, argv, "t:", opts, NULL)) != -1) {
switch (c) {
case OPT_HELP:
cout << PROG_NAME" - "PROG_DESC"\n\n";
diff -ru xapian-core-1.0.9.orig/bin/xapian-tcpsrv.cc xapian-core-1.0.9/bin/xapian-tcpsrv.cc
--- xapian-core-1.0.9.orig/bin/xapian-tcpsrv.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-tcpsrv.cc 2009-03-04 12:49:12.000000000 +0000
@@ -95,7 +95,7 @@
bool syntax_error = false;
int c;
- while ((c = gnu_getopt_long(argc, argv, "I:p:a:i:t:oq", opts, NULL)) != EOF) {
+ while ((c = gnu_getopt_long(argc, argv, "I:p:a:i:t:oq", opts, NULL)) != -1) {
switch (c) {
case OPT_HELP:
cout << PROG_NAME" - "PROG_DESC"\n\n";
diff -ru xapian-core-1.0.9.orig/common/serialise-double.cc xapian-core-1.0.9/common/serialise-double.cc
--- xapian-core-1.0.9.orig/common/serialise-double.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/common/serialise-double.cc 2009-03-04 12:21:40.000000000 +0000
@@ -56,7 +56,7 @@
# define MAX_MANTISSA_BYTES ((DBL_MANT_DIG + 1 + 1) / 2)
# define MAX_EXP ((DBL_MAX_EXP + 1) / 2)
# define MAX_MANTISSA (1 << ((DBL_MAX_EXP & 1) * 4))
-#elif
+#else
# error FLT_RADIX is a value not currently handled (not 2 or 16)
// # define MAX_MANTISSA_BYTES (sizeof(double) + 1)
#endif
diff -ru xapian-core-1.0.9.orig/examples/delve.cc xapian-core-1.0.9/examples/delve.cc
--- xapian-core-1.0.9.orig/examples/delve.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/examples/delve.cc 2009-03-04 13:06:01.000000000 +0000
@@ -172,7 +172,7 @@
bool valno_set = false;
int c;
- while ((c = gnu_getopt(argc, argv, "r:t:s:1vkV::d")) != EOF) {
+ while ((c = gnu_getopt(argc, argv, "r:t:s:1vkV::d")) != -1) {
switch (c) {
case 'r':
recnos.push_back(atoi(optarg));
diff -ru xapian-core-1.0.9.orig/examples/quest.cc xapian-core-1.0.9/examples/quest.cc
--- xapian-core-1.0.9.orig/examples/quest.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/examples/quest.cc 2009-03-04 13:06:11.000000000 +0000
@@ -80,7 +80,7 @@
Xapian::Database db;
int c;
- while ((c = gnu_getopt_long(argc, argv, "hvm:d:s:", long_opts, 0)) != EOF)
+ while ((c = gnu_getopt_long(argc, argv, "hvm:d:s:", long_opts, 0)) != -1)
{
switch (c) {
case 'm':
diff -ru xapian-core-1.0.9.orig/tests/harness/testsuite.cc xapian-core-1.0.9/tests/harness/testsuite.cc
--- xapian-core-1.0.9.orig/tests/harness/testsuite.cc 2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/tests/harness/testsuite.cc 2009-03-04 13:06:28.000000000 +0000
@@ -648,7 +648,7 @@
}
int c;
- while ((c = gnu_getopt_long(argc, argv, opts.c_str(), long_opts, 0)) != EOF)
+ while ((c = gnu_getopt_long(argc, argv, opts.c_str(), long_opts, 0)) != -1)
{
switch (c) {
case 'v':
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 29 Nov 2008 16:04:44 -0000 1.9
+++ .cvsignore 27 Aug 2009 17:19:01 -0000 1.10
@@ -1 +1 @@
-xapian-core-1.0.9.tar.gz
+xapian-core-1.0.14.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 29 Nov 2008 16:04:45 -0000 1.9
+++ sources 27 Aug 2009 17:19:01 -0000 1.10
@@ -1 +1 @@
-f9e6798b45fab2af90273f73570df5cc xapian-core-1.0.9.tar.gz
+f318fe11143af82aa6679acc51723a1a xapian-core-1.0.14.tar.gz
Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/xapian-core.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xapian-core.spec 5 Dec 2008 07:35:03 -0000 1.18
+++ xapian-core.spec 27 Aug 2009 17:19:01 -0000 1.19
@@ -1,13 +1,14 @@
Summary: The Xapian Probabilistic Information Retrieval Library
Name: xapian-core
-Version: 1.0.9
-Release: 2%{?dist}
+Version: 1.0.14
+Release: 1%{?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
+Patch1: xapian-core-1.0.9-includes.patch
BuildRequires: autoconf automake libtool
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +43,7 @@ files needed for building packages which
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .multilibfix
+#%patch1 -p1 -b .includes
%build
# FC6 (at least) has a patched libtool which knows not to set rpath for
@@ -120,6 +122,27 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.14-1
+- Update to 1.0.14
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 5 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.13-1
+- Update to 1.0.13
+
+* Sun Apr 12 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.12-1
+- Update to 1.0.12
+
+* Mon Apr 06 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.11-1
+- Update to 1.0.11
+
+* Wed Mar 04 2009 Caolán McNamara <caolanm at redhat.com> - 1.0.9-4
+- include stdio.h for rename, fix bare #elif, EOF -> -1 for getopt
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Fri Dec 05 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.9-2
- Fix build
More information about the scm-commits
mailing list