From 143c06f1b1dad68e4c5797f7b3c01a8bd5964fd1 Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Sep 16 2008 16:24:07 +0000 Subject: upgrade to 0.3.2, fix FTBFS BZ#440943 --- diff --git a/.cvsignore b/.cvsignore index 04aebb7..54e50ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -oggconvert-0.3.0.tar.gz +oggconvert-0.3.2.tar.gz diff --git a/oggconvert-0.3.2-desktop.patch b/oggconvert-0.3.2-desktop.patch new file mode 100644 index 0000000..017a13d --- /dev/null +++ b/oggconvert-0.3.2-desktop.patch @@ -0,0 +1,8 @@ +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggconvert-0.3.2.orig/data/oggconvert.desktop oggconvert-0.3.2/data/oggconvert.desktop +--- oggconvert-0.3.2.orig/data/oggconvert.desktop 2008-09-12 17:40:56.000000000 -0500 ++++ oggconvert-0.3.2/data/oggconvert.desktop 2008-09-16 11:11:30.000000000 -0500 +@@ -9,4 +9,3 @@ Icon=oggconvert + Categories=AudioVideo; + Terminal=false + StartupNotify=false +-GenericName[en_GB]= diff --git a/oggconvert.spec b/oggconvert.spec index 9bd1d6c..e48c5c6 100644 --- a/oggconvert.spec +++ b/oggconvert.spec @@ -2,14 +2,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: oggconvert -Version: 0.3.0 -Release: 14%{?dist} +Version: 0.3.2 +Release: 1%{?dist} Summary: A simple GNOME application that converts media to Free formats Group: Applications/Multimedia License: LGPLv2+ URL: http://launchpad.net/oggconvert -Source0: http://oggconvert.tristanb.net/releases/oggconvert-%{version}.tar.gz +Source0: http://oggconvert.tristanb.net/releases/%{version}/oggconvert-%{version}.tar.gz +Patch0: oggconvert-0.3.2-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pygtk2 >= 2.10, pygtk2-libglade >= 2.10 Requires: gstreamer >= 0.10.12, gstreamer-python, gstreamer-plugins-base @@ -37,7 +38,7 @@ Finally, it adheres to the GNOME HIG as much as possible. %prep %setup -q - +%patch0 -p1 %build # Remove CFLAGS=... for noarch packages (unneeded) @@ -66,9 +67,14 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/oggconvert %{_datadir}/applications/fedora-oggconvert.desktop %{_datadir}/pixmaps/oggconvert.svg - +%{python_sitelib}/oggconvert-%{version}-py2.5.egg-info %changelog +* Tue Sep 16 2008 Matt Domsch - 0.3.2-1 +- upgrade to 0.3.2, fix FTBFS BZ#440943 +* Sat Dec 1 2007 Neal Gompa - 0.3.0-14 +- Oops, apparently files removal was intentional, reinstated +- removed dependency on gettext, probably not necessary * Sat Dec 1 2007 Neal Gompa - 0.3.0-14 - Oops, apparently files removal was intentional, reinstated - removed dependency on gettext, probably not necessary diff --git a/sources b/sources index a751b4c..c9e7bba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a197d51b3767447c48c8229500d5492 oggconvert-0.3.0.tar.gz +1df4ab0141cd2755ace57837d588747e oggconvert-0.3.2.tar.gz