SPECS: courier-imap.spec - drop makedat, available from courier-au...

[glen]

Author: glen                         Date: Fri Jun  2 12:08:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop makedat, available from courier-authlib; rel 2

---- Files affected:
SPECS:
   courier-imap.spec (1.162 -> 1.163) 

---- Diffs:

================================================================
Index: SPECS/courier-imap.spec
diff -u SPECS/courier-imap.spec:1.162 SPECS/courier-imap.spec:1.163
--- SPECS/courier-imap.spec:1.162	Fri Jun  2 00:51:03 2006
+++ SPECS/courier-imap.spec	Fri Jun  2 14:08:01 2006
@@ -6,7 +6,7 @@
 Summary(pl):	Serwer Courier-IMAP
 Name:		courier-imap
 Version:	4.1.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
@@ -21,6 +21,7 @@
 Patch1:		%{name}-certsdir.patch
 Patch2:		%{name}-maildir.patch
 Patch3:		%{name}-toplevel.patch
+Patch4:		%{name}-drop-makedat.patch
 URL:		http://www.courier-mta.org/imap/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
@@ -124,18 +125,19 @@
 %if %{with toplevel}
 %patch3 -p1
 %endif
+%patch4 -p1
 
 install %{SOURCE1} courier-imap.in
 install %{SOURCE2} courier-imap-ssl.in
 install %{SOURCE3} courier-pop3.in
 install %{SOURCE4} courier-pop3-ssl.in
+rm -f makedat/configure.in
 
 %build
 
 # Change Makefile.am files and force recreate Makefile.in's.
-OLDDIR=`pwd`
 find -type f -a '(' -name configure.in -o -name configure.ac ')' | while read FILE; do
-	cd "`dirname "$FILE"`"
+	cd "$(dirname "$FILE")"
 
 	if [ -f Makefile.am ]; then
 		%{__sed} -i -e '/_[L]DFLAGS=-static/d' Makefile.am
@@ -147,7 +149,7 @@
 	%{__autoheader}
 	%{__automake}
 
-	cd "$OLDDIR"
+	cd -
 done
 
 %configure \
@@ -355,7 +357,6 @@
 %{_sysconfdir}/quotawarnmsg.example
 %attr(755,root,root) %{_bindir}/couriertls
 %attr(755,root,root) %{_libexecdir}/couriertcpd
-%attr(755,root,root) %{_libexecdir}/makedatprog
 %{_mandir}/man1/couriert*
 %{_mandir}/man8/couriert*
 %{_mandir}/man8/mk*
@@ -392,6 +393,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.163  2006/06/02 12:08:01  glen
+- drop makedat, available from courier-authlib; rel 2
+
 Revision 1.162  2006/06/01 22:51:03  glen
 - /etc/courier-imap should be accessible for imapd for shared folders
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/courier-imap.spec?r1=1.162&r2=1.163&f=u