rpms/gpodder/F-13 .cvsignore, 1.28, 1.29 gpodder.spec, 1.43, 1.44 sources, 1.28, 1.29

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/gpodder/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8751

Modified Files:
	.cvsignore gpodder.spec sources 
Log Message:
* Sun May 02 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.5-1
- Update to the latest upstream release
- Require pywebkitgtk instead of gnome-python2-gtkhtml2
- Remove both patches, they are upstreamed
- Remove desktop file categories News and FileTransfer,
  desktop-file-install would require the Network category to be used with
  them, but that would put gPodder into both the Network and the Audio menus



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-13/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	27 Feb 2010 18:26:38 -0000	1.28
+++ .cvsignore	2 May 2010 13:11:21 -0000	1.29
@@ -1 +1 @@
-gpodder-2.3.tar.gz
+gpodder-2.5.tar.gz


Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-13/gpodder.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gpodder.spec	14 Mar 2010 22:23:10 -0000	1.43
+++ gpodder.spec	2 May 2010 13:11:22 -0000	1.44
@@ -2,18 +2,14 @@
 
 
 Name:           gpodder
-Version:        2.3
-Release:        3%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://gpodder.berlios.de/
 Source0:        http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
-# Handle GError; unrecognized image file format (bug 911)
-Patch0:         gpodder.git-949f8383647a667709539a13a6cd38da536e5fb3.patch
-# Handle missing PyMTP library (bug 924)
-Patch1:         gpodder.git-67693b0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel, python-feedparser, python-mygpoclient
@@ -25,7 +21,7 @@ Requires:       pygtk2 pygtk2-libglade
 Requires:       python-gpod, python-eyed3, python-feedparser
 Requires:       python-imaging
 Requires:       python-mygpoclient, dbus-python
-Requires:       gnome-python2-gtkhtml2
+Requires:       pywebkitgtk
 %description
 gPodder is a Podcast receiver/catcher written in Python, using GTK. 
 It manages podcast feeds for you and automatically downloads all 
@@ -34,8 +30,6 @@ It also optionally supports syncing with
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 make messages
@@ -45,9 +39,10 @@ make messages
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora --delete-original           \
+desktop-file-install --vendor fedora --delete-original          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                 \
-  --remove-key Miniicon --add-category Application \
+  --remove-key Miniicon --add-category Application              \
+  --remove-category FileTransfer --remove-category News         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
@@ -83,6 +78,14 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Sun May 02 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.5-1
+- Update to the latest upstream release
+- Require pywebkitgtk instead of gnome-python2-gtkhtml2
+- Remove both patches, they are upstreamed
+- Remove desktop file categories News and FileTransfer,
+  desktop-file-install would require the Network category to be used with
+  them, but that would put gPodder into both the Network and the Audio menus
+
 * Mon Mar 15 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.3-3
 - Add a patch from upstream git to not raise an exception if PyMTP is
   missing, helps avoid ABRT reports which are not bugs, such as


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-13/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	27 Feb 2010 18:26:38 -0000	1.28
+++ sources	2 May 2010 13:11:22 -0000	1.29
@@ -1 +1 @@
-aeb89aef83323a4b896ace289466bea0  gpodder-2.3.tar.gz
+b7454045bd5917e4b9d16dd45d14ece7  gpodder-2.5.tar.gz