SPECS: mutt.spec - updated pl.po-update patch - forcedotlock patch...

[qboosh]

Author: qboosh                       Date: Sun Jun  3 11:37:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated pl.po-update patch
- forcedotlock patch is back, now fixing only sgid install
- pass mutt_cv_{group,world}write to stabilize builds not to depend on local
  /var/mail permissions and get proper sgid support
- don't pass --with-homespool as it disables --with-mailpath and sgid support;
  maildir support is still available through $MAILDIR envvar

---- Files affected:
SPECS:
   mutt.spec (1.198 -> 1.199) 

---- Diffs:

================================================================
Index: SPECS/mutt.spec
diff -u SPECS/mutt.spec:1.198 SPECS/mutt.spec:1.199
--- SPECS/mutt.spec:1.198	Sat Jun  2 17:40:02 2007
+++ SPECS/mutt.spec	Sun Jun  3 13:37:04 2007
@@ -29,8 +29,8 @@
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
-#Patch0:		%{name}-pl.po-update.patch
-#Patch1:		%{name}-forcedotlock.patch
+Patch0:		%{name}-pl.po-update.patch
+Patch1:		%{name}-forcedotlock.patch
 Patch2:		%{name}-rr.compressed.patch
 Patch3:		%{name}-bj.status-time.patch
 Patch4:		%{name}-vvv.quote.patch
@@ -134,8 +134,8 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -166,28 +166,28 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	mutt_cv_groupwrite=yes \
+	mutt_cv_worldwrite=no \
 	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
 	--disable-warnings \
 	--enable-compressed \
 	--enable-external-dotlock \
 	--enable-gpgme \
+	--enable-hcache \
 	--enable-imap \
 	--enable-mailtool \
 	%{?with_nntp:--enable-nntp} \
 	--enable-pop \
-	--enable-hcache \
 	%{!?with_slang:--with-curses} \
 	%{?with_slang:--with-slang} \
 	--with-docdir=%{_docdir}/%{name} \
-	%{?with_home_etc:--with-home-etc} %{!?with_home_etc:--without-home-etc} \
-	--with-homespool=Maildir \
+	%{?with_home_etc:--with-home-etc} \
 	%{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
 	--with-mailpath=/var/mail \
-	--with-regex \
 	--with-mixmaster \
+	--with-regex \
 	%{?with_sasl:--with-sasl2} \
-	--with-ssl \
-	--without-included-gettext
+	--with-ssl
 
 %{__make}
 %{__make} manual.txt -C doc
@@ -197,7 +197,8 @@
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	DOTLOCK_GROUP=
 
 %{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12}
 
@@ -242,6 +243,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.199  2007/06/03 11:37:04  qboosh
+- updated pl.po-update patch
+- forcedotlock patch is back, now fixing only sgid install
+- pass mutt_cv_{group,world}write to stabilize builds not to depend on local
+  /var/mail permissions and get proper sgid support
+- don't pass --with-homespool as it disables --with-mailpath and sgid support;
+  maildir support is still available through $MAILDIR envvar
+
 Revision 1.198  2007/06/02 15:40:02  radek
 - release 1: updated home_etc.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.198&r2=1.199&f=u