Compare commits

..

No commits in common. "rawhide" and "f17" have entirely different histories.

5 changed files with 159 additions and 1 deletions

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
whaawmp-0.2.12.1.tar.bz2
/whaawmp-0.2.14.tar.bz2

View file

@ -1 +0,0 @@
upstream gone, python2 only

View file

@ -0,0 +1,25 @@
diff -up whaawmp-0.2.12.1/src/gui/__init__.py.fix-py27-CObject-capsule-crash whaawmp-0.2.12.1/src/gui/__init__.py
--- whaawmp-0.2.12.1/src/gui/__init__.py.fix-py27-CObject-capsule-crash 2010-12-30 13:18:14.816646617 -0500
+++ whaawmp-0.2.12.1/src/gui/__init__.py 2010-12-30 13:18:31.559647012 -0500
@@ -27,6 +27,21 @@
import sys, warnings
warnings.filterwarnings('error', module='gtk')
+
+# The above line requests that warnings from GTK should be turned into
+# exceptions.
+# Python 2.7 deprecated the PyCObject API, but GTK uses it, leading to a
+# PendingDeprecationWarning. With the above line, this is raised as an
+# exception.
+# Unfortunately, GTK's C code assume that an exception can't be the result of
+# the PyCObject call, and uses the NULL pointer it gets back in various invalid
+# ways, leading to a hard failure of the python process:
+# See https://bugzilla.redhat.com/show_bug.cgi?id=652368 (whaawmp)
+# and https://bugzilla.redhat.com/show_bug.cgi?id=621887 (pygtk)
+# The following line says that that warning can be ignored, rather than
+# triggering the exception:
+warnings.simplefilter('ignore', PendingDeprecationWarning)
+
try:
import gtk
except ImportError:

1
sources Normal file
View file

@ -0,0 +1 @@
1a864cb4ff82798931c23737298db1b7 whaawmp-0.2.14.tar.bz2

131
whaawmp.spec Normal file
View file

@ -0,0 +1,131 @@
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=513420
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: whaawmp
Version: 0.2.14
Release: 3%{?dist}
Summary: Lightweight Media Player
Group: Applications/Multimedia
License: GPLv3+
URL: http://home.gna.org/whaawmp/
Source0: http://download.gna.org/whaawmp/%{version}/whaawmp-%{version}.tar.bz2
# Fix for fedora bug #652368
# Not yet sent upstream:
Patch1: fix-py27-CObject-capsule-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: python-setuptools
BuildRequires: desktop-file-utils
BuildRequires: gettext intltool
Requires: python >= 2.5, pygtk2-libglade >= 2.10, pyxdg
Requires: dbus-python
Requires: gstreamer-python >= 0.10, gstreamer-plugins-good >= 0.10
Requires: xdg-utils
%description
Whaaw! Media Player is a lightweight media player that supports fullscreen
mode, seeking, changing video colour settings and more. It will play any audio
or video files that GStreamer can play. It is intended to be a basic media
player without any GNOME dependencies.
%prep
%setup -q
%patch1 -p1
# remove shebangs
for Files in src/thumbnailer.py src/whaawmp.py; do
%{__sed} -i.orig -e 1d ${Files}
touch -r ${Files}.orig ${Files}
%{__rm} ${Files}.orig
done
# fix desktop file
sed -i 's!audio/x-wav;audio/x-wav;!audio/x-wav;!' whaaw-thumbnailer.desktop
sed -i 's!False!false!' %{name}.desktop
%build
%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
desktop-file-install \
--delete-original \
--remove-key=Encoding \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
%post
update-desktop-database &> /dev/null || :
%postun
update-desktop-database &> /dev/null || :
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_bindir}/%{name}
%{_bindir}/whaaw-thumbnailer
%{python_sitelib}/%{name}*.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
# We need to own this dir although it's already owned by Thunar
%dir %{_datadir}/thumbnailers/
%{_datadir}/thumbnailers/whaaw-thumbnailer.desktop
%changelog
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Oct 26 2011 Kevin Fenzi <kevin@scrye.com> - 0.2.14-2
- Drop upstreamed patch.
* Sun Feb 27 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.2.14-1
- Update to 0.2.14
- Require xdg-utils for xdg-screensaver calls
- Run update-desktop-database in %%post and %%postun
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.12.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Dec 30 2010 David Malcolm <dmalcolm@redhat.com> - 0.2.12.1-5
- fix crash on startup with python 2.7 (rhbz#652368)
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.2.12.1-4
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Sat Nov 21 2009 Thomas Spura <tomspur@fedoraproject.org> - 0.2.12.1-3
- add playnext patch (fixes #539608)
* Sun Sep 06 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.2.12.1-2
- Rework summary and description
* Thu Jul 16 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.2.12.1-1
- Update to 0.2.12.1
* Sat Dec 20 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.2.10.1-1
- Update to 0.2.10.1
* Sun Jun 22 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.2.10-1
- Initial Fedora Package