2:54 a.m.
Author: tingping
Update of /cvs/free/rpms/pithos/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3932
Modified Files:
.cvsignore pithos.spec sources
Added Files:
pithos-pylast.patch
Removed Files:
pithos-buffer.patch
Log Message:
* Sat Jun 7 2014 TingPing <tingping(a)tingping.se> - 1.0.0-1
- Bump version to 1.0.0
pithos-pylast.patch:
pithos/plugins/scrobble.py | 2 +-
pithos/plugins/scrobble.py~ |only
setup.py | 1 -
setup.py~ |only
4 files changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE pithos-pylast.patch ---
diff -ur pithos-1.0.0.orig/pithos/plugins/scrobble.py
pithos-1.0.0/pithos/plugins/scrobble.py
--- pithos-1.0.0.orig/pithos/plugins/scrobble.py 2014-05-01 18:33:16.000000000 -0400
+++ pithos-1.0.0/pithos/plugins/scrobble.py 2014-06-07 22:42:25.380387459 -0400
@@ -14,7 +14,7 @@
#with this program. If not, see <http://www.gnu.org/licenses/>;.
### END LICENSE
-import pylast
+import pithos.pylast
import logging
from pithos.gobject_worker import GObjectWorker
from pithos.plugin import PithosPlugin
Only in pithos-1.0.0/pithos/plugins: scrobble.py~
diff -ur pithos-1.0.0.orig/setup.py pithos-1.0.0/setup.py
--- pithos-1.0.0.orig/setup.py 2014-05-01 18:33:16.000000000 -0400
+++ pithos-1.0.0/setup.py 2014-06-07 22:40:15.051748082 -0400
@@ -74,7 +74,6 @@
]
},
install_requires=[
- 'pylast'
],
packages=find_packages(),
include_package_data=True,
Only in pithos-1.0.0: setup.py~
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pithos/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 Mar 2014 11:18:03 -0000 1.2
+++ .cvsignore 8 Jun 2014 02:54:12 -0000 1.3
@@ -1 +1 @@
-pithos-0.3.18.tar.gz
+pithos-1.0.0.tar.gz
Index: pithos.spec
===================================================================
RCS file: /cvs/free/rpms/pithos/devel/pithos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pithos.spec 18 Apr 2014 23:12:55 -0000 1.3
+++ pithos.spec 8 Jun 2014 02:54:12 -0000 1.4
@@ -1,28 +1,26 @@
Name: pithos
-Version: 0.3.18
-Release: 2%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
Summary: A Pandora client for the GNOME Desktop
Group: Applications/File
License: GPLv3
URL: http://pithos.github.io/
Source0:
https://github.com/pithos/pithos/archive/%{version}.tar.gz#/%{name}-%{ver...
-Patch0:
https://github.com/pithos/pithos/commit/df24f173c7dde3a1b3631b50366757ba5...
+Patch0: pithos-pylast.patch
BuildArch: noarch
-BuildRequires: python2-devel python-setuptools desktop-file-utils
+BuildRequires: python3-devel python3-setuptools desktop-file-utils
-Requires: python-setuptools
-Requires: dbus-python
-Requires: gstreamer-plugins-bad
-Requires: gstreamer-plugins-good
-Requires: gstreamer-python
-Requires: notify-python
-Requires: python-keybinder
-Requires: pygobject2
-Requires: pygtk2
+Requires: python3-setuptools
+Requires: gstreamer1-plugins-good
+Requires: gstreamer1-plugins-ugly
+Requires: gstreamer1-plugins-bad-freeworld
+Requires: libnotify keybinder3 gtk3
+Requires: python3-dbus
+Requires: python3-gobject
Requires: pylast
-Requires: pyxdg
+Requires: python3-pyxdg
Requires: hicolor-icon-theme
%description
@@ -36,7 +34,14 @@
%patch0 -p1
%install
-%{__python2} setup.py install --root=%{buildroot}
+%{__python3} setup.py install --root=%{buildroot}
+
+# Remove Unity specific icons
+rm -rf %{buildroot}%{_datadir}/icons/ubuntu*
+
+# Terrible workaround for no python3 pylast package
+# (it is the same file for py2 and py3 upstream)
+ln -s %{python2_sitelib}/pylast.py %{buildroot}%{python3_sitelib}/%{name}/pylast.py
%post
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -49,12 +54,15 @@
%files
%doc README.md
%{_bindir}/%{name}
-%{python_sitelib}/%{name}/
-%{python_sitelib}/%{name}-*.egg-info/
+%{python3_sitelib}/%{name}/
+%{python3_sitelib}/%{name}-*.egg-info/
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/apps/
+%{_datadir}/icons/hicolor/
%changelog
+* Sat Jun 7 2014 TingPing <tingping(a)tingping.se> - 1.0.0-1
+- Bump version to 1.0.0
+
* Fri Apr 18 2014 TingPing <tingping(a)tingping.se> - 0.3.18-2
- Fix dependency issue
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pithos/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Mar 2014 11:18:03 -0000 1.2
+++ sources 8 Jun 2014 02:54:12 -0000 1.3
@@ -1 +1 @@
-44d0d81a1318a8bd5754c39b1f765e8b pithos-0.3.18.tar.gz
+d20901f4e6d06aa729b5dfb6436b230d pithos-1.0.0.tar.gz
--- pithos-buffer.patch DELETED ---