rpms/sylpheed/F-9 sylpheed.spec,1.73,1.74
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sun Jun 8 22:33:01 UTC 2008
Author: mschwendt
Update of /cvs/pkgs/rpms/sylpheed/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28355/F-9
Modified Files:
sylpheed.spec
Log Message:
avoid duplicate desktop menu entry
Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/F-9/sylpheed.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sylpheed.spec 5 Jun 2008 08:48:26 -0000 1.73
+++ sylpheed.spec 8 Jun 2008 22:32:14 -0000 1.74
@@ -5,7 +5,7 @@
Summary: GTK+ based, lightweight, and fast email client
Name: sylpheed
Version: 2.5.0
-Release: 0.6.rc
+Release: 0.8.rc2%{?dist}
License: GPLv2+
URL: http://sylpheed.sraoss.jp/
Group: Applications/Internet
@@ -15,9 +15,13 @@
%{!?_without_gpgme:BuildRequires: gpgme-devel}
%{!?_without_compface:BuildRequires: compface-devel}
%{!?_without_ldap:BuildRequires: openldap-devel}
+%{?_with_oniguruma:BuildRequires: oniguruma-devel}
%{?_with_jpilot:BuildRequires: jpilot-devel}
-BuildRequires: gtkspell-devel enchant-devel
-Source0: http://sylpheed.sraoss.jp/sylpheed/v2.5beta/sylpheed-2.5.0rc.tar.bz2
+BuildRequires: gtkspell-devel
+%if 0%{?fedora} > 8
+BuildRequires: enchant-devel
+%endif
+Source0: http://sylpheed.sraoss.jp/sylpheed/v2.5beta/sylpheed-2.5.0rc2.tar.bz2
#Source0: http://sylpheed.sraoss.jp/sylpheed/v2.4/%{name}-%{version}.tar.bz2
Source1: sylpheed.1
@@ -25,10 +29,9 @@
Patch2: sylpheed-2.5.0rc-desktop.patch
Patch3: sylpheed-2.3.1-certsdir.patch
Patch4: sylpheed-2.2.5-prefs_common.patch
+%if 0%{?fedora} > 8
Patch5: sylpheed-2.4.8-enchant.patch
-Patch6: sylpheed-2.5.0rc-summaryview.patch
-Patch7: sylpheed-2.5.0rc-utf8.patch
-Patch8: sylpheed-2.5.0rc-procmime.patch
+%endif
# For xdg-open in patch1.
Requires: xdg-utils
@@ -49,20 +52,20 @@
See /usr/share/doc/sylpheed*/README for more information.
%prep
-%setup -q -n sylpheed-2.5.0rc
+%setup -q -n sylpheed-2.5.0rc2
%patch1 -p1 -b .defs.h
%patch2 -p1 -b .desktop
%patch3 -p1 -b .certsdir
%patch4 -p1 -b .prefs_common
+%if 0%{?fedora} > 8
%patch5 -p1 -b .enchant
-%patch6 -p1 -b .summaryview
-%patch7 -p1 -b .utf8
-%patch8 -p1 -b .procmime
+%endif
%build
%configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
%{?_without_compface:--disable-compface} \
%{!?_without_ldap:--enable-ldap} \
+ %{?_with_oniguruma:--enable-oniguruma} \
%{?_with_jpilot:--enable-jpilot}
echo "#define LDAP_DEPRECATED 1" >> config.h
make %{?_smp_mflags}
@@ -74,11 +77,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 \
- sylpheed.desktop
+ --delete-original \
+ %{_datadir}/applications/%{name}.desktop
install -d $RPM_BUILD_ROOT%{_mandir}/man1/
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
%find_lang %{name}
@@ -98,6 +103,13 @@
%{_mandir}/man1/*
%changelog
+* Sun Jun 8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.8.rc2
+- avoid duplicate desktop menu entry
+- conditional BR oniguruma-devel and --enable-oniguruma
+
+* Fri Jun 6 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.7.rc2
+- Update to 2.5.0rc2.
+
* Thu Jun 5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.6.rc
- Add CTE procmime.c patch from svn.
- Fix codeconv.c to support "utf8" locales and not just "UTF-8"
More information about the scm-commits
mailing list