diff --git a/duplicate-id.patch b/duplicate-id.patch new file mode 100644 index 0000000..1920451 --- /dev/null +++ b/duplicate-id.patch @@ -0,0 +1,32 @@ +--- krb5-auth-dialog-0.12/preferences/krb5-auth-dialog-preferences.c 2009-07-02 07:23:37.000000000 -0400 ++++ hacked/preferences/krb5-auth-dialog-preferences.c 2009-09-25 08:59:36.214140570 -0400 +@@ -735,10 +735,16 @@ + static gboolean + ka_preferences_dialog_init(KaPreferencesDialog* dialog) + { ++ GError *error = NULL; ++ + dialog->xml = gtk_builder_new (); + +- g_assert(gtk_builder_add_from_file(dialog->xml, KA_DATA_DIR G_DIR_SEPARATOR_S +- PACKAGE "-preferences.xml", NULL)); ++ if (!gtk_builder_add_from_file(dialog->xml, KA_DATA_DIR G_DIR_SEPARATOR_S ++ PACKAGE "-preferences.xml", &error)) ++ { ++ g_warning ("Failed to load UI: %s", error->message); ++ exit (1); ++ } + + dialog->dialog = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "krb5_auth_dialog_prefs")); + g_assert (dialog->dialog); +--- krb5-auth-dialog-0.12/preferences/krb5-auth-dialog-preferences.xml 2009-07-02 07:23:37.000000000 -0400 ++++ hacked/preferences/krb5-auth-dialog-preferences.xml 2009-09-25 09:00:31.423885887 -0400 +@@ -712,7 +712,7 @@ + button1 + + +- ++ + True + gtk-missing-image + diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index 218540a..aacb1ab 100644 --- a/krb5-auth-dialog.spec +++ b/krb5-auth-dialog.spec @@ -6,7 +6,7 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/X URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/ @@ -28,12 +28,16 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 +# https://bugzilla.gnome.org/show_bug.cgi?id=596306 +Patch0: duplicate-id.patch + %description This package contains a dialog that warns the user when their Kerberos tickets are about to expire and lets them renew them. %prep %setup -q +%patch0 -p1 -b .duplicate-id %build %configure @@ -82,6 +86,9 @@ if [ "$1" -eq 0 ]; then fi %changelog +* Fri Sep 25 2009 Matthias Clasen - 0.12-2 +- Fix the preferences dialog + * Sat Aug 29 2009 Matthias Clasen - 0.12-1 - Update to 0.12 - Rebuild against new libnm_glib