[media-explorer/f16: 5/5] fix merge

[Peter Robinson]

commit a66504516aaec7003329556526a4dfd63f86918c
Merge: 9244d48 3436719
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Dec 27 16:57:57 2011 +0000

    fix merge

 .gitignore          |    2 +-
 media-explorer.spec |   25 +++++++++++++++----------
 sources             |    2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)
---
diff --cc media-explorer.spec
index 1e1d1d0,20c0653..06e04e3
--- a/media-explorer.spec
+++ b/media-explorer.spec
@@@ -10,20 -10,20 +10,19 @@@ License:	LGPLv2
  # Wiki
  # https://github.com/media-explorer/media-explorer/wiki/Ideas
  URL:		http://media-explorer.github.com/
- Source0:	http://media-explorer.github.com/releases/%{name}-%{version}.tar.xz
+ Source0:	https://github.com/downloads/media-explorer/media-explorer/%{name}-%{version}.tar.xz
  
- BuildRequires:	intltool
- BuildRequires:	grilo-devel
- BuildRequires:	glib2-devel
+ BuildRequires:	clutter-gst-devel
+ BuildRequires:	dbus-glib-devel
  BuildRequires:	gdk-pixbuf2-devel
+ BuildRequires:	glib2-devel
+ BuildRequires:	grilo-devel
+ BuildRequires:	intltool
  BuildRequires:	libmx-devel
- BuildRequires:	rest-devel
- BuildRequires:	dbus-glib-devel
- BuildRequires:	libsoup-devel
- BuildRequires:	clutter-gst-devel
  BuildRequires:	lirc-devel
+ BuildRequires:	libsoup-devel
  BuildRequires:	NetworkManager-devel
- 
+ BuildRequires:	rest-devel
 -
  BuildRequires:	autoconf automake libtool
  
  # For plugins