[calibre/f14/master] Update to 0.7.23 Fix up mount helper with our own local script. Change files to list binaries so mis

[Kevin Fenzi]

commit d7a2acf18cdce8c73fb751b1608e813d94a5148b
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Sat Oct 9 15:09:42 2010 -0600

    Update to 0.7.23
    Fix up mount helper with our own local script.
    Change files to list binaries so missing ones can more easily be noted.

 .gitignore                       |    3 ++
 calibre-0.6.53-mounthelper.patch |   11 --------
 calibre-mount-helper             |    9 ++++++
 calibre.spec                     |   51 +++++++++++++++++++++++++++++---------
 sources                          |    2 +-
 5 files changed, 52 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc5b18e..fcbeee2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.7.17-nofonts.tar.xz
 /calibre-0.7.18-nofonts.tar.xz
 /calibre-0.7.20-nofonts.tar.xz
+/calibre-0.7.21-nofonts.tar.xz
+/calibre-0.7.22-nofonts.tar.xz
+/calibre-0.7.23-nofonts.tar.xz
diff --git a/calibre-mount-helper b/calibre-mount-helper
new file mode 100755
index 0000000..9113c71
--- /dev/null
+++ b/calibre-mount-helper
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# This is a dummy script shipped in the fedora calibre package. 
+# Since we have better/safer/easier ways to mount mass storage devices
+# there's no need to have a suid binary try and do this. 
+# This script simply exits telling calibre that the device is already
+# been mounted by your desktop. 
+
+exit 1
diff --git a/calibre.spec b/calibre.spec
index 37da79b..e567d8e 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.7.20
-Release:        1%{?dist}.1
+Version:        0.7.23
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -18,9 +18,9 @@ URL:            http://calibre-ebook.com/
 # ./generate-tarball.sh %{version}
 Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
+Source2:	calibre-mount-helper
 Patch0:         %{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
-Patch2:         %{name}-0.6.53-mounthelper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python >= 2.6
@@ -79,9 +79,6 @@ RTF, TXT, PDF and LRS.
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
 
-# Enable mount helper
-%patch2 -p1 -b .mounthelper
-
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
 
@@ -214,6 +211,8 @@ done;
 
 %{__rm} -f %{buildroot}%{_bindir}/%{name}-uninstall   
 
+cp -a %{SOURCE2} %{buildroot}%{_bindir}/
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -236,8 +235,28 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE Changelog.yaml
-
-%{_bindir}/*
+%{_bindir}/calibre
+%{_bindir}/calibre-complete
+%{_bindir}/calibre-customize
+%{_bindir}/calibre-debug
+%{_bindir}/calibre-parallel
+%{_bindir}/calibre-server
+%{_bindir}/calibre-smtp
+%{_bindir}/calibre-mount-helper
+%{_bindir}/calibredb
+%{_bindir}/ebook-convert
+%{_bindir}/ebook-device
+%{_bindir}/ebook-meta
+%{_bindir}/ebook-viewer
+%{_bindir}/epub-fix
+%{_bindir}/fetch-ebook-metadata
+%{_bindir}/librarything
+%{_bindir}/lrf2lrs
+%{_bindir}/lrfviewer
+%{_bindir}/lrs2lrf
+%{_bindir}/markdown-calibre
+%{_bindir}/pdfmanipulate
+%{_bindir}/web2disk
 %config(noreplace) %{_sysconfdir}/bash_completion.d/
 %{_libdir}/%{name}
 %{_datadir}/%{name}
@@ -250,15 +269,23 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Wed Sep 29 2010 jkeating - 0.7.20-1.1
+* Sat Oct 09 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.23-1
+- Update to 0.7.23
+- Fix up mount helper with our own local script. 
+- Change files to list binaries so missing ones can more easily be noted. 
+
+* Mon Oct 04 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.22-1
+- Update to 0.7.22
+
+* Fri Oct 01 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.21-1
+- Update to 0.7.21
+
+* Wed Sep 29 2010 jkeating - 0.7.20-2
 - Rebuilt for gcc bug 634757
 
 * Fri Sep 24 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.20-1
 - Update to 0.7.20
 
-* Fri Sep 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.18-3.1
-- rebuild (ImageMagick)
-
 * Wed Sep 15 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.18-3
 - Rebuild for new ImageMagick
 
diff --git a/sources b/sources
index f465bb8..65f2e04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8aa31873793750da822649292dd9604  calibre-0.7.20-nofonts.tar.xz
+6d14e146d6daf15e88490d5c8884a25a  calibre-0.7.23-nofonts.tar.xz