[packages/quodlibet/DEVEL] Up to 2.9.82, drop home_etc patch

[wiget]

commit 2f97c9b907e254d6e5c003e5e4f7bbeebeb0c144
Author: Artur Frysiak <artur at frysiak.net>
Date:   Sat May 4 12:05:25 2013 +0200

    Up to 2.9.82, drop home_etc patch

 quodlibet-desktop.patch  | 10 ++++-----
 quodlibet-home_etc.patch | 14 -------------
 quodlibet.spec           | 53 +++++++++++++++++++++++-------------------------
 3 files changed, 30 insertions(+), 47 deletions(-)
---
diff --git a/quodlibet.spec b/quodlibet.spec
index bb0a516..eb17e25 100644
--- a/quodlibet.spec
+++ b/quodlibet.spec
@@ -1,46 +1,43 @@
-#
-# Conditional build:
-%bcond_without	home_etc	# don't use home_etc
-#
 Summary:	Quod Libet - GTK+-based audio player
 Summary(pl.UTF-8):	Quod Libet - odtwarzacz dźwięku oparty na GTK+
 Name:		quodlibet
-Version:	2.5.1
-Release:	1
+Version:	2.9.82
+Release:	0.2
 License:	GPL v2
 Group:		X11/Applications/Multimedia
 Source0:	http://quodlibet.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	946b8fa90d609cb5f7d4120bbcea8c59
-Patch0:		%{name}-home_etc.patch
-Patch1:		%{name}-nopy.patch
-Patch2:		%{name}-desktop.patch
+# Source0-md5:	fbab9dc2fcc3cd9202b87526db8bea45
+Patch0:		%{name}-nopy.patch
+Patch1:		%{name}-desktop.patch
 URL:		http://code.google.com/p/quodlibet/
 BuildRequires:	gettext-devel
 BuildRequires:	intltool
 BuildRequires:	python-modules >= 1:2.6
 BuildRequires:	rpm-pythonprov
-Requires:	gstreamer0.10-GConf
-Requires:	gstreamer0.10-audio-effects-base
+Requires:	gdk-pixbuf2
+Requires:	gobject-introspection
+Requires:	gstreamer >= 1.0
+#Requires:	gstreamer-GConf >= 1.0
+Requires:	gstreamer-audio-effects-base >= 1.0
+Requires:	gstreamer-plugins-base >= 1.0
+Requires:	gtk+3
+Requires:	pango
 Requires:	python-dbus
 Requires:	python-gstreamer >= 0.10.2-2
-Requires:	python-modules
+Requires:	python-modules >= 1:2.6
 Requires:	python-mutagen >= 1.14
-Requires:	python-pygobject
-Requires:	python-pygtk-gtk >= 2:2.16.0
-Requires:	python-pygtk-pango
+Requires:	python-pygobject3
 Suggests:	%{name}-plugins
-Suggests:	gstreamer0.10-audiosink
-Suggests:	gstreamer0.10-mad
-Suggests:	gstreamer0.10-musepack
-Suggests:	gstreamer0.10-vorbis
+Suggests:	gstreamer-audiosink
+Suggests:	gstreamer-mad
+Suggests:	gstreamer-musepack
+Suggests:	gstreamer-vorbis
+Suggests:	libgpod
 Suggests:	libmodplug
 Suggests:	python-feedparser
-Suggests:	python-gnome
-Suggests:	python-gnome-ui
-Suggests:	python-gpod
-Suggests:	python-gtksourceview2
 Suggests:	python-keybinder
 Suggests:	udev-libs
+Conflicts:	quodlibet-plugins < 2.9.82
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,10 +68,10 @@ python-pyao, python-mad, python-pyid3lib.
 
 %prep
 %setup -q
-%{?with_home_etc:%patch0 -p1}
+%patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 %{__rm} po/gl_ES.po
+mv po/cs{_CZ,}.po
 
 %build
 CFLAGS="%{rpmcflags}"; export CFLAGS
@@ -107,8 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/%{name}
 %{py_sitedir}/%{name}/*.py[co]
 %{py_sitedir}/%{name}/browsers
-%dir %{py_sitedir}/%{name}/debug
-%{py_sitedir}/%{name}/debug/*.py[co]
+#%dir %{py_sitedir}/%{name}/debug
+#%{py_sitedir}/%{name}/debug/*.py[co]
 %{py_sitedir}/%{name}/devices
 %dir %{py_sitedir}/%{name}/formats
 %{py_sitedir}/%{name}/formats/*.py[co]
diff --git a/quodlibet-desktop.patch b/quodlibet-desktop.patch
index 8f8b62e..0a8e669 100644
--- a/quodlibet-desktop.patch
+++ b/quodlibet-desktop.patch
@@ -1,8 +1,8 @@
---- quodlibet-2.2.1/exfalso.desktop.in~	2010-03-27 09:26:22.000000000 +0100
-+++ quodlibet-2.2.1/exfalso.desktop.in	2010-05-12 14:37:14.295569634 +0200
-@@ -6,4 +6,4 @@
- Terminal=false
+--- quodlibet-2.9.82/exfalso.desktop.in.wiget	2013-05-04 10:57:42.889632334 +0200
++++ quodlibet-2.9.82/exfalso.desktop.in	2013-05-04 10:58:06.125596848 +0200
+@@ -8,4 +8,4 @@ StartupNotify=true
  Type=Application
  Icon=exfalso
+ MimeType=inode/directory;
 -Categories=AudioVideo;Audio;GTK;
-+Categories=AudioVideo;Audio;AudioVideoEditing;GTK
++Categories=AudioVideo;Audio;AudioVideoEditing;GTK;
diff --git a/quodlibet-home_etc.patch b/quodlibet-home_etc.patch
deleted file mode 100644
index cae861d..0000000
--- a/quodlibet-home_etc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- quodlibet-2.3/quodlibet/const.py.old	2011-04-01 00:44:00.000000000 +0200
-+++ quodlibet-2.3/quodlibet/const.py	2011-04-03 18:38:47.397249347 +0200
-@@ -24,7 +24,10 @@
-         USERDIR = shell.SHGetFolderPath(0, shellcon.CSIDL_APPDATA, 0, 0)
-         USERDIR = os.path.join(USERDIR, "Quod Libet")
-     else:
--        USERDIR = os.path.join(HOME, ".quodlibet")
-+        if 'HOME_ETC' in os.environ:
-+            USERDIR = os.path.join(os.environ['HOME_ETC'], ".quodlibet")
-+        else:
-+            USERDIR = os.path.join(HOME, ".quodlibet")
- 
- CONTROL = os.path.join(USERDIR, "control")
- CONFIG  = os.path.join(USERDIR, "config")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/quodlibet.git/commitdiff/2f97c9b907e254d6e5c003e5e4f7bbeebeb0c144