rpms/dovecot/FC-6 .cvsignore, 1.16, 1.17 dovecot.spec, 1.64, 1.65 sources, 1.17, 1.18

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 30 09:27:09 UTC 2007 

Author: tjanouse

Update of /cvs/dist/rpms/dovecot/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv10053

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Fri Mar 30 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-2.rc28
- merge from devel:
    - spec file cleanup (fixes docs path)
    - update to latest upstream (1.0.rc28)
    - use dovecot-sieve's version for the package
    - update to latest upstream (1.0.rc27)
    - added dovecot-sieve (not built for fc6 though)
    - update to latest upstream (1.0.rc25)
    - Merge review changes
    - update to latest upstream, fixes a few bugs (1.0.rc22)
    - update to latest upstream, fixes a few bugs (1.0.rc17)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	21 Nov 2006 09:39:55 -0000	1.16
+++ .cvsignore	30 Mar 2007 09:27:07 -0000	1.17
@@ -1 +1,4 @@
-dovecot-1.0.rc15.tar.gz
+dovecot-1.0.rc28.tar.gz
+dovecot-1.0.rc28.tar.gz.sig
+dovecot-sieve-1.0.1.tar.gz
+dovecot-sieve-1.0.1.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-6/dovecot.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- dovecot.spec	22 Dec 2006 08:10:40 -0000	1.64
+++ dovecot.spec	30 Mar 2007 09:27:07 -0000	1.65
@@ -1,15 +1,25 @@
+%define pkg_version 1.0
+%define my_release 2
+%define pkg_release %{my_release}.rc28%{?dist}
+%define pkg_sieve_version 1.0.1
+%define pkg_sieve_release %{my_release}%{?dist}
+
 Summary: Dovecot Secure imap server
 Name: dovecot
-Version: 1.0
-Release: 1.1.rc15%{?dist}
+Version: %{pkg_version}
+Release: %{pkg_release}
 License: LGPL
 Group: System Environment/Daemons
 
 %define build_postgres 1
 %define build_mysql 1
-%define upstream 1.0.rc15
+%define upstream 1.0.rc28
+
+%define build_sieve 0
+%define sieve_name dovecot-sieve
+%define sieve_upstream 1.0.1
 
-Source: %{name}-%{upstream}.tar.gz
+Source: http://dovecot.org/releases/%{name}-%{upstream}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
 Source3: maildir-migration.txt
@@ -17,11 +27,13 @@
 Source5: migrate-users
 Source6: perfect_maildir.pl
 Source7: dovecot-REDHAT-FAQ.txt
+Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
 Patch100: dovecot-1.0.rc15-default-settings.patch
 Patch101: dovecot-1.0.beta2-pam-tty.patch
 Patch102: dovecot-1.0.rc2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
-Patch104: dovecot-1.0.beta2-lib64.patch
+# 104 not applied
+#Patch104: dovecot-1.0.beta2-lib64.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
 #Patch105: dovecot-1.0.beta2-sqlite-check.patch
 
@@ -43,7 +55,13 @@
 # gettext-devel is needed for running autoconf because of the
 # presence of AM_ICONV
 BuildRequires: gettext-devel
-Prereq: openssl >= 0.9.7f-4, /sbin/chkconfig, /usr/sbin/useradd
+# Explicit Runtime Requirements
+Requires: openssl >= 0.9.7f-4
+# Package includes an initscript service file, needs to require initscripts package
+Requires: initscripts
+Requires(pre): /sbin/chkconfig, /usr/sbin/useradd, /sbin/service, /bin/touch, /bin/rm
+Requires(post): /sbin/chkconfig, /usr/sbin/useradd, /sbin/chkconfig, /bin/mv, /bin/rm
+Requires(preun): /usr/sbin/userdel, /usr/sbin/groupdel, /sbin/chkconfig, /sbin/service
 
 %if %{build_postgres}
 BuildRequires: postgresql-devel
@@ -64,6 +82,21 @@
 primarily in mind.  It also contains a small POP3 server.  It supports mail 
 in either of maildir or mbox formats.
 
+%if %{build_sieve}
+%package sieve
+Requires: %{name} = %{version}-%{release}
+Summary: CMU Cieve plugin for dovecot LDA
+Group: System Environment/Daemons
+Version: %{pkg_sieve_version}
+Release: %{pkg_sieve_release}
+
+%description sieve
+This package provides the CMU Cieve plugin for dovecot LDA.
+%endif
+
+%define version %{pkg_version}
+%define release %{pkg_release}
+
 %prep
 
 %setup -q -n %{name}-%{upstream}
@@ -75,13 +108,17 @@
 #%patch104 -p1 -b .lib64
 %patch105 -p1 -b .mkcert-paths
 
+%if %{build_sieve}
+%setup -q -n %{name}-%{upstream} -D -T -a 8
+%endif
+
 %build
 rm -f ./configure
 libtoolize -f
 autoreconf
 %configure                           \
     INSTALL_DATA="install -c -p -m644" \
-    --with-doc		             \
+    --with-doc                         \
 %if %{build_postgres}
     --with-pgsql                 \
 %endif
@@ -96,10 +133,24 @@
 
 make
 
+%if %{build_sieve}
+cd %{sieve_name}-%{sieve_upstream}
+
+rm -f ./configure
+libtoolize -f
+autoreconf
+%configure                           \
+    INSTALL_DATA="install -c -p -m644" \
+    --with-dovecot=../
+%endif
+
+make
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}
+
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/dovecot
 
@@ -121,27 +172,49 @@
 # Install dovecot.conf and dovecot-openssl.cnf
 mkdir -p $RPM_BUILD_ROOT/%{ssldir}
 install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/dovecot-example.conf $RPM_BUILD_ROOT/%{_sysconfdir}/dovecot.conf
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/dovecot-example.conf # dovecot seems to install this by itself
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/dovecot-*example.conf # dovecot seems to install this by itself
 install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/dovecot-openssl.cnf $RPM_BUILD_ROOT/%{ssldir}/dovecot-openssl.cnf
 
 # Install some of our own documentation
-install -p -m644 $RPM_SOURCE_DIR/dovecot-REDHAT-FAQ.txt $RPM_BUILD_ROOT%{docdir}/REDHAT-FAQ.txt
+install -p -m644 %{SOURCE7} $RPM_BUILD_ROOT%{docdir}/REDHAT-FAQ.txt
+
+# Install the licensing files into the documentation area
+install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/COPYING  $RPM_BUILD_ROOT%{docdir}/COPYING
+install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/COPYING.MIT  $RPM_BUILD_ROOT%{docdir}/COPYING.MIT
+install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/COPYING.LGPL  $RPM_BUILD_ROOT%{docdir}/COPYING.LGPL
 
 mkdir -p $RPM_BUILD_ROOT%{docdir}/examples/
-install -p -m755 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/mkcert.sh $RPM_BUILD_ROOT%{docdir}/examples/mkcert.sh
+install -p -m755 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/mkcert.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/mkcert.sh
 for f in `cd $RPM_BUILD_DIR/dovecot-%{upstream}/doc; echo *.conf`; do
-	install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/$f $RPM_BUILD_ROOT%{docdir}/examples/$f;
+     install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/$f $RPM_BUILD_ROOT%{docdir}/examples/$f;
 done
 
 install -p -m755 -d $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration
-for f in maildir-migration.txt migrate-folders migrate-users perfect_maildir.pl
+for f in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}
 do
-    install -p -m644 $RPM_SOURCE_DIR/$f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration
+    install -p -m644 $f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration
 done
 
 mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version}
 mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot
 
+%if %{build_sieve}
+# dovecot-sieve
+pushd %{sieve_name}-%{sieve_upstream}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+%endif
+
+#remove the static libs and libtool archives
+find $RPM_BUILD_ROOT/%{_libdir}/%{name}/ -name '*.a' -or -name '*.la' | xargs rm -f
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/dovecot-config
+
+#prepare the filelist
+(
+    find ${RPM_BUILD_ROOT}/%{_libdir}/%{name} -type d | sed -e "s|^|%dir |";
+    find ${RPM_BUILD_ROOT}/%{_libdir}/%{name} -! -type d | grep -v 'lib90_cmusieve_plugin.so';
+) | sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist
+
 %pre
 /usr/sbin/useradd -c "dovecot" -u %{dovecot_uid} -s /sbin/nologin -r -d /usr/libexec/dovecot dovecot 2>/dev/null || :
 
@@ -168,7 +241,7 @@
 fi
 if [ ! -f %{ssldir}/certs/%{name}.pem ]; then
 SSLDIR=%{ssldir} OPENSSLCONFIG=%{ssldir}/dovecot-openssl.cnf \
-	%{docdir}-%{version}/examples/mkcert.sh &> /dev/null
+     %{_libexecdir}/%{name}/mkcert.sh &> /dev/null
 fi
 
 if ! test -f /var/run/dovecot/login/ssl-parameters.dat; then
@@ -194,33 +267,52 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f libs.filelist
 %defattr(-,root,root)
-%doc %{docdir}-%{version}
+%doc %{docdir}-%{version}  
 %config(noreplace) %{_sysconfdir}/dovecot.conf
 %config %{_sysconfdir}/rc.d/init.d/dovecot
-%config %{_sysconfdir}/pam.d/dovecot
+%config(noreplace) %{_sysconfdir}/pam.d/dovecot
+%dir %{ssldir}
+%dir %{ssldir}/certs
 %config(noreplace) %{ssldir}/dovecot-openssl.cnf
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/dovecot.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem
-%dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
 %{_sbindir}/dovecot
 %{_sbindir}/dovecotpw
 %attr(0755,root,dovecot) %dir /var/run/dovecot
 %attr(0750,root,dovecot) %dir /var/run/dovecot/login
-%attr(0750,root,dovecot) %{docdir}-%{version}/examples/mkcert.sh
+#%attr(0755,root,dovecot) %{_libexecdir}/%{name}/mkcert.sh
 %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
 
+%if %{build_sieve}
+%files sieve
+%defattr(-,root,root)
+%{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so
+%endif
+
 
 %changelog
+* Fri Mar 30 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-2.rc28
+- merge from devel:
+    - spec file cleanup (fixes docs path)
+    - update to latest upstream (1.0.rc28)
+    - use dovecot-sieve's version for the package
+    - update to latest upstream (1.0.rc27)
+    - added dovecot-sieve (not built for fc6 though)
+    - update to latest upstream (1.0.rc25)
+    - Merge review changes
+    - update to latest upstream, fixes a few bugs (1.0.rc22)
+    - update to latest upstream, fixes a few bugs (1.0.rc17)
+
 * Thu Dec 21 2006 Tomas Janousek <tjanouse at redhat.com> - 1.0-1.1.rc15
 - reenabled GSSAPI (#220377)
 
 * Tue Nov 21 2006 Petr Rockai <prockai at redhat.com> - 1.0-1.rc15
 - update to latest upstream, fixes a few bugs, plus a security
-  vulnerability (#216510, CVE-2006-5973)
+  vulnerability (#216508, CVE-2006-5973)
 
 * Tue Oct 10 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.3.rc7
 - fix few inconsistencies in specfile, fixes #198940
@@ -553,8 +645,8 @@
 - clean up description and %%preun
 - add dovecot user (uid/gid of 97)
 - add some buildrequires
-- move the ssl cert to %{_datadir}/ssl/certs
-- create a dummy ssl cert in %post
+- move the ssl cert to %%{_datadir}/ssl/certs
+- create a dummy ssl cert in %%post
 - own /var/run/dovecot
 - make the config file a source so we get default mbox locks of fcntl
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	21 Nov 2006 09:39:55 -0000	1.17
+++ sources	30 Mar 2007 09:27:07 -0000	1.18
@@ -1 +1,4 @@
-26f3d2b075856b1b1d180146363819e6  dovecot-1.0.rc15.tar.gz
+e6fd617f3210f914815186c176796881  dovecot-1.0.rc28.tar.gz
+a3198c2db6b43472bc3afdd51e538711  dovecot-1.0.rc28.tar.gz.sig
+b070d2177009bb555cd7e25c710047d5  dovecot-sieve-1.0.1.tar.gz
+c9f5a39ef66e427968141f265c879d60  dovecot-sieve-1.0.1.tar.gz.sig

More information about the fedora-cvs-commits mailing list