From 8c32e8d3d05d17ffe9dadd9dabcaaecb73c771d7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Jan 13 2009 22:52:45 +0000 Subject: - New upstream release - Remove both patches; they are upstreamed - Add gconf spec goo - Add new stuff to files list --- diff --git a/.cvsignore b/.cvsignore index 4590b5f..a581116 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -krb5-auth-dialog-0.7.tar.bz2 +krb5-auth-dialog-0.8.tar.gz diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index f12175e..2b7ce6d 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.7 -Release: 7%{?dist} +Version: 0.8 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/X URL: http://www.redhat.com/ -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: krb5-devel >= %{krb5_version} @@ -21,8 +21,10 @@ BuildRequires: NetworkManager-glib-devel >= %{libnm_version} %endif Requires: libgnomeui >= %{libgnomeui_version} Requires: krb5-libs >= %{krb5_version} +Requires(pre): GConf2 +Requires(post): GConf2 +Requires(preun): GConf2 -Patch1: krb5-auth-dialog-0.7-sm-disable.patch Patch2: desktop-file-comment.patch %description @@ -31,8 +33,6 @@ tickets are about to expire and lets them renew them. %prep %setup -q -%patch1 -p1 -b .sm-disable -%patch2 -p1 -b .comment %build %configure @@ -50,13 +50,39 @@ make %files -f %name.lang %defattr(-,root,root,-) %doc +%{_sysconfdir}/gconf/schemas/*.schemas %{_bindir}/krb5-auth-dialog %{_datadir}/krb5-auth-dialog/ +%{_datadir}/icons/* %{_mandir}/man1/* %{_sysconfdir}/xdg/autostart/krb5-auth-dialog.desktop +%post +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/krb5-auth-dialog.schemas >/dev/null || : + +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/krb5-auth-dialog.schemas &> /dev/null || : +fi + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/krb5-auth-dialog.schemas &> /dev/null || : +fi %changelog +* Tue Jan 13 2009 Colin Walters - 0.8-1 +- New upstream release +- Remove both patches; they are upstreamed +- Add gconf spec goo +- Add new stuff to files list + * Mon Feb 18 2008 Christopher Aillon - 0.7-7 - Rebuild to celebrate my birthday (and GCC 4.3) diff --git a/sources b/sources index 0ca1cb9..de8e76b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c37b6d9d5a195ffbbf7c9dbbc6391f9 krb5-auth-dialog-0.7.tar.bz2 +a1cd821bba2a8ea6dae8ced2d191502d krb5-auth-dialog-0.8.tar.gz