[recoll] 1.19.8

terjeros terjeros at fedoraproject.org
Tue Nov 5 18:57:24 UTC 2013


commit 15afef2e56714c9c0de246773fe3cc2936084db6
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Tue Nov 5 19:57:36 2013 +0100

    1.19.8

 .gitignore  |    1 +
 recoll.spec |   27 +++++++++++----------------
 sources     |    2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f363cc2..f75c74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ recoll-1.13.04.tar.gz
 /recoll-1.17.3.tar.gz
 /recoll-1.18.1.tar.gz
 /recoll-1.19.4.tar.gz
+/recoll-1.19.8.tar.gz
diff --git a/recoll.spec b/recoll.spec
index cf94ba5..8d8ffc5 100644
--- a/recoll.spec
+++ b/recoll.spec
@@ -1,10 +1,7 @@
-%{?filter_provides_in: %filter_provides_in /recoll/.*\.so$}
-%{?filter_setup}
-
 Summary:        Desktop full text search tool with Qt GUI
 Name:           recoll
-Version:        1.19.4
-Release:        3%{?dist}
+Version:        1.19.8
+Release:        1%{?dist}
 Group:          Applications/Databases
 License:        GPLv2+
 URL:            http://www.lesbonscomptes.com/recoll/
@@ -17,34 +14,33 @@ BuildRequires:  aspell-devel
 BuildRequires:  xapian-core-devel
 BuildRequires:  desktop-file-utils
 Requires:       xdg-utils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 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.*$
 
 %prep
 %setup -q
-# remove execute bit
-%{__chmod} 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
+chmod 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
 
 %build
 export QMAKE=qmake-qt4
 %configure
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p'
+make install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p'
 
 desktop-file-install --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
   %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop
 
 # use /usr/bin/xdg-open
-%{__rm} -f %{buildroot}/usr/share/recoll/filters/xdg-open
+rm -f %{buildroot}/usr/share/recoll/filters/xdg-open
 
 # fix perms
 chmod 0755 %{buildroot}/usr/share/recoll/filters/rclexecm.py
@@ -70,11 +66,7 @@ if [ -x %{_bindir}/update-desktop-database ] ; then
 fi
 exit 0
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
-%defattr(-, root, root, -)
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_bindir}/%{name}index
@@ -90,6 +82,9 @@ exit 0
 %{_mandir}/man5/%{name}.conf.5*
 
 %changelog
+* Tue Nov 05 2013 Terje Rosten <terje.rosten at ntnu.no> - 1.19.8-1
+- 1.19.8
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index ddcb2ec..899b804 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a0e2b5bd6508a9590f0042593ff13b6  recoll-1.19.4.tar.gz
+1ef6d67069f4f3525ff2f79e4c945ca0  recoll-1.19.8.tar.gz


More information about the scm-commits mailing list