- spec file cleanup (fixes docs path)

This commit is contained in:
Tomas Janousek 2007-03-30 12:05:16 +00:00
parent 6770a05505
commit 0133c111b8

View File

@ -1,7 +1,13 @@
%define pkg_version 1.0
%define my_release 8.1
%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 Summary: Dovecot Secure imap server
Name: dovecot Name: dovecot
Version: 1.0 Version: %{pkg_version}
Release: 8.rc28%{?dist} Release: %{pkg_release}
License: LGPL License: LGPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -9,6 +15,7 @@ Group: System Environment/Daemons
%define build_mysql 1 %define build_mysql 1
%define upstream 1.0.rc28 %define upstream 1.0.rc28
%define build_sieve 1
%define sieve_name dovecot-sieve %define sieve_name dovecot-sieve
%define sieve_upstream 1.0.1 %define sieve_upstream 1.0.1
@ -75,19 +82,24 @@ Dovecot is an IMAP server for Linux/UNIX-like systems, written with security
primarily in mind. It also contains a small POP3 server. It supports mail primarily in mind. It also contains a small POP3 server. It supports mail
in either of maildir or mbox formats. in either of maildir or mbox formats.
%if %{build_sieve}
%package sieve %package sieve
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Summary: CMU Cieve plugin for dovecot LDA Summary: CMU Cieve plugin for dovecot LDA
Group: System Environment/Daemons Group: System Environment/Daemons
Version: 1.0.1 Version: %{pkg_sieve_version}
Release: 1.8%{?dist} Release: %{pkg_sieve_release}
%description sieve %description sieve
This package provides the CMU Cieve plugin for dovecot LDA. This package provides the CMU Cieve plugin for dovecot LDA.
%endif
%define version %{pkg_version}
%define release %{pkg_release}
%prep %prep
%setup -q -n %{name}-%{upstream} -a 8 %setup -q -n %{name}-%{upstream}
%patch100 -p1 -b .default-settings %patch100 -p1 -b .default-settings
%patch101 -p2 -b .pam-tty %patch101 -p2 -b .pam-tty
@ -96,6 +108,10 @@ This package provides the CMU Cieve plugin for dovecot LDA.
#%patch104 -p1 -b .lib64 #%patch104 -p1 -b .lib64
%patch105 -p1 -b .mkcert-paths %patch105 -p1 -b .mkcert-paths
%if %{build_sieve}
%setup -q -n %{name}-%{upstream} -D -T -a 8
%endif
%build %build
rm -f ./configure rm -f ./configure
libtoolize -f libtoolize -f
@ -117,6 +133,7 @@ autoreconf
make make
%if %{build_sieve}
cd %{sieve_name}-%{sieve_upstream} cd %{sieve_name}-%{sieve_upstream}
rm -f ./configure rm -f ./configure
@ -127,6 +144,7 @@ autoreconf
--with-dovecot=../ --with-dovecot=../
make make
%endif
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -180,10 +198,12 @@ done
mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version} mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version}
mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot
%if %{build_sieve}
# dovecot-sieve # dovecot-sieve
pushd %{sieve_name}-%{sieve_upstream} pushd %{sieve_name}-%{sieve_upstream}
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
popd popd
%endif
#remove the static libs and libtool archives #remove the static libs and libtool archives
find $RPM_BUILD_ROOT/%{_libdir}/%{name}/ -name '*.a' -or -name '*.la' | xargs rm -f find $RPM_BUILD_ROOT/%{_libdir}/%{name}/ -name '*.a' -or -name '*.la' | xargs rm -f
@ -267,12 +287,17 @@ rm -rf $RPM_BUILD_ROOT
#%attr(0755,root,dovecot) %{_libexecdir}/%{name}/mkcert.sh #%attr(0755,root,dovecot) %{_libexecdir}/%{name}/mkcert.sh
%attr(0750,dovecot,dovecot) %dir /var/lib/dovecot %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
%if %{build_sieve}
%files sieve %files sieve
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so %{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so
%endif
%changelog %changelog
* Fri Mar 30 2007 Tomas Janousek <tjanouse@redhat.com> - 1.0-8.1.rc28
- spec file cleanup (fixes docs path)
* Fri Mar 23 2007 Tomas Janousek <tjanouse@redhat.com> - 1.0-8.rc28 * Fri Mar 23 2007 Tomas Janousek <tjanouse@redhat.com> - 1.0-8.rc28
- update to latest upstream - update to latest upstream