[themonospot-gui-qt/f13/master: 4/4] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit ab8ae09c8856d78f7f4828af7c630c05cf26f7dd
Merge: f8f52d9 8e6fc6a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 28 18:57:30 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	themonospot-gui-qt.spec

 themonospot-gui-qt.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --cc themonospot-gui-qt.spec
index c58d244,99e7562..7d6e356
--- a/themonospot-gui-qt.spec
+++ b/themonospot-gui-qt.spec
@@@ -39,6 -39,7 +39,7 @@@ desktop-file-install 
   --delete-original \
   %{buildroot}%{_datadir}/applications/themonospot-qt.desktop
  
 -%if 0%{?fedora} < 14
++%if 0%{?fedora} < 13 
  # workaround for bug 551860
  # (Qyoto.Qt requires unversioned libqyotoshared.so)
  mkdir -p %{buildroot}%{_libdir}/themonospot
@@@ -58,12 -60,17 +60,20 @@@ rm -rf %{buildroot
  %doc copying.gpl
  %{_bindir}/themonospot-qt
  %{_libdir}/themonospot/%{name}.exe
 -%if 0%{?fedora} < 14
++%if 0%{?fedora} < 13
  %{_libdir}/themonospot/libqyotoshared.so
+ %endif
  %{_datadir}/pixmaps/themonospot-qt.png
  %{_datadir}/applications/themonospot-qt.desktop
  
  
  %changelog
++* Thu Oct 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-7.1
++- F-13: rebuild for new qyoto
++
+ * Thu Jul 15 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.3-7
+ - F-14: rebuild for new qyoto
+ 
  * Wed Apr 02 2010 Armando Basile <hmandevteam at gmail.com> 0.1.3-6
  - workaround for bug 551860