[pitivi/f16] Update to 0.15.0

Sat Oct 8 14:58:14 UTC 2011

commit f957c91d6c5fa19314632fb3d0dcc4ccc94d05c7
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Sat Oct 8 14:57:49 2011 +0000

    Update to 0.15.0

 .gitignore                                         |    1 +
 0001-Fix-typo-in-license.patch                     |   44 -
 0002-Update-fsf-address.patch                      | 1542 --------------------
 0003-Remove-unneeded-shebang.patch                 |  161 --
 ....0-Lower-pygtk2-minimum-version-to-2.17.0.patch |   25 -
 ...0.14.0-allow-using-default-as-preset-name.patch |  205 ---
 ...vi-0.14.0-welcome-dialog-after-mainwindow.patch |   34 -
 pitivi.spec                                        |   86 +-
 sources                                            |    2 +-
 9 files changed, 29 insertions(+), 2071 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1b46b0b..be209f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pitivi-0.13.5.tar.bz2
 /pitivi-0.14.0.tar.bz2
+/pitivi-0.15.0.tar.bz2
diff --git a/pitivi.spec b/pitivi.spec
index 7abbf36..aac4320 100644
--- a/pitivi.spec
+++ b/pitivi.spec
@@ -1,62 +1,35 @@
-%global major 0.14
+%global major 0.15
 %global minor 0
-# The minimum required versions can be found in configure.ac
-%define gnonlin_req 0.10.16
-%define gst_req 0.10.28
-%define pygst_req 0.10.19
-%define pygtk_req 2.17.0
+
 Name:		pitivi
 Version:	%{major}.%{minor}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Non-linear video editor
 Group:		Applications/Multimedia
 License:	LGPLv2+
 URL:		http://www.pitivi.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
-BuildRequires:	intltool
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	python
 BuildRequires:	desktop-file-utils
-BuildRequires:	pygobject2
-BuildRequires:	gstreamer-python >= %{pygst_req}
-BuildRequires:	gnonlin >= %{gnonlin_req}
-BuildRequires:	gstreamer-plugins-good
-BuildRequires:	gstreamer >= %{gst_req}
-BuildRequires:	pyxdg
-BuildRequires:  glib2-devel
-BuildRequires:  autoconf >= 2.52
-BuildRequires:  automake
-
-Requires:	gstreamer >= %{gst_req}
-Requires:	gnonlin >= %{gnonlin_req}
+BuildRequires:	gnome-doc-utils >= 0.18.0
+
+Requires:	gstreamer >= 0.10.28
+Requires:	gnonlin >= 0.10.16
 Requires:	gstreamer-plugins-good
-Requires:	gstreamer-python >= %{pygst_req}
-Requires:	pygtk2 >= %{pygtk_req}
+Requires:	gstreamer-python >= 0.10.19
+Requires:	pygtk2 >= 2.17.0
 Requires:	pygoocanvas
 Requires:	python-zope-interface
 Requires:	python-setuptools
 Requires:	hicolor-icon-theme
 Requires:	pyxdg
-BuildArch:	noarch
-
-# http://git.gnome.org/browse/pitivi/commit/?id=7b0cea9a9a51163c8e849e4cea0d485e00971f2c
-Patch0:		%{name}-%{version}-welcome-dialog-after-mainwindow.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=651895
-Patch1:		0001-Fix-typo-in-license.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=651897
-Patch2:		0002-Update-fsf-address.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=651898
-Patch3:		0003-Remove-unneeded-shebang.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=712700
-# https://bugzilla.gnome.org/show_bug.cgi?id=652397
-# https://github.com/aleb/pitivi/commit/cd27e9a0d9e3e09e268c951af1da893df7a12cc4
-Patch4:		pitivi-0.14.0-allow-using-default-as-preset-name.patch
+Requires:	frei0r-plugins
+Requires:	numpy
+Requires:	yelp
+Requires:	pycairo >= 1.0.0
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=652567
-Patch5:         pitivi-0.14.0-Lower-pygtk2-minimum-version-to-2.17.0.patch
+BuildArch:	noarch
 
 %description
 Pitivi is an application using the GStreamer multimedia framework to
@@ -68,20 +41,6 @@ program.
 %prep
 %setup -q
 
-%patch0 -p1 -b .welcome-dialog-after-mainwindow
-%patch1 -p1 -b .fix-typo-in-license
-%patch2 -p1 -b .update-fsf-address
-%patch3 -p1 -b .remove-unneeded-shebang
-%patch4 -p1 -b .allow-using-default-as-preset-name
-%patch5 -p1 -b .lower-pygtk-min-version
-
-# Since DISPLAY is unset, don't import Pitivi in tests/test_binary_search.py 
-# and don't run tests/test_basic.py and tests/test_timeline_undo.py
-sed -i '/from pitivi.application import Pitivi/d' tests/test_binary_search.py
-rm -f tests/test_{basic,timeline_undo}.py
-
-autoreconf -if -I common/m4
-
 %build
 %configure --libdir=%{_datadir}
 
@@ -94,9 +53,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
-%check
-make check
-
 %post
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -122,8 +78,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/%{name}.1.gz
+%{_datadir}/gnome/help/%{name}
 
 %changelog
+* Tue Sep 27 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.15.0-1
+- Update to 0.15.0
+- Drop previously backported patches
+- Disable tests since most of them require gtk
+
+* Sun Sep 11 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.14.2-1
+- Update to 0.14.2
+
+* Thu Jun 30 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.14.0-3
+- Do not allow presets to have the same name, fixes rhbz #717328
+
 * Sun Jun 12 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.14.0-2
 - Allow using "Default" as preset name, fixes rhbz #712700
 - Lower pygtk2 min version to 2.17.0 so that we can push 0.14.0 to f14
diff --git a/sources b/sources
index 299f7b8..137fff7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6eb98be52c4aad0c1c7e23cfb35f496a  pitivi-0.14.0.tar.bz2
+c0b9d88ee4c2fd17c62b8dc9f4aeaf52  pitivi-0.15.0.tar.bz2
