[packages/quodlibet] - ver. 2.5
wrobell
wrobell at pld-linux.org
Sat Jan 12 16:24:36 CET 2013
commit e0d46919e08118a5cb9f3c0bc5d901fadecceba5
Author: wrobell <wrobell at pld-linux.org>
Date: Sat Jan 12 15:24:10 2013 +0000
- ver. 2.5
quodlibet-nopy.patch | 94 +++++++---------------------------------------------
quodlibet.spec | 25 +++++---------
2 files changed, 20 insertions(+), 99 deletions(-)
---
diff --git a/quodlibet.spec b/quodlibet.spec
index f673603..2c3451b 100644
--- a/quodlibet.spec
+++ b/quodlibet.spec
@@ -5,12 +5,12 @@
Summary: Quod Libet - GTK+-based audio player
Summary(pl.UTF-8): Quod Libet - odtwarzacz dźwięku oparty na GTK+
Name: quodlibet
-Version: 2.4.1
-Release: 3
+Version: 2.5
+Release: 0.2
License: GPL v2
Group: X11/Applications/Multimedia
Source0: http://quodlibet.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 00cf65f0deb7c50540225f06a57be7e9
+# Source0-md5: e014937b2c7623b98e1b31d59fca4a01
Patch0: %{name}-home_etc.patch
Patch1: %{name}-nopy.patch
Patch2: %{name}-desktop.patch
@@ -69,7 +69,7 @@ python-pyao, python-mad, python-pyid3lib.
%setup -q
%{?with_home_etc:%patch0 -p1}
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
%{__rm} po/gl_ES.po
%build
@@ -108,21 +108,10 @@ rm -rf $RPM_BUILD_ROOT
%{py_sitedir}/%{name}/devices
%dir %{py_sitedir}/%{name}/formats
%{py_sitedir}/%{name}/formats/*.py[co]
-%dir %{py_sitedir}/%{name}/images
-%{py_sitedir}/%{name}/images/*.png
-%{py_sitedir}/%{name}/images/*.svg
-%dir %{py_sitedir}/%{name}/images/hicolor
-%dir %{py_sitedir}/%{name}/images/hicolor/[0-9]*x*
-%dir %{py_sitedir}/%{name}/images/hicolor/*x*/*
-%dir %{py_sitedir}/%{name}/images/hicolor/scalable
-%dir %{py_sitedir}/%{name}/images/hicolor/scalable/*
-%{py_sitedir}/%{name}/images/hicolor/icon-theme.cache
-%{py_sitedir}/%{name}/images/hicolor/index.theme
-%{py_sitedir}/%{name}/images/hicolor/*x*/*/*.png
-%{py_sitedir}/%{name}/images/hicolor/scalable/*/*.svg
+%{py_sitedir}/%{name}/images
%dir %{py_sitedir}/%{name}/library
%{py_sitedir}/%{name}/library/*.py[co]
-%attr(755,root,root) %{py_sitedir}/%{name}/*.so
+#%attr(755,root,root) %{py_sitedir}/%{name}/*.so
%dir %{py_sitedir}/%{name}/parse
%{py_sitedir}/%{name}/parse/*.py[co]
%dir %{py_sitedir}/%{name}/player
@@ -139,4 +128,6 @@ rm -rf $RPM_BUILD_ROOT
%{py_sitedir}/%{name}/util/*.py[co]
%{_desktopdir}/*.desktop
%{_pixmapsdir}/*
+%{_iconsdir}/hicolor/*/apps/*.png
+%{_iconsdir}/hicolor/*/apps/*.svg
%{_mandir}/man1/*
diff --git a/quodlibet-nopy.patch b/quodlibet-nopy.patch
index 9c57398..f60a02d 100644
--- a/quodlibet-nopy.patch
+++ b/quodlibet-nopy.patch
@@ -1,82 +1,12 @@
-diff -uNr quodlibet-2.4.orig/quodlibet/browsers/__init__.py quodlibet-2.4/quodlibet/browsers/__init__.py
---- quodlibet-2.4.orig/quodlibet/browsers/__init__.py 2012-03-18 16:19:05.000000000 +0100
-+++ quodlibet-2.4/quodlibet/browsers/__init__.py 2012-06-17 23:25:05.732553891 +0200
-@@ -21,17 +21,16 @@
- base = dirname(__file__)
- self = basename(base)
- parent = basename(dirname(base))
--if os.name == 'nt':
-- # Windows needs to load .pyc files
-- glob_pattern = "[!_]*.py*"
--else: glob_pattern = "[!_]*.py"
--modules = [splitext(f)[0] for f in glob(join(base, glob_pattern))]
--modules = ["%s.%s.%s" % (parent, self, basename(m)) for m in modules]
-+exts = (".py", ".pyo", ".pyc")
-+modules = set()
-+for ext in exts:
-+ modules = modules | set(splitext(f)[0] for f in glob(join(base, "[!_]*" + ext)))
-+modules = set("%s.%s.%s" % (parent, self, basename(m)) for m in modules)
-
- if isdir(BROWSERS):
- sys.path.insert(0, BROWSERS)
-- modules.extend([splitext(basename(f))[0] for f in
-- glob(join(BROWSERS, "[!_]*.py*"))])
-+ for ext in exts:
-+ modules = modules | set(splitext(basename(f))[0] for f in glob(join(BROWSERS, "[!_]*" + ext)))
-
- # Browsers are declared and stored as a magic 4-tuple. The first element is
- # the sort order (built-in browsers are numbered with integers). The second
-diff -uNr quodlibet-2.4.orig/quodlibet/devices/__init__.py quodlibet-2.4/quodlibet/devices/__init__.py
---- quodlibet-2.4.orig/quodlibet/devices/__init__.py 2012-03-18 16:19:05.000000000 +0100
-+++ quodlibet-2.4/quodlibet/devices/__init__.py 2012-06-17 23:46:48.608828937 +0200
-@@ -31,8 +31,11 @@
- base = dirname(__file__)
- self = basename(base)
- parent = basename(dirname(base))
--modules = [f[:-3] for f in glob(join(base, "[!_]*.py"))]
--modules = ["%s.%s.%s" % (parent, self, basename(m)) for m in modules]
-+exts = (".py", ".pyo", ".pyc")
-+modules = set()
-+for ext in exts:
-+ modules = modules | set(f[:-len(ext)] for f in glob(join(base, "[!_]*" + ext)))
-+modules = set("%s.%s.%s" % (parent, self, basename(m)) for m in modules)
-
- devices = []
- for _name in modules:
-diff -uNr quodlibet-2.4.orig/quodlibet/formats/__init__.py quodlibet-2.4/quodlibet/formats/__init__.py
---- quodlibet-2.4.orig/quodlibet/formats/__init__.py 2012-03-18 16:19:05.000000000 +0100
-+++ quodlibet-2.4/quodlibet/formats/__init__.py 2012-06-17 23:48:30.338277822 +0200
-@@ -14,12 +14,11 @@
- base = dirname(__file__)
- self = basename(base)
- parent = basename(dirname(base))
--if os.name == 'nt':
-- # Windows needs to load .pyc files
-- glob_pattern = "[!_]*.py*"
--else: glob_pattern = "[!_]*.py"
--modules = [splitext(f)[0] for f in glob(join(base, glob_pattern))]
--modules = ["%s.%s.%s" % (parent, self, basename(m)) for m in set(modules)]
-+exts = (".py", ".pyo", ".pyc")
-+modules = set()
-+for ext in exts:
-+ modules = modules | set(splitext(f)[0] for f in glob(join(base, "[!_]*" + ext)))
-+modules = ["%s.%s.%s" % (parent, self, basename(m)) for m in modules]
-
- _infos = {}
- for i, name in enumerate(modules):
-diff -uNr quodlibet-2.4.orig/quodlibet/plugins/__init__.py quodlibet-2.4/quodlibet/plugins/__init__.py
---- quodlibet-2.4.orig/quodlibet/plugins/__init__.py 2012-03-18 16:19:05.000000000 +0100
-+++ quodlibet-2.4/quodlibet/plugins/__init__.py 2012-06-17 23:50:34.274273069 +0200
-@@ -140,7 +140,11 @@
- """Check directories for new or changed plugins."""
-
- for scandir in self.scan:
-- try: names = glob.glob(os.path.join(scandir, "[!_]*.py"))
-+ try:
-+ exts = (".py", ".pyo", ".pyc")
-+ names = set()
-+ for ext in exts:
-+ names = names | set(glob.glob(os.path.join(scandir, "[!_]*" + ext)))
- except OSError: continue
- for pathname in names:
- name = os.path.basename(pathname)
+diff -Nur quodlibet-2.5.orig/quodlibet/util/modulescanner.py quodlibet-2.5/quodlibet/util/modulescanner.py
+--- quodlibet-2.5.orig/quodlibet/util/modulescanner.py 2012-12-18 14:06:30.000000000 +0000
++++ quodlibet-2.5/quodlibet/util/modulescanner.py 2013-01-12 15:16:54.784695709 +0000
+@@ -33,7 +33,7 @@
+ continue
+ if entry.endswith(".py"):
+ modules.add(entry[:-3])
+- elif load_compiled and entry.endswith(".pyc"):
++ elif entry.endswith(".pyc"):
+ modules.add(entry[:-4])
+
+ loaded = []
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/quodlibet.git/commitdiff/e0d46919e08118a5cb9f3c0bc5d901fadecceba5
More information about the pld-cvs-commit
mailing list