[claws-mail] 3.7.10-7 merge fix from 3.7.10cvs47 for odd mimeview_start_drag crash (#748384) included built/insta
Michael Schwendt
mschwendt at fedoraproject.org
Wed Nov 30 18:42:13 UTC 2011
commit 007f6d3b355c5efd4f67a6eacec585e58df23789
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Wed Nov 30 19:41:48 2011 +0100
3.7.10-7
merge fix from 3.7.10cvs47 for odd mimeview_start_drag crash (#748384)
included built/installed manual and not its XML source
add scriptlets for icon cache update
add scriptlets for update-desktop-database (#690298)
add BR gnome-libs-devel so gnome-config script is available
drop ancient Obsoletes/Provides
drop old spec sections not needed anymore
claws-mail.spec | 128 +++++++++++++++++++++++--------------------------------
1 files changed, 54 insertions(+), 74 deletions(-)
---
diff --git a/claws-mail.spec b/claws-mail.spec
index 2c83e96..a8791ea 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -2,8 +2,8 @@
Name: claws-mail
Version: 3.7.10
-Release: 6%{?dist}
-Summary: The extended version of Sylpheed
+Release: 7%{?dist}
+Summary: Email client and news reader based on GTK+
Group: Applications/Internet
License: GPLv3+
URL: http://claws-mail.org
@@ -11,7 +11,8 @@ Source0: http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{versio
# http://www.thewildbeast.co.uk/claws-mail/bugzilla/attachment.cgi?id=960
Patch0: claws-gnome-shell-dont-start-minimized.patch
Patch1: claws-mail-3.7.10-glib2-include.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: claws-mail-3.7.10-cvs47.patch
+
BuildRequires: flex, bison
BuildRequires: glib2-devel >= 2.6.2
BuildRequires: gtk2-devel >= 2.10.0
@@ -22,39 +23,28 @@ BuildRequires: enchant-devel
BuildRequires: pilot-link-devel
%endif
BuildRequires: bzip2-devel
-BuildRequires: gmp-devel
-BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 1.0.1
+BuildRequires: gpgme-devel >= 1.0.1
BuildRequires: desktop-file-utils startup-notification-devel
BuildRequires: pkgconfig
BuildRequires: gettext-devel
BuildRequires: libetpan-devel >= 0.57
BuildRequires: compface-devel
-BuildRequires: perl
+#BuildRequires: perl
BuildRequires: libtool
BuildRequires: libSM-devel
BuildRequires: NetworkManager-glib-devel dbus-glib-devel
BuildRequires: autoconf automake
+BuildRequires: docbook-utils docbook-utils-pdf
+
+# These BR are what the configure script searches for to retrieve
+# gnome-config --datadir
+BuildRequires: gnome-libs-devel
+# and whether to run gtk_update_icon_cache after installation.
+#BuildRequires: libgnome-devel
# provide plugin api version (see /usr/include/claws-mail/common/version.h)
Provides: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Obsoletes: sylpheed-claws <= 2.6.0
-Provides: sylpheed-claws = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-etpan-privacy <= 2.6.0
-Provides: sylpheed-claws-plugins-etpan-privacy = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-maildir <= 2.6.0
-Provides: sylpheed-claws-plugins-maildir = %{version}-%{release}
-Obsoletes: %{name}-maildir < %{version}-%{release}
-Provides: %{name}-maildir = %{version}-%{release}
-Obsoletes: %{name}-etpan-privacy < %{version}-%{release}
-Provides: %{name}-etpan-privacy = %{version}-%{release}
-# dropped as of 3.5.0, last available in dist-f7
-Obsoletes: claws-mail-plugins-pdfviewer <= 3.4.0
-Provides: claws-mail-plugins-pdfviewer = %{version}-%{release}
-# dropped as of 3.6.8, last available in dist-f10
-Obsoletes: claws-mail-plugins-cachesaver <= 3.7.6
-Provides: claws-mail-plugins-cachesaver = %{version}-%{release}
# last available in dist-f14
Obsoletes: claws-mail-plugins-synce <= 3.7.6
Provides: claws-mail-plugins-synce = %{version}-%{release}
@@ -72,10 +62,6 @@ intuitive operation, abundant features, and extensibility.
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-# Dec 2006
-Obsoletes: sylpheed-claws-devel <= 2.6.0
-Provides: sylpheed-claws-devel = %{version}-%{release}
-Requires: pkgconfig
%description devel
The %{name}-devel package contains the header files
@@ -83,63 +69,47 @@ and pkgconfig file needed for development with %{name}.
%if !0%{?rhel}
%package plugins-dillo
-Summary: Dillo HTML viewer plugin for claws-mail
+Summary: Dillo HTML viewer plugin for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-
Requires: dillo
-# Dec 2006
-Obsoletes: sylpheed-claws-plugins-dillo <= 2.6.0
-Provides: sylpheed-claws-plugins-dillo = %{version}-%{release}
%description plugins-dillo
%{summary}
%endif
%package plugins-spamassassin
-Summary: Spamassassin plugin for claws-mail
+Summary: Spamassassin plugin for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
Requires: spamassassin
-# Dec 2006
-Obsoletes: sylpheed-claws-plugins-spamassassin <= 2.6.0
-Provides: sylpheed-claws-plugins-spamassassin = %{version}-%{release}
%description plugins-spamassassin
%{summary}
%package plugins-pgp
-Summary: PGP plugin for signing and encrypting mail
+Summary: PGP plugin for signing and encrypting with Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
Requires: pinentry-gui
-# Dec 2006
-Obsoletes: sylpheed-claws-plugins-pgp <= 2.6.0
-Provides: sylpheed-claws-plugins-pgp = %{version}-%{release}
%description plugins-pgp
%{summary}
%package plugins-bogofilter
-Summary: Bogofilter plugin for claws-mail
+Summary: Bogofilter plugin for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
Requires: bogofilter
-# Dec 2006
-Obsoletes: sylpheed-claws-plugins-bogofilter <= 2.6.0
-Provides: sylpheed-claws-plugins-bogofilter = %{version}-%{release}
%description plugins-bogofilter
%{summary}
%package plugins-smime
-Summary: S/MIME signed and/or encrypted
+Summary: S/MIME support for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-Requires: claws-mail-plugins-pgp = %{version}-%{release}
-# Dec 2006
-Provides: sylpheed-claws-plugins-smime = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-smime <= 2.6.0
+Requires: claws-mail-plugins-pgp%{?_isa} = %{version}-%{release}
%description plugins-smime
This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
@@ -147,8 +117,9 @@ mails, verify signatures or sign and encrypt your own mails.
%prep
%setup -q
-%patch0 -p1 -b.3.7.9cvs2
+%patch0 -p1 -b .3.7.9cvs2
%patch1 -p1 -b .glib2-include
+%patch2 -p1 -b .cvs47
# guard for pluginapi
SOURCEAPI=$(grep -A 1 VERSION_NUMERIC src/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
@@ -173,7 +144,7 @@ make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
%install
rm -rf %{buildroot}
export LIBTOOL=%{_bindir}/false
-%makeinstall gnomedatadir=%{buildroot}%{_datadir}
+make DESTDIR=%{buildroot} install
%find_lang claws-mail
@@ -189,14 +160,15 @@ desktop-file-install \
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
rm -f %{buildroot}%{_infodir}/dir
-rm -rf %{buildroot}%{_datadir}/gnome
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
find %{buildroot}%{_libdir}/claws-mail/plugins/ -type f -name \
"*.a" -exec rm -f {} ';'
# we include the manual in the doc section
-rm -rf %{buildroot}%{_datadir}/doc/claws-mail
+rm -rf _tmp_manual && mkdir _tmp_manual
+mv %{buildroot}%{_datadir}/doc/claws-mail/manual _tmp_manual
+rm -f %{buildroot}%{_datadir}/doc/claws-mail/RELEASE_NOTES
# cleanup non utf8 files
for file in AUTHORS;
@@ -204,29 +176,33 @@ do iconv -f iso8859-1 -t utf-8 ${file} > \
${file}.conv && mv -f ${file}.conv ${file}
done;
-# Makefiles don't need to be in doc
-find manual -type f -name Makefile.am -exec rm {} \;
-find manual -type f -name Makefile.in -exec rm {} \;
-find manual -type f -name Makefile -exec rm {} \;
-
-# fix pkconfig
-perl -i -pe 's/\/local//g;' %{buildroot}%{_libdir}/pkgconfig/claws-mail.pc
-
# don't think we need icon-theme.cache
rm -f %{buildroot}%{_datadir}/icons/hicolor/icon-theme.cache
# set same date on config.h across builds for multilib (#340871)
touch -r NEWS %{buildroot}%{_includedir}/%{name}/config.h
-%clean
-rm -rf %{buildroot}
+
+%post
+update-desktop-database &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files -f claws-mail.lang
-%defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS ChangeLog COPYING
-%doc NEWS README
-%doc TODO
-%doc manual/*
+%doc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README RELEASE_NOTES TODO
+%doc _tmp_manual/manual
%{_bindir}/*
%dir %{_libdir}/claws-mail
%dir %{_libdir}/claws-mail/plugins
@@ -236,35 +212,39 @@ rm -rf %{buildroot}
%{_datadir}/icons/*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/claws-mail/
%{_libdir}/pkgconfig/claws-mail.pc
%if !0%{?rhel}
%files plugins-dillo
-%defattr(-,root,root,-)
%{_libdir}/claws-mail/plugins/dillo_viewer.so
%endif
%files plugins-spamassassin
-%defattr(-,root,root,-)
%{_libdir}/claws-mail/plugins/spamassassin.so
%files plugins-pgp
-%defattr(-,root,root,-)
%{_libdir}/claws-mail/plugins/pgp*.so
%{_libdir}/claws-mail/plugins/pgp*.deps
%files plugins-bogofilter
-%defattr(-,root,root,-)
%{_libdir}/claws-mail/plugins/bogofilter.so
%files plugins-smime
-%defattr(-,root,root,-)
%{_libdir}/claws-mail/plugins/smime.so
%{_libdir}/claws-mail/plugins/smime.deps
%changelog
+* Wed Nov 30 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.7.10-7
+- 3.7.10-7
+- merge fix from 3.7.10cvs47 for odd mimeview_start_drag crash (#748384)
+- included built/installed manual and not its XML source
+- add scriptlets for icon cache update
+- add scriptlets for update-desktop-database (#690298)
+- add BR gnome-libs-devel so gnome-config script is available
+- drop ancient Obsoletes/Provides
+- drop old spec sections not needed anymore
+
* Fri Nov 25 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.7.10-6
- 3.7.10-6
- fix for new glib2 where only glib.h must be included (#755308)
More information about the scm-commits
mailing list