rpms/balsa/devel balsa.spec,1.3,1.4

[Pawel Salek (pawsa)]

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7386

Modified Files:
	balsa.spec 
Log Message:
- Implement the reviewers's suggestions as on fedora-extras-list



Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- balsa.spec	6 Jun 2005 22:30:17 -0000	1.3
+++ balsa.spec	11 Jun 2005 19:53:34 -0000	1.4
@@ -1,20 +1,9 @@
-#fedora and mdk are exclusive
-%define fedora 1
-%define mdk    0
 %define gmimever 2.1.14
-%define rel 1
-%if %fedora
-%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings --with-ssl --with-gss
-%define rel 1.FC3
-%endif
-%if %mdk
-%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings
-%define rel mdk
-%endif
+%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings --with-ssl --with-gss --without-esmtp
 
 Name:           balsa
 Version:        2.3.3
-Release:        %{rel}
+Release:        1%{?dist}
 Summary:        Balsa Mail Client
 
 Group:          Applications/Internet
@@ -24,40 +13,18 @@
 Source1:        http://balsa.gnome.org/gmime-%{gmimever}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: libesmtp >= 1.0.3
-Requires: aspell
-Requires: openssl
-BuildRequires: libesmtp-devel >= 1.0.3
+#Requires: libesmtp >= 1.0.3
+#BuildRequires: libesmtp-devel >= 1.0.3
 BuildRequires: aspell-devel
 BuildRequires: openssl-devel
 
-%if %fedora
-Requires: gtk2 >= 2.0.0
-Requires: libgnome >= 2.0.0
-Requires: libgnomeui >= 2.0.0
-Requires: gnome-vfs2 >= 2.0.0
-Requires:  libgnomeprint22 >= 2.2.0
-Requires:  libgnomeprintui22 >= 2.2.0
 BuildRequires:  gtk2-devel >= 2.0.0
 BuildRequires:  libgnome-devel >= 2.0.0
 BuildRequires:  libgnomeui-devel >= 2.0.0
 BuildRequires:  gnome-vfs2-devel >= 2.0.0
 BuildRequires:  libgnomeprint22-devel >= 2.2.0
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
-%endif
-%if %mdk
-Requires: gtk+2.0
-Requires: libgnome2_0 
-Requires: libgnomeui2_0
-Requires: libgnome-vfs2_0
-BuildRequires:  libgtk+2.0_0-devel
-BuildRequires:  libgnome2_0-devel 
-BuildRequires:  libgnomeui2_0-devel
-BuildRequires:  libgnome-vfs2_0-devel
-BuildRequires:  libpspell4-devel
-BuildRequires:  libltdl3-devel
-BuildRequires:  libpcre0-devel
-%endif
+BuildRequires:  desktop-file-utils
 
 %description
 Balsa is an e-mail reader.  This client is part of the GNOME
@@ -80,22 +47,22 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT"
-rm "$RPM_BUILD_ROOT%{_bindir}"/balsa-ab
+rm -f "$RPM_BUILD_ROOT%{_bindir}"/balsa-ab
 
+desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \
+        --vendor=fedora \
+        --add-category=X-Fedora \
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        --copy-name-to-generic-name \
+        --delete-original
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf "$RPM_BUILD_ROOT"
 
 %post
 which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update
 
-if which gtk-update-icon-cache >/dev/null 2>&1; then
-    # cf. images/Makefile - this is probably incomplete.
-    gtk-update-icon-cache %{_datadir}/balsa/hicolor
-    gtk-update-icon-cache %{_datadir}/icons/hicolor
-fi
-
 %postun
 which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update
 
@@ -107,13 +74,11 @@
 %doc docs/vconvert.awk docs/pine2vcard
 %{_bindir}/balsa
 %{_libdir}/bonobo/servers/GNOME_Balsa.server
-%{_datadir}/applications/balsa.desktop
-%{_datadir}/balsa/hicolor/16x16/apps/*
-%{_datadir}/balsa/hicolor/24x24/apps/*
-%{_datadir}/balsa/hicolor/22x22
+%{_datadir}/applications/*.desktop
+%{_datadir}/balsa/hicolor/*
 %{_datadir}/balsa/pixmaps/*
 %{_datadir}/gnome/help/balsa/*
-/usr/share/icons/hicolor/*
+%{_datadir}/icons/hicolor/*
 %{_datadir}/idl/Balsa.idl
 %{_datadir}/omf/balsa/*
 %{_datadir}/pixmaps/gnome-balsa2.png
@@ -123,6 +88,9 @@
 
 
 %changelog
+* Sat Jun 11 2005 Pawel Salek <pawsa at salek.zapto.org> - 2.3.3
+- Implement the reviewers's suggestions as on fedora-extras-list
+
 * Tue Jun  7 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3-1
 - bump version to 2.3.3
 - add libesmtp-devel dependency.