[krb5-auth-dialog] - Merge-review cleanup (#225973)

[paragn]

commit 6b049b734fd4070ae5768dd4d6fd7314c0dd0de3
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Fri Sep 10 13:18:06 2010 +0530

    - Merge-review cleanup (#225973)

 krb5-auth-dialog.spec |   72 ++++++++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 39 deletions(-)
---
diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec
index 68716a5..cf2f24c 100644
--- a/krb5-auth-dialog.spec
+++ b/krb5-auth-dialog.spec
@@ -1,29 +1,25 @@
-%define libgnomeui_version 2.9.1
-%define krb5_version 1.4
-%define libnm_version 0.5
-%define dbus_version 0.90
-
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.16
-Release: 1%{?dist}
+Release: 2%{?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}/%{version}/%{name}-%{version}.tar.bz2
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: krb5-devel >= %{krb5_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: perl-XML-Parser, gettext
+BuildRequires: libgnomeui-devel
+BuildRequires: krb5-devel
+BuildRequires: dbus-devel
+BuildRequires: perl(XML::Parser), gettext
 BuildRequires: intltool
 BuildRequires: libnotify-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: scrollkeeper
+
 %ifnarch s390 s390x
-BuildRequires: NetworkManager-glib-devel >= %{libnm_version}
+BuildRequires: NetworkManager-glib-devel
 %endif
-Requires: libgnomeui >= %{libgnomeui_version}
-Requires: krb5-libs >= %{krb5_version}
+Requires: libgnomeui 
+Requires: krb5-libs 
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -36,56 +32,54 @@ tickets are about to expire and lets them renew them.
 %setup -q
 
 %build
-%configure
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/krb5-auth-dialog/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/krb5-auth-dialog/*.a
-
-%find_lang %{name} --with-gnome
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
+%find_lang %{name} --with-gnome
 
 %files -f %name.lang
 %defattr(-,root,root,-)
-%doc
+%doc COPYING AUTHORS NEWS README
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/krb5-auth-dialog*
 %{_datadir}/krb5-auth-dialog/
 %{_datadir}/applications/krb5-auth-dialog-preferences.desktop
 %{_datadir}/dbus-1/services/org.gnome.KrbAuthDialog.service
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/status/*
 %{_mandir}/man1/*
 %{_sysconfdir}/xdg/autostart/krb5-auth-dialog.desktop
 %{_libdir}/krb5-auth-dialog
 
-
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-        %{_sysconfdir}/gconf/schemas/krb5-auth-dialog.schemas >/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+%gconf_schema_upgrade krb5-auth-dialog
 
-%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 || :
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%pre
+%gconf_schema_prepare krb5-auth-dialog
+
 %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
+%gconf_schema_remove krb5-auth-dialog
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %changelog
+* Thu Sep 09 2010 Parag Nemade <paragn AT fedoraproject.org> 0.16-2
+- Merge-review cleanup (#225973)
+
 * Thu Jul  1 2010 Matthias Clasen <mclasen at redhat.com> - 0.16-1
 - Update to 0.16