rpms/sylpheed/devel sylpheed.spec,1.96,1.97

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16218

Modified Files:
	sylpheed.spec 
Log Message:
* Fri Feb 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-2
- no build, add comments to spec file, remove old cruft



Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sylpheed.spec	18 Jan 2009 12:33:26 -0000	1.96
+++ sylpheed.spec	13 Feb 2009 19:08:02 -0000	1.97
@@ -7,7 +7,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -26,17 +26,21 @@
 Source0: http://sylpheed.sraoss.jp/sylpheed/v2.6/%{name}-%{tarversion}.tar.bz2
 Source1: sylpheed.1
 
+# customisations for default program paths
 Patch1: sylpheed-2.4.6-defs.h.patch
+# customisations in the .desktop file
 Patch2: sylpheed-2.5.0-desktop.patch
+# customisation for /etc/pki/tls/
 Patch3: sylpheed-2.5.0-certsdir.patch
+# customisation for default Folder View preferences to mimic older Sylpheed
 Patch4: sylpheed-2.5.0-prefs_common.patch
 
 # For xdg-open in patch1.
 Requires: xdg-utils
 
 %description
-This program is an X based fast email client which has features
-like:
+This program is an X based fast email client which has features like:
+
 o user-friendly and intuitive interface
 o integrated NetNews client (partially implemented)
 o ability of keyboard-only operation
@@ -62,7 +66,10 @@
     %{!?_without_ldap:--enable-ldap} \
     %{?_with_oniguruma:--enable-oniguruma} \
     %{?_with_jpilot:--enable-jpilot}
+# Compile with deprecated OpenLDAP API to fix segfaults on 64-bit.
 echo "#define LDAP_DEPRECATED 1" >> config.h
+# Fedora 9 and newer use the GtkSpell+Enchant feature:
+# http://fedoraproject.org/wiki/Releases/FeatureDictionary
 %if 0%{?fedora} > 8
 echo "#define USE_ENCHANT 1" >> config.h
 %endif
@@ -75,14 +82,13 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -p -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
-[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop ] && exit 1
 desktop-file-install --vendor %{desktopvendor} \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --remove-category Application \
     --add-category Network \
     --delete-original \
     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-install -d $RPM_BUILD_ROOT%{_mandir}/man1/
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 %find_lang %{name}
 
@@ -90,17 +96,20 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc COPYING ChangeLog README INSTALL TODO
 %doc ChangeLog.ja README.ja INSTALL.ja TODO.ja
 %doc AUTHORS NEWS
 %{_bindir}/sylpheed
 %{_datadir}/sylpheed/
-%{_datadir}/applications/*
+%{_datadir}/applications/%{desktopvendor}-%{name}.desktop
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-3
+- no build, add comments to spec file, remove old cruft
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.0-2
 - rebuild with new openssl