X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mutt.spec;h=f1250161d6a0dcf85d06a28241a28773082c5d9e;hb=e840eb4b3c482cb6c2e9417dde7f2092fba3c68e;hp=3c00604f9800c41445d41caf049547e70854e7b2;hpb=71038c3d71ad46f56a560b5587fa69b65ad7c338;p=packages%2Fmutt.git

diff --git a/mutt.spec b/mutt.spec
index 3c00604..f125016 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,9 +1,10 @@
 #
 # Conditional build:
-# _with_slang	- use slang library instead of ncurses
-# _with_nntp	- use VVV's NNTP patch
-# _with_esmtp   - use esmtp patch
-# _without_sasl - don't use sasl
+%bcond_with slang		# use slang library instead of ncurses
+%bcond_with nntp		# use VVV's NNTP patch
+%bcond_with esmtp		# use esmtp patch
+%bcond_without sasl		# don't use sasl
+%bcond_without home_etc		# don't use home_etc
 #
 Summary:	The Mutt Mail User Agent
 Summary(de):	Der Mutt Mail-User-Agent
@@ -17,7 +18,7 @@ Summary(tr):	Mutt elektronik posta program
 Summary(uk):	ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:		mutt
 Version:	1.4.1
-Release:	4
+Release:	7
 Epoch:		5
 License:	GPL
 Group:		Applications/Mail
@@ -26,7 +27,6 @@ Source0:	ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
-Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-forcedotlock.patch
 Patch2:		%{name}-muttbug-tmp.patch
 Patch3:		%{name}-rr.compressed.patch
@@ -48,20 +48,22 @@ Patch18:	%{name}-xface.patch
 Patch19:	%{name}-sasl2.patch
 Patch20:	%{name}-nntp.patch
 Patch21:	%{name}-esmtp.patch
-Patch22:	%{name}-home_etc2.patch
+Patch22:	%{name}-home_etc.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
+%{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
+%{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
 BuildRequires:	gettext-devel
-%{!?_with_slang:BuildRequires:		ncurses-devel >= 5.0}
+%{!?with_slang:BuildRequires:	ncurses-devel >= 5.0}
 BuildRequires:	openssl-devel >= 0.9.7c
 BuildRequires:	sgml-tools
 BuildRequires:	sgml-tools-dtd
-%{?_with_slang:BuildRequires:		slang-devel}
-%{?_with_esmtp:BuildRequires:       libesmtp-devel}
+%{?with_slang:BuildRequires:	slang-devel}
+%{?with_esmtp:BuildRequires:	libesmtp-devel}
 Requires:	iconv
 Requires:	mailcap
+%{?with_home_etc:Requires:	home-etc >= 1.0.8}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	"-fomit-frame-pointer"
@@ -125,7 +127,6 @@ Mutt - 
 
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -143,10 +144,10 @@ Mutt - 
 %patch15 -p1
 %patch16 -p1
 %patch18 -p1
-%{!?_without_sasl:%patch19 -p1}
-%{?_with_nntp:%patch20 -p1}
-%{?_with_esmtp:%patch21 -p1}
-%patch22 -p1
+%{?with_sasl:%patch19 -p1}
+%{?with_nntp:%patch20 -p1}
+%{?with_esmtp:%patch21 -p1}
+%{?with_home_etc:%patch22 -p1}
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -157,8 +158,8 @@ rm -f doc/{manual*.html,manual.txt}
 %{__automake}
 %configure \
 	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
-	%{!?_with_slang:--with-curses} \
-	%{?_with_slang:--with-slang} \
+	%{!?with_slang:--with-curses} \
+	%{?with_slang:--with-slang} \
 	--enable-compressed \
 	--enable-external-dotlock \
 	--enable-imap \
@@ -166,10 +167,11 @@ rm -f doc/{manual*.html,manual.txt}
 	--enable-mailtool \
 	--with-mixmaster \
 	--enable-pop \
-	%{?_with_nntp:--enable-nntp} \
+	%{?with_nntp:--enable-nntp} \
 	--with-regex \
-	%{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
-    %{?_with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
+	%{?with_sasl:--with-sasl} %{!?with_sasl:--without-sasl} \
+	%{?with_home_etc:--with-home-etc} %{!?with_home_etc:--without-home-etc} \
+	%{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
 	--with-ssl \
 	--disable-warnings \
 	--with-docdir=%{_docdir}/%{name}-%{version} \
@@ -187,14 +189,14 @@ rm -f doc/{manual*.html,manual.txt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
-	$RPM_BUILD_ROOT%{_mandir}/pl/man1
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH17
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
@@ -210,7 +212,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt README.xface %{?_with_esmtp: Muttrc.esmtp}
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt README.xface %{?with_esmtp: Muttrc.esmtp}
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
@@ -218,7 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pgp*
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
-%{_applnkdir}/Network/Mail/mutt.desktop
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*