diff --git a/.gitignore b/.gitignore index 63eabf0..278e561 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ krb5-auth-dialog-0.16.tar.bz2 /krb5-auth-dialog-3.1.91.tar.xz /krb5-auth-dialog-3.2.0.tar.xz /krb5-auth-dialog-3.2.1.tar.xz +/krb5-auth-dialog-3.14.0.tar.xz diff --git a/Improve-auto-detection.patch b/Improve-auto-detection.patch index e9bdaa5..57a878f 100644 --- a/Improve-auto-detection.patch +++ b/Improve-auto-detection.patch @@ -3,7 +3,7 @@ diff -uPr krb5-auth-dialog-3.2.1.orig/src/ka-applet.c krb5-auth-dialog-3.2.1.new +++ krb5-auth-dialog-3.2.1.new/src/ka-applet.c 2013-11-06 23:42:36.642567362 -0500 @@ -129,7 +129,8 @@ KA_DEBUG ("Evaluating command line"); - + if (!self->priv->startup_ccache && - self->priv->auto_run) + self->priv->auto_run && diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index a8e3142..ddff13b 100644 --- a/krb5-auth-dialog.spec +++ b/krb5-auth-dialog.spec @@ -1,11 +1,11 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog -Version: 3.2.1 -Release: 10%{?dist} +Version: 3.14.0 +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}/3.2/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz # avoid annoying notifications Patch0: krb5-auth-dialog-autostart.patch @@ -15,7 +15,6 @@ BuildRequires: krb5-devel BuildRequires: perl(XML::Parser), gettext BuildRequires: intltool BuildRequires: libnotify-devel -BuildRequires: GConf2-devel BuildRequires: gnome-doc-utils BuildRequires: scrollkeeper BuildRequires: control-center-devel @@ -23,10 +22,6 @@ BuildRequires: gtk3-devel BuildRequires: NetworkManager-glib-devel BuildRequires: autoconf automake libtool -Requires(pre): GConf2 -Requires(post): GConf2 -Requires(preun): GConf2 - %description This package contains a dialog that warns the user when their Kerberos tickets are about to expire and lets them renew them. @@ -52,11 +47,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %files -f %name.lang %doc COPYING AUTHORS NEWS README -%{_sysconfdir}/gconf/schemas/*.schemas %{_bindir}/krb5-auth-dialog* %{_datadir}/krb5-auth-dialog/ +%{_datadir}/appdata/krb5-auth-dialog.appdata.xml %{_datadir}/applications/krb5-auth-dialog.desktop %{_datadir}/dbus-1/services/org.gnome.KrbAuthDialog.service +%{_datadir}/GConf/gsettings/org.gnome.KrbAuthDialog.convert +%{_datadir}/glib-2.0/schemas/org.gnome.KrbAuthDialog.gschema.xml %{_datadir}/icons/hicolor/*/status/* %{_mandir}/man1/* %{_sysconfdir}/xdg/autostart/krb5-auth-dialog.desktop @@ -64,25 +61,24 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%gconf_schema_upgrade krb5-auth-dialog %postun if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : fi -%pre -%gconf_schema_prepare krb5-auth-dialog - -%preun -%gconf_schema_remove krb5-auth-dialog - %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Fri Oct 24 2014 Kalev Lember - 3.14.0-1 +- Update to 3.14.0 +- Adjust packaging for the gconf to gsettings port + * Sun Aug 17 2014 Fedora Release Engineering - 3.2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 6592f9c..18f340f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f8bbd7729c5c731f46f796df11fe766 krb5-auth-dialog-3.2.1.tar.xz +00006951a1b011eb5c0fd2664c44b0f8 krb5-auth-dialog-3.14.0.tar.xz