Attachment 148781 Details for Bug 225708 – Diff of spec file changes for merge review items

[patch] Diff of spec file changes for merge review items

dovecot_spec.diff (text/plain), 6.06 KB, created by Jef Spaleta on 2007-02-26 07:18:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jef Spaleta

Created: 2007-02-26 07:18:28 UTC

Size: 6.06 KB

patch

obsolete

>--- /tmp/dovecot.spec	2007-02-25 22:11:27.000000000 -0900
>+++ dovecot.spec	2007-02-25 22:08:52.000000000 -0900
>@@ -1,7 +1,7 @@
> Summary: Dovecot Secure imap server
> Name: dovecot
> Version: 1.0
>-Release: 3.rc22%{?dist}
>+Release: 4.rc22%{?dist}
> License: LGPL
> Group: System Environment/Daemons
> 
>@@ -9,7 +9,7 @@
> %define build_mysql 1
> %define upstream 1.0.rc22
> 
>-Source: %{name}-%{upstream}.tar.gz
>+Source: http://www.dovecot.org/releases/%{name}-%{upstream}.tar.gz
> Source1: dovecot.init
> Source2: dovecot.pam
> Source3: maildir-migration.txt
>@@ -21,7 +21,8 @@
> 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 +44,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
>@@ -81,7 +88,7 @@
> autoreconf
> %configure                           \
>     INSTALL_DATA="install -c -p -m644" \
>-    --with-doc		             \
>+    --with-doc                         \
> %if %{build_postgres}
>     --with-pgsql                 \
> %endif
>@@ -100,6 +107,16 @@
> rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT
> rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}
>+#remove the static libs and libtool archives
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.a
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/imap/*.la
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/imap/*.a
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/pop3/*.la
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/pop3/*.a
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lda/*.la
>+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lda/*.a
>+
> mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
> install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/dovecot
> 
>@@ -125,18 +142,23 @@
> 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}
>@@ -168,7 +190,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
>@@ -196,25 +218,29 @@
> 
> %files
> %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}
> %{_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
> 
> 
> %changelog
>+* Sun Feb 25 2007 Jef Spaleta <jspaleta@gmail.com> - 1.0-4.rc22
>+- Merge review changes
>+
> * Thu Feb 08 2007 Tomas Janousek <tjanouse@redhat.com> - 1.0-3.rc22
> - update to latest upstream, fixes a few bugs
> 
>@@ -559,8 +585,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
>

Actions: View | Diff

Attachments on bug 225708: 148781