Author: giallu Update of /cvs/free/rpms/ogmrip/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28632 Modified Files: .cvsignore ogmrip.spec sources Added Files: ogmrip-0.13.6-gtk3_build_fix.patch ogmrip-0.13.6-libnotify07-compatibility.patch Log Message: * Sun Nov 21 2010 Gianluca Sforna <giallu(a)gmail.com&gt; - 0.13.6-1 - new upstream release - Fix build with GTK3 and libnotify 0.7 ogmrip-0.13.6-gtk3_build_fix.patch: libogmrip-gtk/ogmrip-x264-options.c | 1 - libogmrip-gtk/ogmrip-xvid-options.c | 1 - src/ogmrip-pref-dialog.c | 1 - src/ogmrip-profile-editor.c | 1 - src/ogmrip-profiles-dialog.c | 1 - src/ogmrip-progress-dialog.c | 1 - src/ogmrip-queue-dialog.c | 1 - src/ogmrip-update-dialog.c | 1 - 8 files changed, 8 deletions(-) --- NEW FILE ogmrip-0.13.6-gtk3_build_fix.patch --- diff -u -r ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-x264-options.c ogmrip-0.13.6/libogmrip-gtk/ogmrip-x264-options.c --- ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-x264-options.c 2010-08-22 12:38:34.000000000 +0200 +++ ogmrip-0.13.6/libogmrip-gtk/ogmrip-x264-options.c 2010-11-22 19:30:10.484062522 +0100 @@ -246,7 +246,6 @@ NULL); gtk_window_set_title (GTK_WINDOW (dialog), _("X264 Options")); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES); diff -u -r ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-xvid-options.c ogmrip-0.13.6/libogmrip-gtk/ogmrip-xvid-options.c --- ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-xvid-options.c 2010-08-22 12:38:34.000000000 +0200 +++ ogmrip-0.13.6/libogmrip-gtk/ogmrip-xvid-options.c 2010-11-22 19:30:17.687023102 +0100 @@ -165,7 +165,6 @@ return; } - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_window_set_title (GTK_WINDOW (dialog), _("XviD Options")); diff -u -r ogmrip-0.13.6.orig/src/ogmrip-pref-dialog.c ogmrip-0.13.6/src/ogmrip-pref-dialog.c --- ogmrip-0.13.6.orig/src/ogmrip-pref-dialog.c 2010-08-22 12:38:28.000000000 +0200 +++ ogmrip-0.13.6/src/ogmrip-pref-dialog.c 2010-11-22 19:30:32.120944110 +0100 @@ -211,7 +211,6 @@ gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); diff -u -r ogmrip-0.13.6.orig/src/ogmrip-profile-editor.c ogmrip-0.13.6/src/ogmrip-profile-editor.c --- ogmrip-0.13.6.orig/src/ogmrip-profile-editor.c 2010-08-22 12:38:28.000000000 +0200 +++ ogmrip-0.13.6/src/ogmrip-profile-editor.c 2010-11-22 19:31:05.476761560 +0100 @@ -754,7 +754,6 @@ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES); diff -u -r ogmrip-0.13.6.orig/src/ogmrip-profiles-dialog.c ogmrip-0.13.6/src/ogmrip-profiles-dialog.c --- ogmrip-0.13.6.orig/src/ogmrip-profiles-dialog.c 2010-08-22 12:38:28.000000000 +0200 +++ ogmrip-0.13.6/src/ogmrip-profiles-dialog.c 2010-11-22 19:30:39.920901421 +0100 @@ -667,7 +667,6 @@ gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_window_set_default_size (GTK_WINDOW (dialog), 450, -1); gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Profiles")); diff -u -r ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c ogmrip-0.13.6/src/ogmrip-progress-dialog.c --- ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c 2010-08-22 12:38:28.000000000 +0200 +++ ogmrip-0.13.6/src/ogmrip-progress-dialog.c 2010-11-22 19:31:42.223560450 +0100 @@ -404,7 +404,6 @@ gtk_window_set_default_size (GTK_WINDOW (dialog), 450, -1); gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_EXECUTE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff -u -r ogmrip-0.13.6.orig/src/ogmrip-queue-dialog.c ogmrip-0.13.6/src/ogmrip-queue-dialog.c --- ogmrip-0.13.6.orig/src/ogmrip-queue-dialog.c 2010-08-22 12:38:28.000000000 +0200 +++ ogmrip-0.13.6/src/ogmrip-queue-dialog.c 2010-11-22 19:30:50.742842196 +0100 @@ -611,7 +611,6 @@ gtk_window_set_title (GTK_WINDOW (dialog), _("Encoding Queue")); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE); gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); diff -u -r ogmrip-0.13.6.orig/src/ogmrip-update-dialog.c ogmrip-0.13.6/src/ogmrip-update-dialog.c --- ogmrip-0.13.6.orig/src/ogmrip-update-dialog.c 2010-08-22 12:38:28.000000000 +0200 +++ ogmrip-0.13.6/src/ogmrip-update-dialog.c 2010-11-22 19:31:14.786710608 +0100 @@ -130,7 +130,6 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_window_set_default_size (GTK_WINDOW (dialog), 450, 350); gtk_window_set_title (GTK_WINDOW (dialog), _("Update profiles")); ogmrip-0.13.6-libnotify07-compatibility.patch: README | 2 +- configure.in | 2 +- src/.ogmrip-progress-dialog.c.swp |only src/ogmrip-progress-dialog.c | 3 +-- 4 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE ogmrip-0.13.6-libnotify07-compatibility.patch --- diff -u -r ogmrip-0.13.6.orig/configure.in ogmrip-0.13.6/configure.in --- ogmrip-0.13.6.orig/configure.in 2010-08-22 16:55:37.000000000 +0200 +++ ogmrip-0.13.6/configure.in 2010-11-22 22:20:01.841724409 +0100 @@ -386,7 +386,7 @@ dnl ************************************************************** -LIBNOTIFY_REQUIRED=0.4.3 +LIBNOTIFY_REQUIRED=0.7.0 LIBNOTIFY_MODULES="libnotify >= $LIBNOTIFY_REQUIRED" diff -u -r ogmrip-0.13.6.orig/README ogmrip-0.13.6/README --- ogmrip-0.13.6.orig/README 2010-08-22 12:38:34.000000000 +0200 +++ ogmrip-0.13.6/README 2010-11-22 22:20:19.409629410 +0100 @@ -48,7 +48,7 @@ For notification support: - libnotify >= 0.4.3: http://www.galago-project.org + libnotify >= 0.7.0: http://www.galago-project.org For Ogg Media support: diff -u -r ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c ogmrip-0.13.6/src/ogmrip-progress-dialog.c --- ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c 2010-08-22 12:38:28.000000000 +0200 +++ ogmrip-0.13.6/src/ogmrip-progress-dialog.c 2010-11-22 22:15:18.804253123 +0100 @@ -418,8 +418,7 @@ g_signal_connect_swapped (dialog->priv->status_icon, "popup_menu", G_CALLBACK (ogmrip_progress_dialog_status_icon_popup_menu), dialog); - dialog->priv->notification = notify_notification_new_with_status_icon ("Dummy", "Dummy", - OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE, dialog->priv->status_icon); + dialog->priv->notification = notify_notification_new ("Dummy", "Dummy", NULL); g_signal_connect (dialog, "window-state-event", G_CALLBACK (ogmrip_progress_dialog_state_changed), NULL); Only in ogmrip-0.13.6/src: .ogmrip-progress-dialog.c.swp Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ogmrip/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 May 2010 15:03:32 -0000 1.7 +++ .cvsignore 22 Nov 2010 22:38:49 -0000 1.8 @@ -1 +1 @@ -ogmrip-0.13.5.tar.gz +ogmrip-0.13.6.tar.gz Index: ogmrip.spec =================================================================== RCS file: /cvs/free/rpms/ogmrip/devel/ogmrip.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ogmrip.spec 22 May 2010 15:03:32 -0000 1.8 +++ ogmrip.spec 22 Nov 2010 22:38:49 -0000 1.9 @@ -1,5 +1,5 @@ Name: ogmrip -Version: 0.13.5 +Version: 0.13.6 Release: 1%{?dist} Summary: DVD ripping and encoding graphical user interface @@ -32,7 +32,9 @@ Requires(post): GConf2 Requires(postun): GConf2 -#Patch0: ogmrip-0.13.4-build_fix.patch +# These were patches were sent upstream in ogmrip-devel ML +Patch0: ogmrip-0.13.6-gtk3_build_fix.patch +Patch1: ogmrip-0.13.6-libnotify07-compatibility.patch %description OGMRip is an application and a set of libraries for ripping and encoding DVDs @@ -59,7 +61,8 @@ %prep %setup -q -#patch0 -p1 +%patch0 -p1 +%patch1 -p1 %build %configure \ @@ -136,6 +139,10 @@ %changelog +* Sun Nov 21 2010 Gianluca Sforna <giallu(a)gmail.com&gt; - 0.13.6-1 +- new upstream release +- Fix build with GTK3 and libnotify 0.7 + * Fri May 22 2010 Gianluca Sforna <giallu gmail com> - 0.13.5-1 - new upstream release - drop upstreamed patch Index: sources =================================================================== RCS file: /cvs/free/rpms/ogmrip/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 May 2010 15:03:32 -0000 1.7 +++ sources 22 Nov 2010 22:38:49 -0000 1.8 @@ -1 +1 @@ -6cf5d93b4fb7af7f147e7ade92bf3df6 ogmrip-0.13.5.tar.gz +e094c49cdf758883293dd44513fb37e8 ogmrip-0.13.6.tar.gz