X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=claws-mail.spec;h=3aae4e06040d234b84116e082e519847e5aafb56;hb=80fa785babfcee6fa55c55638361889973ba6985;hp=305c5aac04c2d2a05ddc5423d9e64883c3c6d8e6;hpb=7f0c3b3e5a5bcf410c0b05cddf7735f2584e7029;p=packages%2Fclaws-mail.git

diff --git a/claws-mail.spec b/claws-mail.spec
index 305c5aa..3aae4e0 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -12,13 +12,14 @@
 Summary:	A bleeding edge branch of Sylpheed, a GTK2 based, lightweight, and fast e-mail client
 Summary(pl):	Rozwojowa wersja Sylpheed z du¿± ilo¶ci± zmian oraz ulepszeñ
 Name:		claws-mail
-Version:	2.6.1
+Version:	2.7.2
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
-# Source0-md5:	98099550a68a08eca5354659f3ea465c
+# Source0-md5:	079f167fba6e17ae2c688a0dae858b0f
 Source1:	%{name}.desktop
+Patch0:		%{name}-pc_cflags_sequence.patch
 URL:		http://www.claws-mail.net/
 BuildRequires:	aspell-devel >= 2:0.50
 BuildRequires:	autoconf >= 2.60
@@ -26,13 +27,11 @@ BuildRequires:	automake
 BuildRequires:	bzip2-devel
 %{?with_clamav:BuildRequires:	clamav-devel}
 %{?with_compface:BuildRequires:	compface-devel}
-BuildRequires:	gdk-pixbuf-devel >= 0.8
 BuildRequires:	gettext-devel
 BuildRequires:	gmp-devel
 %{?with_gpg:BuildRequires:	gpgme-devel >= 1:0.4.5}
 BuildRequires:	gtk+2-devel >= 2:2.6.0
-BuildRequires:	imlib-devel >= 1.9
-BuildRequires:	libetpan-devel >= 0.48
+BuildRequires:	libetpan-devel >= 0.49
 %{?with_gnomeprint:BuildRequires:	libgnomeprintui-devel}
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool
@@ -44,6 +43,7 @@ BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	startup-notification-devel >= 0.5
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
+Provides:	sylpheed-claws
 Obsoletes:	sylpheed
 Obsoletes:	sylpheed-claws
 Obsoletes:	sylpheed-gtk2
@@ -65,8 +65,10 @@ Summary(pl):	Pliki nag
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 Requires:	gpgme-devel >= 1:0.4.5
-Requires:	libetpan-devel >= 0.48
+Requires:	libetpan-devel >= 0.49
 Requires:	openssl-devel >= 0.9.7d
+Provides:	sylpheed-claws-devel
+Obsoletes:	sylpheed-claws-devel
 
 %description devel
 Claws-Mail development package.
@@ -80,7 +82,7 @@ Summary(pl):	Dodatkowe wtyczki dla Claws-Mail (metapakiet)
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-plugin-bogofilter = %{version}-%{release}
-%{?with_clamav:Requires: %{name}-plugin-clamav = %{version}-%{release}}
+%{?with_clamav:Requires:	%{name}-plugin-clamav = %{version}-%{release}}
 Requires:	%{name}-plugin-dillo = %{version}-%{release}
 %if %{with gpg}
 Requires:	%{name}-plugin-pgpinline = %{version}-%{release}
@@ -88,7 +90,8 @@ Requires:	%{name}-plugin-pgpmime = %{version}-%{release}
 %endif
 Requires:	%{name}-plugin-spamassassin = %{version}-%{release}
 Requires:	%{name}-plugin-trayicon = %{version}-%{release}
-Conflicts:	sylpheed-claws-plugins
+Provides:	sylpheed-claws-plugins = %{version}
+Obsoletes:	sylpheed-claws-plugins
 
 %description plugins
 This is collection of some usefull plugins for Claws-Mail
@@ -104,7 +107,8 @@ Summary(pl):	Wtyczka bogofilter dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 Requires:	bogofilter
-Conflicts:	sylpheed-claws-plugin-bogofilter
+Provides:	sylpheed-claws-plugin-bogofilter
+Obsoletes:	sylpheed-claws-plugin-bogofilter
 
 %description plugin-bogofilter
 This plugin enables the scanning of incoming mail received from a POP,
@@ -122,6 +126,8 @@ Summary:	clamav plugin for Claws-Mail
 Summary(pl):	Wtyczka clamav dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-clamav
+Obsoletes:	sylpheed-claws-plugin-clamav
 Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 
 %description plugin-clamav
@@ -141,6 +147,8 @@ Summary(pl):	Wtyczka dillo dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 Requires:	dillo
+Provides:	sylpheed-claws-plugin-dillo
+Obsoletes:	sylpheed-claws-plugin-dillo
 Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 
 %description plugin-dillo
@@ -156,6 +164,8 @@ Summary:	PGP/Core plugin for Claws-Mail
 Summary(pl):	Wtyczka PGP/Core dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-pgpcore
+Obsoletes:	sylpheed-claws-plugin-pgpcore
 Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 
 %description plugin-pgpcore
@@ -169,6 +179,8 @@ Summary:	PGP/Inline plugin for Claws-Mail
 Summary(pl):	Wtyczka PGP/Inline dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name}-plugin-pgpcore = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-pgpinline
+Obsoletes:	sylpheed-claws-plugin-pgpinline
 Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 
 %description plugin-pgpinline
@@ -185,6 +197,8 @@ Summary:	PGP/MIME plugin for Claws-Mail
 Summary(pl):	Wtyczka PGP/MIME dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name}-plugin-pgpcore = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-pgpmime
+Obsoletes:	sylpheed-claws-plugin-pgpmime
 Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 
 %description plugin-pgpmime
@@ -201,6 +215,8 @@ Summary:	spamassassin plugin for Claws-Mail
 Summary(pl):	Wtyczka spamassassin dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-spamassassin
+Obsoletes:	sylpheed-claws-plugin-spamassassin
 Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 
 %description plugin-spamassassin
@@ -221,6 +237,8 @@ Summary:	trayicon plugin for Claws-Mail
 Summary(pl):	Wtyczka trayicon dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-trayicon
+Obsoletes:	sylpheed-claws-plugin-trayicon
 Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 
 %description plugin-trayicon
@@ -237,6 +255,7 @@ najpopularniejsze operacje.
 
 %prep
 %setup -q
+%patch0 -p1
 
 rm -f po/stamp-po
 
@@ -281,7 +300,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{deps,la}
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/manual/{en,es,fr,pl}/*.{pdf,ps,html}
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/RELEASE_NOTES
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/manual/{en,es,fr,pl}/*.{pdf,ps,html}
 
 %find_lang %{name}
 
@@ -296,18 +316,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README* TODO
+%doc AUTHORS ChangeLog NEWS README* RELEASE_NOTES TODO
 %{_mandir}/man1/%{name}.1*
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/manual
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/manual
 %dir %{_datadir}/%{name}/themes
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
-%{_datadir}/%{name}/manual/en
-%lang(es) %{_datadir}/%{name}/manual/es
-%lang(fr) %{_datadir}/%{name}/manual/fr
-%lang(pl) %{_datadir}/%{name}/manual/pl
+%{_docdir}/%{name}/manual/en
+%lang(es) %{_docdir}/%{name}/manual/es
+%lang(fr) %{_docdir}/%{name}/manual/fr
+%lang(pl) %{_docdir}/%{name}/manual/pl
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
 %{_iconsdir}/hicolor/48x48/apps/%{name}.png