+++ /dev/null
---- quodlibet-1.0/Makefile.wiget 2007-04-16 04:45:47.000000000 +0200
-+++ quodlibet-1.0/Makefile 2007-05-07 18:32:26.000000000 +0200
-@@ -10,15 +10,15 @@
- all:
- @/bin/echo -n "Checking for Python... "
- @which python || ( echo "Not found." && /bin/false )
-- @./check.py $(DESTDIR)$(PREFIX)/$(TO)
-+ @./check.py $(DESTDIR)$(LIBDIR}/quodlibet
-
- make-install-dirs:
- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
- mkdir -p $(DESTDIR)$(PREFIX)/bin
-- mkdir -p $(DESTDIR)$(PREFIX)/$(TO)
-+ mkdir -p $(DESTDIR)$(LIBDIR)/quodlibet
-
- install: make-install-dirs install-dirs install-programs
-- install -m 644 $(MODULES) missing-cover.svg audio-*.png media-*.png device-*.png $(DESTDIR)$(PREFIX)/$(TO)
-+ install -m 644 $(MODULES) missing-cover.svg audio-*.png media-*.png device-*.png $(DESTDIR)$(LIBDIR)/quodlibet
- cd po && make install-po DESTDIR=$(DESTDIR)
-
- for E in $(EXTENSIONS); do \
-@@ -32,16 +32,16 @@
- install-programs: $(addprefix app-install-, $(PROGRAMS))
-
- dir-install-%: make-install-dirs
-- mkdir -p $(DESTDIR)$(PREFIX)/$(TO)/$*
-- install -m 644 $*/*.py $(DESTDIR)$(PREFIX)/$(TO)/$*
-+ mkdir -p $(DESTDIR)$(LIBDIR)/quodlibet/$*
-+ install -m 644 $*/*.py $(DESTDIR)$(LIBDIR)/quodlibet/$*
-
- app-install-%: make-install-dirs %.desktop
-- install -m 755 $*.py $(DESTDIR)$(PREFIX)/$(TO)
-+ install -m 755 $*.py $(DESTDIR)$(LIBDIR)/quodlibet
- install -m 644 $*.1 $(DESTDIR)$(PREFIX)/share/man/man1/$*.1
- install -D -m 644 $*.png $(DESTDIR)$(PREFIX)/share/pixmaps/$*.png
-- install -m 644 $*.svg $*.png $(DESTDIR)$(PREFIX)/$(TO)
-+ install -m 644 $*.svg $*.png $(DESTDIR)$(LIBDIR)/quodlibet
- -install -D -m 644 $*.desktop $(DESTDIR)$(PREFIX)/share/applications/$*.desktop
-- ln -sf ../$(TO)/$*.py $(DESTDIR)$(PREFIX)/bin/$*
-+ ln -sf $(LIBDIR)/quodlibet/$*.py $(DESTDIR)$(PREFIX)/bin/$*
-
- clean:
- rm -f *.py[co] */*.py[co] $(EXTENSIONS) messages.mo
-diff -urN quodlibet-0.19.1.orig/const.py quodlibet-0.19.1/const.py
---- quodlibet-0.19.1.orig/const.py 2006-04-19 12:52:37.000000000 +0200
-+++ quodlibet-0.19.1/const.py 2006-04-19 12:54:01.000000000 +0200
-@@ -6,7 +6,7 @@
- VERSION = "0.19.1"
+--- quodlibet-2.1/quodlibet/const.py.wiget 2009-09-27 14:03:28.000000000 +0200
++++ quodlibet-2.1/quodlibet/const.py 2009-09-27 14:08:22.000000000 +0200
+@@ -8,7 +8,11 @@ VERSION_TUPLE = (2, 1)
+ VERSION = ".".join(map(str, VERSION_TUPLE))
HOME = os.path.expanduser("~")
-USERDIR = os.path.join(HOME, ".quodlibet")
-+USERDIR = os.path.join(os.getenv("HOME_ETC",HOME),".quodlibet")
++HOME_ETC = os.getenv("HOME_ETC")
++if HOME_ETC:
++ USERDIR = os.path.join(HOME_ETC, ".quodlibet")
++else:
++ USERDIR = os.path.join(HOME, ".quodlibet")
CONTROL = os.path.join(USERDIR, "control")
CONFIG = os.path.join(USERDIR, "config")
CURRENT = os.path.join(USERDIR, "current")
--- /dev/null
+--- quodlibet-2.1/quodlibet/browsers/__init__.py.wiget 2009-07-04 06:40:37.000000000 +0200
++++ quodlibet-2.1/quodlibet/browsers/__init__.py 2009-09-27 16:34:01.000000000 +0200
+@@ -23,13 +23,17 @@ BROWSERS = os.path.join(const.USERDIR, "
+ 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', '.pyc', '.pyo')
++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])
+
+ if isdir(BROWSERS):
+ sys.path.insert(0, BROWSERS)
+- modules.extend([basename(f)[:-3] for f in
+- glob(join(BROWSERS, "[!_]*.py"))])
++ for ext in exts:
++ modules = modules | set([basename(f)[:-len(ext)] 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
+--- quodlibet-2.1/quodlibet/devices/__init__.py.wiget 2009-07-04 06:40:37.000000000 +0200
++++ quodlibet-2.1/quodlibet/devices/__init__.py 2009-09-27 16:34:01.000000000 +0200
+@@ -24,8 +24,11 @@ from quodlibet import const
+ 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:
+--- quodlibet-2.1/quodlibet/formats/__init__.py.wiget 2009-07-04 06:40:37.000000000 +0200
++++ quodlibet-2.1/quodlibet/formats/__init__.py 2009-09-27 16:39:12.000000000 +0200
+@@ -15,7 +15,10 @@ from os.path import dirname, basename, j
+ base = dirname(__file__)
+ self = basename(base)
+ parent = basename(dirname(base))
+-modules = [f[:-3] for f in glob(join(base, "[!_]*.py"))]
++modules = set()
++exts = ('.py', '.pyo', '.pyc')
++for ext in exts:
++ modules = modules | set([f[:-len(ext)] for f in glob(join(base, "[!_]*" + ext))])
+ modules = ["%s.%s.%s" % (parent, self, basename(m)) for m in modules]
+
+ _infos = {}
+--- quodlibet-2.1/quodlibet/plugins/__init__.py.wiget 2009-07-04 06:40:37.000000000 +0200
++++ quodlibet-2.1/quodlibet/plugins/__init__.py 2009-09-27 16:34:01.000000000 +0200
+@@ -130,7 +130,11 @@ class Manager(object):
+ """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)
Summary(pl.UTF-8): Quod Libet - odtwarzacz dźwięku oparty na GTK+
Name: quodlibet
# 2.0 on DEVEL, finish it there first
-Version: 1.0
-Release: 2
+Version: 2.1
+Release: 0.1
License: GPL v2
Group: X11/Applications/Multimedia
-Source0: http://www.sacredchao.net/~piman/software/%{name}-%{version}.tar.gz
-# Source0-md5: 5c925b754bd8505a7a66f2ffcc5b5fe4
+Source0: http://quodlibet.googlecode.com/files/%{name}-%{version}.tar.gz
+# Source0-md5: abd362699a7118c7720c13fbda0c8c9e
Patch0: %{name}-home_etc.patch
-Patch1: %{name}-Makefile.patch
-Patch2: %{name}-paned.patch
+Patch1: %{name}-nopy.patch
URL: http://www.sacredchao.net/quodlibet/wiki
BuildRequires: gtk+2-devel >= 2:2.6.0
BuildRequires: intltool
Requires: python-mutagen >= 1.11
Requires: python-pycairo
Requires: python-pygtk-gtk >= 2:2.6.0
+Suggests: gstreamer-audiosink
+Suggests: gstreamer-mad
+Suggests: gstreamer-vorbis
+Suggests: gstreamer-musepack
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%setup -q
%{?with_home_etc:%patch0 -p1}
%patch1 -p1
-%patch2 -p0
-sed -i -e 's#lib/quodlibet#%{_lib}/%{name}#g' quodlibet.py
%build
-%{__make} extensions
-%{__make} po-data
+CFLAGS="%{rpmcflags}"; export CFLAGS
+%{__python} ./setup.py build
%install
rm -rf $RPM_BUILD_ROOT
+%{__python} -- setup.py install \
+ --root=$RPM_BUILD_ROOT \
+ --install-lib=%{py_sitedir} \
+ --optimize=2
-%{__make} install \
- TODEP="%{_lib}/%{name}" \
- LIBDIR=%{_libdir} \
- PREFIX=%{_prefix} \
- DESTDIR=$RPM_BUILD_ROOT
+%py_postclean
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-%banner %{name} -e << EOF
-Remember to install appropriate python modules for files
-you want to play:
-- gstreamer-mad (for MP3s)
-- gstreamer-vorbis (for Ogg Vorbis)
-- gstreamer-musepack (for MPCs)
-and audio output:
-- gstreamer-audiosink-(alsa|oss|esd) (for ALSA, OSS or ESD output)
-EOF
-
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc NEWS README
%attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.py
-%dir %attr(755,root,root) %{_libdir}/%{name}/library
-%attr(755,root,root) %{_libdir}/%{name}/library/*.py
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/browsers
-%{_libdir}/%{name}/devices
-%{_libdir}/%{name}/formats
-%{_libdir}/%{name}/parse
-%{_libdir}/%{name}/plugins
-%{_libdir}/%{name}/qltk
-%{_libdir}/%{name}/util
-%{_libdir}/%{name}/*.png
-%{_libdir}/%{name}/*.svg
+%{py_sitedir}/*.egg-info
+%dir %{py_sitedir}/%{name}
+%{py_sitedir}/%{name}/*.py[co]
+%{py_sitedir}/%{name}/browsers
+%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]
+%dir %{py_sitedir}/%{name}/images
+%{py_sitedir}/%{name}/images/*.png
+%{py_sitedir}/%{name}/images/*.svg
+%dir %{py_sitedir}/%{name}/library
+%{py_sitedir}/%{name}/library/*.py[co]
+%attr(755,root,root) %{py_sitedir}/%{name}/*.so
+%dir %{py_sitedir}/%{name}/parse
+%{py_sitedir}/%{name}/parse/*.py[co]
+%dir %{py_sitedir}/%{name}/player
+%{py_sitedir}/%{name}/player/*.py[co]
+%dir %{py_sitedir}/%{name}/plugins
+%{py_sitedir}/%{name}/plugins/*.py[co]
+%dir %{py_sitedir}/%{name}/qltk
+%{py_sitedir}/%{name}/qltk/*.py[co]
+%dir %{py_sitedir}/%{name}/util
+%{py_sitedir}/%{name}/util/*.py[co]
%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+#%{_pixmapsdir}/*
%{_mandir}/man1/*
projects / packages / quodlibet.git / commitdiff