SPECS: courier-imap.spec - LDFLAGS hack to confuse adapter - adapt...

glen glen at pld-linux.org
Tue Oct 4 17:38:47 CEST 2005 

Author: glen                         Date: Tue Oct  4 15:38:47 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- LDFLAGS hack to confuse adapter
- adapterized
- do not move source files in %install -- breaks --short-circuit!

---- Files affected:
SPECS:
   courier-imap.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: SPECS/courier-imap.spec
diff -u SPECS/courier-imap.spec:1.151 SPECS/courier-imap.spec:1.152
--- SPECS/courier-imap.spec:1.151	Sat Sep 17 18:39:13 2005
+++ SPECS/courier-imap.spec	Tue Oct  4 17:38:42 2005
@@ -3,7 +3,7 @@
 Summary(pl):	Serwer Courier-IMAP
 Name:		courier-imap
 Version:	4.0.5
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
@@ -28,8 +28,8 @@
 BuildRequires:	procps
 BuildRequires:	sed >= 4.0
 BuildRequires:	sysconftool
-PreReq:		%{name}-common = %{version}-%{release}
-PreReq:		rc-scripts
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	pam >= 0.79.0
 Provides:	imapdaemon
@@ -53,7 +53,7 @@
 Summary:	Common files for imap and pop3 daemons
 Summary(pl):	Pliki wspólne dla serwerów imap i pop3
 Group:		Networking/Daemons
-PreReq:		rc-scripts
+Requires:	rc-scripts
 Requires(pre):	courier-authlib
 Requires(post,preun):	/sbin/chkconfig
 Requires:	procps
@@ -94,7 +94,7 @@
 Summary:	Courier-IMAP POP3 Server
 Summary(pl):	Serwer Courier-IMAP POP3
 Group:		Networking/Daemons
-PreReq:		%{name}-common = %{version}-%{release}
+Requires:	%{name}-common = %{version}-%{release}
 Requires:	pam >= 0.77.3
 Provides:	pop3daemon
 Obsoletes:	pop3daemon
@@ -128,7 +128,7 @@
         cd "`dirname "$FILE"`"
 
         if [ -f Makefile.am ]; then
-                sed -i -e '/_LDFLAGS=-static/d' Makefile.am
+				sed -i -e '/_[L]DFLAGS=-static/d' Makefile.am
         fi
 
         %{__libtoolize}
@@ -164,15 +164,14 @@
 
 rm -rf $RPM_BUILD_ROOT%{_sbindir}/mk*cert
 
-mv -f imap/README README.imap
-mv -f imap/ChangeLog ChangeLog
-mv -f maildir/README.maildirquota.txt README.maildirquota
+install imap/README README.imap
+install imap/ChangeLog ChangeLog
+install maildir/README.maildirquota.txt README.maildirquota
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert \
-	$RPM_BUILD_ROOT%{_sbindir}
+mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert $RPM_BUILD_ROOT%{_sbindir}
 
-mv -f tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
-mv -f imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
+install tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
+install imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
@@ -412,6 +411,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2005/10/04 15:38:42  glen
+- LDFLAGS hack to confuse adapter
+- adapterized
+- do not move source files in %install -- breaks --short-circuit!
+
 Revision 1.151  2005/09/17 16:39:13  paszczus
 - updated to 4.0.5
 
@@ -471,7 +475,7 @@
 - updated to 4.0.0; TODO
 - removed userdb, authldap, authmysql, authpgsql packages
 - added -build.patch - configure problems
-- %%files, %%install fixes
+- %files, %install fixes
 
 Revision 1.136  2004/11/10 13:47:03  paladine
 - cosmetics
@@ -501,7 +505,7 @@
 Revision 1.128  2004/07/20 12:55:55  andree
 - define _localstatedir to /var/spool/courier-imap
 - add trigger to change TLS_CACHEFILE to right location
-- updated to 3.0.6; %%files fixes; rel. 1
+- updated to 3.0.6; %files fixes; rel. 1
 
 Revision 1.127  2004/07/16 22:11:15  andree
 - fix trigger; rel. 2
@@ -519,12 +523,12 @@
 Revision 1.123  2004/07/08 21:16:03  andree
 - add maildir.patch - Maildir -> Mail/Maildir
 - set YES to start imapd, pop3d; trigger fixes
-- %%files fixes; rel. 0.5
+- %files fixes; rel. 0.5
 
 Revision 1.122  2004/07/08 17:47:19  andree
-- libexecdir=/usr/%%{_lib}...
+- libexecdir=/usr/%{_lib}...
 - add dirs.patch - rewrite dirs with configure
-- add certsdir.patch - change cert dir to %%{_certsdir}
+- add certsdir.patch - change cert dir to %{_certsdir}
 - summary, description fixes; triggers for certs
 
 Revision 1.121  2004/07/08 13:50:21  andree
@@ -568,7 +572,7 @@
 - more strict Build/Pre/Requires
 
 Revision 1.110  2004/04/17 10:47:35  andree
-- added missing dir %%{_sysconfdir}/shared
+- added missing dir %{_sysconfdir}/shared
 
 Revision 1.109  2004/04/02 00:55:20  andree
 - updated to 3.0.3
@@ -592,7 +596,7 @@
 Revision 1.103  2004/02/05 09:47:30  jajcus
 - Release: 3
 - don't check for res_query() - this function is never used in the sources (-imap-no_res_query.patch) - fixes building
-with ldap enabled
+  with ldap enabled
 
 Revision 1.102  2004/02/05 09:11:34  jajcus
 - Release: 2
@@ -650,8 +654,8 @@
 - many small fixes, inspired by kloczek
 
 Revision 1.85  2003/07/06 19:43:48  luzik
- - updated to 2.0.0
-   (build, work, but some errors in init script)
+- updated to 2.0.0
+  (build, work, but some errors in init script)
 
 Revision 1.84  2003/05/26 16:24:49  malekith
 - massive attack: adding Source-md5
@@ -725,11 +729,11 @@
 - base Conflicts: imap (not Obsoletes - different mbox formats!)
 - pop3 Conflicts: imap-pop3, tpop3d (the same)
 - missing pl summaries
-- new %%doc
+- new %doc
 - release 4
 
 Revision 1.66  2002/04/25 16:06:42  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.65  2002/04/11 14:41:16  qboosh
 - removed authpgsql.8 from -common (present in -authpgsql); release 3
@@ -743,12 +747,12 @@
 
 Revision 1.62  2002/02/13 23:45:10  siefca
 - courier-imap-myownquery-fix.patch added
- - added trigger clauses support
- - added configurable separation/concatenation symbols for local_part/domain
- - added '$(username)' substitution variable
- - added documentation for system administrators :>
- - allowed empty domain names in queries
- - fixed an example configuration file (authmysqlrc)
+  - added trigger clauses support
+  - added configurable separation/concatenation symbols for local_part/domain
+  - added '$(username)' substitution variable
+  - added documentation for system administrators :>
+  - allowed empty domain names in queries
+  - fixed an example configuration file (authmysqlrc)
 
 Revision 1.61  2002/02/13 00:22:36  saq
 - C-x C-s after adapterization :)
@@ -761,7 +765,7 @@
 - STBR
 
 Revision 1.59  2002/01/18 02:12:35  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.58  2002/01/08 21:03:32  siefca
 - fixed substitution variables' value cache in myownquery.patch
@@ -831,7 +835,7 @@
 - added patch which makes possible to have own database structure
 
 Revision 1.45  2001/12/07 21:12:45  mkochano
-- /etc/pam.d/* marked with %%config(noreplace).
+- /etc/pam.d/* marked with %config(noreplace).
 - Release++ (I'm too lazy to write here new release number for each
   spec. Sorry).
 
@@ -844,7 +848,7 @@
 
 Revision 1.42  2001/11/19 10:18:59  bonkey
 - release: 2
-- added --enable-unicode to %%configure
+- added --enable-unicode to %configure
 - added --with-authchangepwdir=/var/tmp (because by default configure puts
   /var/tmp/dev/null)
 - added man for couriertls
@@ -872,7 +876,7 @@
 - updated to 1.3.11.
 
 Revision 1.35  2001/09/09 18:24:22  qboosh
-- fixed %%preun pop3
+- fixed %preun pop3
 
 Revision 1.34  2001/09/09 15:50:34  qboosh
 - fixed sysconfig paths in *auth* post/preun scripts
@@ -884,8 +888,8 @@
 
 Revision 1.32  2001/08/14 20:39:49  qboosh
 - separated authdaemond.{ldap,mysql} into subpackages (they require more libs)
-- in %%post/%%preun authdaemon is restarted depeding on current METHOD setting
-- added %%config(noreplace) %%verify(not size mtime md5) to auth* config files
+- in %post/%preun authdaemon is restarted depeding on current METHOD setting
+- added %config(noreplace) %verify(not size mtime md5) to auth* config files
 - some manuals moved to appropriate subpackages
 - release 2
 
@@ -936,10 +940,10 @@
 - modyfications for using neew rpm automation.
 
 Revision 1.17  2000/06/09 07:54:40  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.16  2000/06/09 07:22:48  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.15  2000/05/02 21:21:47  baggins
 - fixed version, minor cleanup
@@ -958,7 +962,7 @@
 - updated init script to rc-scripts 0.2.0
 
 Revision 1.11  2000/03/28 11:10:59  arturs
-typo
+- typo
 
 Revision 1.10  2000/03/27 13:25:08  arturs
 - added %description -l pl
================================================================

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

More information about the pld-cvs-commit mailing list