[rapid-photo-downloader: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rapid-photo-downloader

[Fabian Affolter]

commit 7d1a53e3c18fbd6a2dc21680304e09a474287ae6
Merge: 87fa6d3 af4a10a
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Wed Jan 9 18:03:26 2013 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rapid-photo-downloader
    
    Conflicts:
    	rapid-photo-downloader.spec

 rapid-photo-downloader.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --cc rapid-photo-downloader.spec
index 450c687,5cf6f61..0f6b24e
--- a/rapid-photo-downloader.spec
+++ b/rapid-photo-downloader.spec
@@@ -1,17 -1,17 +1,22 @@@
 -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 -%endif
 +%global pre_long beta1
 +%global pre_short b1
  
  Name:           rapid-photo-downloader
++<<<<<<< HEAD
 +Version:        0.4.6
 +Release:        0.%{pre_short}%{?dist}
++=======
+ Version:        0.4.5
+ Release:        2%{?dist}
++>>>>>>> af4a10aa41f6ef3d9029121cb4943d768e79b41d
  Summary:        Images downloader for external devices
  
 -Group:          Applications/Archiving
  License:        GPLv2+
  URL:            http://damonlynch.net/rapid/
 -Source0:        http://launchpad.net/rapid/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 -BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +#Source0:        http://launchpad.net/rapid/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 +# Not able to download the source tarball from Launchpad at the moment
 +#Source0:        https://launchpad.net/rapid/trunk/{version}%{pre_long}/+download/%{name}-%{version}%7E%{pre_short}.tar.gz
 +Source0:        rapid-photo-downloader-0.4.6~b1.tar.gz
  BuildArch:      noarch
  
  BuildRequires:  python2-devel
@@@ -77,9 -90,10 +82,14 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/pixmaps/%{name}.png
  %{_datadir}/pixmaps/%{name}.xpm
  
 -
  %changelog
++<<<<<<< HEAD
 +* Wed Jan 09 2013 Fabian Affolter <mail at fabian-affolter.ch> - 0.4.6-0.b1
 +- Updated to new upstream version 0.4.6-beta1 to fix critical bug
++=======
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
++>>>>>>> af4a10aa41f6ef3d9029121cb4943d768e79b41d
  
  * Mon Jun 25 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.4.5-1
  - Updated to new upstream version 0.4.5