[pinot: 2/2] Merge remote-tracking branch 'origin/f16'

[drago01]

commit 12e689294cf0fb7483e7a1239fc6c9d3a01fbf74
Merge: 06a84bb 08d630a
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Mon Dec 5 00:03:31 2011 +0100

    Merge remote-tracking branch 'origin/f16'
    
    Conflicts:
    	pinot.spec

 pinot.spec |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)
---
diff --cc pinot.spec
index 64910b4,8ff3d51..7456240
--- a/pinot.spec
+++ b/pinot.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:  pinot
  Version: 0.97
--Release: 2%{?dist}
++Release: 3%{?dist}
  Summary: Personal search and metasearch for the Desktop
  
  Group: User Interface/Desktops
@@@ -38,27 -36,16 +38,18 @@@ Requires: unrt
  Requires: poppler-utils
  Requires: catdoc
  
 -Obsoletes: pinot-deskbar < 0.97-2
++Obsoletes: pinot-deskbar < 0.97-3
+ 
  %description
  Pinot is a D-Bus service that crawls, indexes your documents and monitors them
  for changes, as well as a GTK-based user interface that enables to query
  the index built by the service and your favourite Web engines, and display and
  analyze the results
  
- 
- %package deskbar
- Summary: Pinot plugin for DeskbarApplet
- Group: Applications/Internet
- Requires: %{name} = %{version}
- Requires: deskbar-applet
- 
- %description deskbar
- The included plugin enables Deskbar to search documents indexed by Pinot
- 
- 
  %prep
  %setup -q
 +%patch1 -p1 -b .libarchive-3.x
 +%patch2 -p1 -b .include-glib
  
  %build
  autoreconf --force --install
@@@ -124,17 -115,11 +119,15 @@@ f
  %config(noreplace) %{_sysconfdir}/pinot/
  %doc AUTHORS ChangeLog COPYING NEWS README TODO
  
- %files deskbar
- %defattr(-,root,root,-)
- %{_libdir}/deskbar-applet/handlers/pinot-*
- %{_libexecdir}/deskbar-applet/modules-2.20-compatible/pinot-*
- 
  
  %changelog
 -* Wed Jun 01 2011 Adel Gadllah <adel.gadllah at gmail.com> 0.97-2
++* Mon Dec 05 2011 Adel Gadllah <adel.gadllah at gmail.com> 0.97-3
+ - Obsolete pinot-deskbar; deskbar-applet is obsolete
+ 
 +* Sun Nov 20 2011 Niels de Vos <devos at fedoraproject.org> - 0.97-2
 +- Fix compiling against libarchive-3.x
 +- Fix including glib.h
 +
  * Wed May 20 2011 Martin Dengler <martin at martindengler.com> - 0.97-1
  - New upstream version