Updated to 3.15.1

This commit is contained in:
Алзим 2017-09-16 10:51:17 +03:00
parent 45e9f677fd
commit ba0365b451
3 changed files with 126 additions and 125 deletions

View file

@ -1,2 +1,2 @@
sources: sources:
claws-mail-3.14.1.tar.bz2: 27299205f777f060b39d284a34557c73bbf2b606 claws-mail-3.15.1.tar.bz2: 743a8f13dd0df4a0441616a3ea7aa445ed19070c

1
claws-mail.rpmlintrc Normal file
View file

@ -0,0 +1 @@
addFilter("W: no-documentation")

View file

@ -1,4 +1,5 @@
%define _disable_ld_no_undefined 1 %define debug_package %{nil}
%define disable_ld_no_undefined 1
%define flag_gtk3 0 %define flag_gtk3 0
%define flag_demo 1 %define flag_demo 1
@ -8,13 +9,14 @@
Summary: The user-friendly, lightweight and fast GTK2 based email client Summary: The user-friendly, lightweight and fast GTK2 based email client
Name: claws-mail Name: claws-mail
Version: 3.14.1 Version: 3.15.1
Release: 3 Release: 1
Epoch: 1 Epoch: 1
License: GPLv3+ License: GPLv3+
Group: Networking/Mail Group: Networking/Mail
Url: http://www.claws-mail.org Url: http://www.claws-mail.org
Source0: http://www.claws-mail.org/releases/%{name}-%{version}.tar.bz2 Source0: http://www.claws-mail.org/releases/%{name}-%{version}.tar.bz2
Source1: claws-mail.rpmlintrc
# from Debian # from Debian
Patch0: claws-mail-3.13.2-trashed-read.patch Patch0: claws-mail-3.13.2-trashed-read.patch
BuildRequires: bison BuildRequires: bison
@ -26,6 +28,7 @@ BuildRequires: intltool
BuildRequires: compface-devel BuildRequires: compface-devel
BuildRequires: gpgme-devel > 0.4.5 BuildRequires: gpgme-devel > 0.4.5
BuildRequires: libetpan-devel >= 0.42 BuildRequires: libetpan-devel >= 0.42
BuildRequires: libytnef-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: perl-devel BuildRequires: perl-devel
@ -52,6 +55,7 @@ BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libcanberra-gtk) BuildRequires: pkgconfig(libcanberra-gtk)
%endif %endif
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libical)
BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libgcrypt)
BuildRequires: pkgconfig(libgdata) BuildRequires: pkgconfig(libgdata)
BuildRequires: pkgconfig(libgnome-2.0) >= 2.0 BuildRequires: pkgconfig(libgnome-2.0) >= 2.0
@ -598,33 +602,32 @@ This Claws Mail tools.
%files tools %files tools
%{_libdir}/%{name}/tools/* %{_libdir}/%{name}/tools/*
#---------------------------------------------------------------------------- # #----------------------------------------------------------------------------
#
%package vcalendar-plugin # %package vcalendar-plugin
Summary: This Claws Mail plugin enables vCalendar message handling # Summary: This Claws Mail plugin enables vCalendar message handling
Group: Networking/Mail # Group: Networking/Mail
Requires: %{name} = %{EVRD} # Requires: %{name} = %{EVRD}
#
%description vcalendar-plugin # %description vcalendar-plugin
This Claws Mail plugin handles the vCalendar format (or rather, the meeting # This Claws Mail plugin handles the vCalendar format (or rather, the meeting
subset of it). It displays such mails in a nice format, lets you create and # subset of it). It displays such mails in a nice format, lets you create and
send meetings, and creates a virtual folder with the meetings you have sent # send meetings, and creates a virtual folder with the meetings you have sent
or received. # or received.
#
%files vcalendar-plugin # %files vcalendar-plugin
#%{_datadir}/appdata/claws-mail-vcalendar.metainfo.xml # #%{_datadir}/appdata/claws-mail-vcalendar.metainfo.xml
%{_libdir}/%{name}/plugins/vcalendar.so # %{_libdir}/%{name}/plugins/vcalendar.so
#
#----------------------------------------------------------------------------- # #-----------------------------------------------------------------------------
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%build %build
export CFLAGS+=" -Wno-error"
%configure2_5x \ %configure2_5x \
--enable-appdata \
--enable-archive-plugin \ --enable-archive-plugin \
--enable-compface \ --enable-compface \
--enable-crash-dialog \ --enable-crash-dialog \
@ -636,7 +639,6 @@ or received.
--enable-jpilot \ --enable-jpilot \
--enable-ldap \ --enable-ldap \
--enable-gnutls \ --enable-gnutls \
--enable-networkmanager-support \
--enable-spamassassin-plugin \ --enable-spamassassin-plugin \
%if %flag_demo %if %flag_demo
--enable-demo-plugin \ --enable-demo-plugin \
@ -674,10 +676,8 @@ rm -f %{buildroot}%{_datadir}/appdata/claws-mail-geolocation.metainfo.xml
# integrated kde menu # integrated kde menu
mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus/ mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
sed "s/SCRIPT_PATH/claws-mail-kdeservicemenu.pl/" tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template > %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/claws-mail-attach-files.desktop sed "s/SCRIPT_PATH/claws-mail-kdeservicemenu.pl/" tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template > %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/claws-mail-attach-files.desktop
#install -m644 tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template \
# %{buildroot}%{_datadir}/kde4/services/ServiceMenu/claws-mail-attach-files.desktop
install -m755 tools/kdeservicemenu/claws-mail-kdeservicemenu.pl %{buildroot}%{_bindir}/ install -m755 tools/kdeservicemenu/claws-mail-kdeservicemenu.pl %{buildroot}%{_bindir}/
cp -a tools %{buildroot}%{_libdir}/%{name}/ cp -a tools %{buildroot}%{_libdir}/%{name}/