diff --git a/.gitignore b/.gitignore index 872d1e5..3226a22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.1.5.tar.gz +libquicktime-1.2.2.tar.gz diff --git a/libquicktime-1.1.5-gtk.patch b/libquicktime-1.1.5-gtk.patch deleted file mode 100644 index ae573af..0000000 --- a/libquicktime-1.1.5-gtk.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk libquicktime-1.1.5/utils/gtk/libquicktime_config.c ---- libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk 2010-07-08 12:21:24.000000000 +0200 -+++ libquicktime-1.1.5/utils/gtk/libquicktime_config.c 2010-07-08 12:22:45.000000000 +0200 -@@ -112,8 +112,8 @@ static MainWindow * create_main_window() - G_CALLBACK(main_window_button_callback), - (gpointer)ret); - -- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); -- GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->save_button), TRUE); - - gtk_widget_show(ret->close_button); - gtk_widget_show(ret->save_button); -diff -up libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk libquicktime-1.1.5/utils/gtk/lqt_gtk.c ---- libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk 2010-07-08 12:27:26.000000000 +0200 -+++ libquicktime-1.1.5/utils/gtk/lqt_gtk.c 2010-07-08 12:27:04.000000000 +0200 -@@ -941,9 +941,9 @@ lqtgtk_create_codec_config_window(lqt_co - G_CALLBACK(codec_config_window_button_callback), - (gpointer)ret); - -- GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT); -- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); -- GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->apply_button), TRUE); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->restore_button), TRUE); - - gtk_widget_show(ret->apply_button); - gtk_widget_show(ret->close_button); -@@ -1240,7 +1240,7 @@ lqtgtk_create_codec_info_window(const lq - ret->mainbox = gtk_vbox_new(0, 10); - - ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); -- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); - - g_signal_connect(G_OBJECT(ret->close_button), "clicked", - G_CALLBACK(codec_info_window_button_callback), diff --git a/libquicktime.spec b/libquicktime.spec index a3aa097..e15fc9f 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,12 +1,11 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.1.5 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz -Patch0: libquicktime-1.1.5-gtk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdv-devel @@ -57,7 +56,6 @@ enhancements. This package contains development files for %{name}. %prep %setup -q -%patch0 -p1 -b .gtk # -------------------------------------------------------------------- @@ -123,15 +121,16 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%exclude %{_bindir}/lqt-config %{_includedir}/lqt/ %{_libdir}/pkgconfig/libquicktime.pc %{_libdir}/%{name}*.so -%{_datadir}/aclocal/lqt.m4 # -------------------------------------------------------------------- %changelog +* Fri Jan 21 2011 Nicolas Chauvet - 1.2.2-1 +- Update to 1.2.2 + * Sat Jul 10 2010 Nicolas Chauvet - 1.1.5-2 - Add libquicktime-1.1.5-gtk.patch from Dan HorĂ¡k. diff --git a/sources b/sources index 09ad913..8ca0f06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fd45b3deff0317c2f85a34b1b106acf libquicktime-1.1.5.tar.gz +016a0513a7d3fb1b8e64a265152e559d libquicktime-1.2.2.tar.gz