denisarnaud pushed to xapian-core (epel7). "- Update to 1.0.16, some spec file cleanups"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat May 30 22:07:12 UTC 2015
From 8d6c750aadf57357165b2b6557fe58f0588c7462 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 19 Sep 2009 16:01:14 +0000
Subject: - Update to 1.0.16, some spec file cleanups
diff --git a/.cvsignore b/.cvsignore
index 8c2887e..0e57507 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.0.15.tar.gz
+xapian-core-1.0.16.tar.gz
diff --git a/sources b/sources
index 0fccc83..573b42b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d851e661966fa0446cb46d7352c84a98 xapian-core-1.0.15.tar.gz
+19756e128d804faa6e7975a629ca3b70 xapian-core-1.0.16.tar.gz
diff --git a/xapian-core-1.0.9-includes.patch b/xapian-core-1.0.9-includes.patch
deleted file mode 100644
index 00457e2..0000000
--- a/xapian-core-1.0.9-includes.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-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':
diff --git a/xapian-core.spec b/xapian-core.spec
index 4ba1253..881e83f 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,17 +1,17 @@
-Summary: The Xapian Probabilistic Information Retrieval Library
-Name: xapian-core
-Version: 1.0.15
-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
+Name: xapian-core
+Version: 1.0.16
+Release: 1%{?dist}
+Summary: The Xapian Probabilistic Information Retrieval Library
+
+Group: Applications/Databases
+License: GPLv2+
+URL: http://www.xapian.org/
+Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0: multilib-devel-conflict-fix.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: %{name}-libs = %{version}
%description
Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -19,8 +19,8 @@ offers a highly adaptable toolkit that allows developers to easily add advanced
indexing and search facilities to applications
%package libs
-Summary: Xapian search engine libraries
-Group: System Environment/Libraries
+Summary: Xapian search engine libraries
+Group: System Environment/Libraries
%description libs
Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -29,10 +29,10 @@ indexing and search facilities to applications. This package provides the
libraries for applications using Xapian functionality
%package devel
-Group: Development/Libraries
-Summary: Files needed for building packages which use Xapian
-Requires: %{name} = %{version}
-Requires: %{name}-libs = %{version}
+Group: Development/Libraries
+Summary: Files needed for building packages which use Xapian
+Requires: %{name} = %{version}
+Requires: %{name}-libs = %{version}
%description devel
Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -41,33 +41,27 @@ indexing and search facilities to applications. This package provides the
files needed for building packages which use Xapian
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%patch0 -p1 -b .multilibfix
-#%patch1 -p1 -b .includes
%build
-# FC6 (at least) has a patched libtool which knows not to set rpath for
-# /usr/lib64, which upstream libtool fails to do currently. We can drop
-# this "autoreconf --force" and the "BuildRequires:" for the autotools
-# once upstream libtool is fixed. Note: this overwrites INSTALL, but
-# that doesn't matter here as we don't package it.
-autoreconf --force -i
%configure --disable-static
-make %{?_smp_mflags}
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags} V=1
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}
-# makeinstall doesn't work properly with libtool built libraries
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove libtool archives
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# Move the docs to the right place
-mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy HACKING now, as "%doc HACKING" would overwrite everything
-cp HACKING %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy the rest while we are in this directory
-mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
-cp AUTHORS ChangeLog COPYING NEWS PLATFORMS README %{buildroot}%{_datadir}/doc/%{name}-%{version}
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
%post libs -p /sbin/ldconfig
@@ -78,6 +72,7 @@ rm -rf %{buildroot}
%files
%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/xapian-check
%{_bindir}/xapian-inspect
%{_bindir}/xapian-tcpsrv
@@ -92,7 +87,6 @@ rm -rf %{buildroot}
%{_bindir}/simplesearch
%{_bindir}/simpleexpand
%{_bindir}/xapian-compact
-%doc %{_datadir}/doc/%{name}-%{version}
# man pages may be gzipped, hence the trailing wildcard.
%{_mandir}/man1/xapian-check.1*
%{_mandir}/man1/xapian-inspect.1*
@@ -112,16 +106,19 @@ rm -rf %{buildroot}
%files devel
%defattr(-, root, root)
+%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
%{_bindir}/xapian-config
%{_includedir}/xapian
%{_includedir}/xapian.h
%{_libdir}/libxapian.so
%{_datadir}/aclocal/xapian.m4
-%doc %{_datadir}/doc/%{name}-devel-%{version}
# man pages may be gzipped, hence the trailing wildcard.
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
+- Update to 1.0.16, some spec file cleanups
+
* Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
- Update to 1.0.15
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xapian-core.git/commit/?h=epel7&id=8d6c750aadf57357165b2b6557fe58f0588c7462
More information about the scm-commits
mailing list