terjeros pushed to recoll (f22). "1.20.6 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue May 5 17:58:31 UTC 2015


>From 2bc4c4c477257b012e6714e6653468b6be042d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten at ntnu.no>
Date: Tue, 5 May 2015 19:02:22 +0200
Subject: 1.20.6

- Fixes bz#1218161 and bz#1204464

diff --git a/.gitignore b/.gitignore
index e6d906d..3cc5d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ recoll-1.13.04.tar.gz
 /recoll-1.19.14p2.tar.gz
 /recoll-1.20.1.tar.gz
 /recoll-1.20.5.tar.gz
+/recoll-1.20.6.tar.gz
diff --git a/recoll.spec b/recoll.spec
index c24d582..cbee081 100644
--- a/recoll.spec
+++ b/recoll.spec
@@ -1,7 +1,7 @@
 Summary:        Desktop full text search tool with Qt GUI
 Name:           recoll
-Version:        1.20.5
-Release:        3%{?dist}
+Version:        1.20.6
+Release:        1%{?dist}
 Group:          Applications/Databases
 License:        GPLv2+
 URL:            http://www.lesbonscomptes.com/recoll/
@@ -13,7 +13,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  aspell-devel
 BuildRequires:  xapian-core-devel
 BuildRequires:  desktop-file-utils
-#kio
+# kio
 BuildRequires:  kdelibs4-devel
 Requires:       xdg-utils
 
@@ -22,8 +22,6 @@ Recoll is a personal full text search package for Linux, FreeBSD and
 other Unix systems. It is based on a very strong back end (Xapian), for
 which it provides an easy to use, feature-rich, easy administration
 interface.
-%global __provides_exclude_from ^%{_libdir}/recoll/librecoll\\.so.*$
-%global __requires_exclude      ^librecoll\\.so.*$
 
 %package       kio
 Summary:       KIO support for recoll
@@ -94,6 +92,7 @@ exit 0
 
 %files
 %doc COPYING ChangeLog README
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_bindir}/%{name}
 %{_bindir}/%{name}index
 %{_datadir}/%{name}
@@ -110,13 +109,16 @@ exit 0
 %{_mandir}/man5/%{name}.conf.5*
 
 %files kio
-%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_libdir}/kde4/kio_recoll.so
 %{_datadir}/kde4/apps/kio_recoll/
 %{_datadir}/kde4/services/recoll.protocol
 %{_datadir}/kde4/services/recollf.protocol
 
 %changelog
+* Tue May 05 2015 Terje Rosten <terje.rosten at ntnu.no> - 1.20.6-1
+- 1.20.6
+- Fixes bz#1218161 and bz#1204464
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 1.20.5-3
 - Rebuilt for GCC 5 C++11 ABI change
 
diff --git a/sources b/sources
index af1ec91..0ba74ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f205821a0a5c993bb5de2f538979bc5  recoll-1.20.5.tar.gz
+5285a5131bb9c3678cf753a4655cbdbb  recoll-1.20.6.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/recoll.git/commit/?h=f22&id=2bc4c4c477257b012e6714e6653468b6be042d65


More information about the scm-commits mailing list