diff --git a/.cvsignore b/.cvsignore index 4bf102f..44479ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -krb5-auth-dialog-0.9.1.tar.bz2 +krb5-auth-dialog-0.10.tar.bz2 diff --git a/desktop-file-comment.patch b/desktop-file-comment.patch deleted file mode 100644 index 15d485f..0000000 --- a/desktop-file-comment.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in.comment krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in ---- krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in.comment 2007-11-01 14:49:32.000000000 -0400 -+++ krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in 2007-11-01 14:49:39.000000000 -0400 -@@ -1,6 +1,6 @@ - [Desktop Entry] - _Name=Network Authentication --_Comments=Kerberos Network Authentication Dialog -+_Comment=Kerberos Network Authentication Dialog - Exec=krb5-auth-dialog --sm-disable - Encoding=UTF-8 - Terminal=false diff --git a/krb5-auth-dialog-0.7-sm-disable.patch b/krb5-auth-dialog-0.7-sm-disable.patch deleted file mode 100644 index 86b9f42..0000000 --- a/krb5-auth-dialog-0.7-sm-disable.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in.orig krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in ---- krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in.orig 2007-10-22 11:57:50.000000000 +0200 -+++ krb5-auth-dialog-0.7/src/krb5-auth-dialog.desktop.in 2007-10-22 11:58:48.000000000 +0200 -@@ -1,9 +1,8 @@ - [Desktop Entry] - _Name=Network Authentication - _Comments=Kerberos Network Authentication Dialog --Exec=krb5-auth-dialog -+Exec=krb5-auth-dialog --sm-disable - Encoding=UTF-8 --Exec=krb5-auth-dialog - Terminal=false - Type=Application - - diff --git a/krb5-auth-dialog-pegs-cpu.patch b/krb5-auth-dialog-pegs-cpu.patch deleted file mode 100644 index be75dae..0000000 --- a/krb5-auth-dialog-pegs-cpu.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: src/krb5-auth-dialog.c -=================================================================== -RCS file: /cvs/gnome/krb5-auth-dialog/src/krb5-auth-dialog.c,v -retrieving revision 1.27 -diff -u -d -p -U10 -r1.27 krb5-auth-dialog.c ---- src/krb5-auth-dialog.c 18 Mar 2006 00:21:08 -0000 1.27 -+++ src/krb5-auth-dialog.c 24 Jul 2006 14:52:49 -0000 -@@ -277,20 +277,21 @@ auth_dialog_prompter (krb5_context ctx, - password = gtk_entry_get_text (GTK_ENTRY (entry)); - password_len = strlen (password); - errcode = 0; - break; - case GTK_RESPONSE_CANCEL: - canceled = TRUE; - break; - case GTK_RESPONSE_DELETE_EVENT: - break; - default: -+ g_warning ("Unknown Response: %d", response); - g_assert_not_reached (); - } - - g_source_remove (source_id); - - prompts[i].reply->data = (char *) password; - prompts[i].reply->length = password_len; - } - - /* Reset this, so we know the next time we get a TRUE value, it is accurate. */ -@@ -368,21 +369,25 @@ credentials_expiring (gpointer *data) - gboolean give_up; - gboolean renewable; - - if (credentials_expiring_real (&renewable) && is_online) { - give_up = canceled && (creds_expiry == canceled_creds_expiry); - if (!give_up) { - do { - retval = grab_credentials (renewable); - give_up = canceled && - (creds_expiry == canceled_creds_expiry); -- } while ((retval != 0) && !give_up); -+ } while ((retval != 0) && -+ (retval != KRB5_REALM_CANT_RESOLVE) && -+ (retval != KRB5_KDC_UNREACH) && -+ invalid_password && -+ !give_up); - } - } - - return TRUE; - } - - static void - set_options_using_creds(krb5_context context, - krb5_creds *creds, - krb5_get_init_creds_opt *opts) diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index 0447570..587993c 100644 --- a/krb5-auth-dialog.spec +++ b/krb5-auth-dialog.spec @@ -5,12 +5,12 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog -Version: 0.9.1 +Version: 0.10 Release: 1%{?dist} License: GPLv2+ Group: User Interface/X URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: krb5-devel >= %{krb5_version} @@ -27,8 +27,6 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Patch2: desktop-file-comment.patch - %description This package contains a dialog that warns the user when their Kerberos tickets are about to expire and lets them renew them. @@ -41,16 +39,16 @@ tickets are about to expire and lets them renew them. make %install -%{__rm} -rf $RPM_BUILD_ROOT -%makeinstall +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/icons \ + $RPM_BUILD_ROOT%{_datadir}/icons + %find_lang %name %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -# /usr/share/applications/krb5-auth-dialog-preferences.desktop -# /usr/share/dbus-1/services/org.gnome.KrbAuthDialog.service -# %files -f %name.lang %defattr(-,root,root,-) @@ -58,11 +56,12 @@ make %{_sysconfdir}/gconf/schemas/*.schemas %{_bindir}/krb5-auth-dialog* %{_datadir}/krb5-auth-dialog/ -%{_datadir}/%{name}/icons/* -%{_mandir}/man1/* -%{_sysconfdir}/xdg/autostart/krb5-auth-dialog.desktop %{_datadir}/applications/krb5-auth-dialog-preferences.desktop %{_datadir}/dbus-1/services/org.gnome.KrbAuthDialog.service +%{_datadir}/icons/* +%{_mandir}/man1/* +%{_sysconfdir}/xdg/autostart/krb5-auth-dialog.desktop + %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -84,9 +83,12 @@ if [ "$1" -eq 0 ]; then fi %changelog -* Fri May 15 2009 Matej Cepl 0.9.1-1 -- New upstream version -- Fix Source0 and URL field URLs +* Fri Jun 12 2009 Matěj Cepl - 0.10-1 +- Catch up with upstream release again. + +* Thu Apr 23 2009 Matthias Clasen - 0.8-4 +- Don't show bubbles before the icon is there +- Use the same invisible char as the rest of the world * Wed Feb 25 2009 Fedora Release Engineering - 0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -123,7 +125,7 @@ fi - Don't peg the network and CPU when the KDC is unavailable * Wed Jul 19 2006 John (J5) Palmieri - 0.6.cvs20060212-4 -- rebuild for dbus +- rebuild for dbus * Wed Jul 12 2006 Jesse Keating - 0.6.cvs20060212-3.1 - rebuild @@ -173,3 +175,4 @@ fi * Mon Aug 16 2004 GNOME - auth-dialog - Initial build. + diff --git a/sources b/sources index 1b72751..d45a0c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49b553c36b841f0c313a3397e66519fb krb5-auth-dialog-0.9.1.tar.bz2 +bc3ffab4df85e2dda4d3d88672812a16 krb5-auth-dialog-0.10.tar.bz2