rpms/cyrus-imapd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Clean up a bit.

Browse Source
This commit is contained in:
Jason Tibbitts 2015-09-09 15:21:48 -05:00
parent 10e891f3e8
commit 399f01ad19
1 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
cyrus-imapd.spec
View File

@ -1,6 +1,6 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 2.4.17 Version: 2.4.17
Release: 13%{?dist} Release: 14%{?dist}
%define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
@ -14,7 +14,6 @@ Release: 13%{?dist}
Summary: A high-performance mail server with IMAP, POP3, NNTP and SIEVE support Summary: A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
License: BSD License: BSD
Group: System Environment/Daemons
URL: http://www.cyrusimap.org/ URL: http://www.cyrusimap.org/
Source0: http://www.cyrusimap.org/releases/%{name}-%{version}.tar.gz Source0: http://www.cyrusimap.org/releases/%{name}-%{version}.tar.gz
Source1: cyrus-imapd.logrotate Source1: cyrus-imapd.logrotate
@ -25,22 +24,17 @@ Source8: cyrus-imapd.cvt_cyrusdb_all
Source9: cyrus-imapd.magic Source9: cyrus-imapd.magic
Source10: cyrus-imapd.cron-daily Source10: cyrus-imapd.cron-daily
Source11: README.rpm Source11: README.rpm
#systemd support
Source12: cyrus-imapd.service Source12: cyrus-imapd.service
Source13: cyr_systemd_helper Source13: cyr_systemd_helper
Patch3: cyrus-imapd-2.1.3-flock.patch Patch0: cyrus-imapd-2.1.3-flock.patch
Patch1: cyrus-imapd-2.3.1-authid_normalize.patch
Patch4: cyrus-imapd-2.3.1-authid_normalize.patch
# fedora/rhel specific, find current db lib, rhbz#461875 # fedora/rhel specific, find current db lib, rhbz#461875
Patch6: cyrus-imapd-2.3.12p2-current-db.patch Patch2: cyrus-imapd-2.3.12p2-current-db.patch
# for c-i <= 2.4.12 # for c-i <= 2.4.12
Patch8: cyrus-imapd-2.4.12-debugopt.patch Patch3: cyrus-imapd-2.4.12-debugopt.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: cyrus-sasl-devel, perl-devel, tcp_wrappers BuildRequires: cyrus-sasl-devel, perl-devel, tcp_wrappers
@ -91,8 +85,8 @@ store where possible when an email message is addressed to multiple
recipients, SIEVE provides server side email filtering. recipients, SIEVE provides server side email filtering.
%package devel %package devel
Group: Development/Libraries
Summary: Cyrus IMAP server development files Summary: Cyrus IMAP server development files
Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: %{name}-static = %{version}-%{release} Provides: %{name}-static = %{version}-%{release}
%description devel %description devel
@ -100,12 +94,10 @@ The %{name}-devel package contains header files and libraries
necessary for developing applications which use the imclient library. necessary for developing applications which use the imclient library.
%package utils %package utils
Group: Applications/System
Summary: Cyrus IMAP server administration utilities Summary: Cyrus IMAP server administration utilities
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires(post): grep, coreutils, make, openssl Requires(post): grep, coreutils, make, openssl
Requires(postun): shadow-utils Requires(postun): shadow-utils
Obsoletes: %{name}-perl < 2.3.16-5
%description utils %description utils
The %{name}-utils package contains administrative tools for the The %{name}-utils package contains administrative tools for the
@ -113,12 +105,7 @@ Cyrus IMAP server. It can be installed on systems other than the
one running the server. one running the server.
%prep %prep
%setup -q %autosetup -p1
%patch3 -p1 -b .flock
%patch4 -p1 -b .authid_normalize
%patch6 -p1 -b .libdb
%patch8 -p1 -b .debugopt
install -m 644 %{SOURCE11} doc/ install -m 644 %{SOURCE11} doc/
# only to update config.* files # only to update config.* files
@ -145,8 +132,6 @@ find . -type f -name "*.pl" | xargs %{__perl} -pi -e "s@/usr/local/bin/perl@%{__
find . -type f -name "*.pl" -exec chmod 755 {} \; find . -type f -name "*.pl" -exec chmod 755 {} \;
%build %build
%global _hardened_build 1
CPPFLAGS="${__global_cflags} -I%{_includedir}/et -I%{_includedir}/kerberosIV -fno-strict-aliasing"; export CPPFLAGS CPPFLAGS="${__global_cflags} -I%{_includedir}/et -I%{_includedir}/kerberosIV -fno-strict-aliasing"; export CPPFLAGS
CFLAGS="%{__global_cflags} -fno-strict-aliasing"; export CFLAGS CFLAGS="%{__global_cflags} -fno-strict-aliasing"; export CFLAGS
CCDLFLAGS="-rdynamic"; export CCDLFLAGS CCDLFLAGS="-rdynamic"; export CCDLFLAGS
@ -178,8 +163,6 @@ make LDFLAGS="$LDFLAGS -pie %{__global_ldflags}"
make -C notifyd notifytest make -C notifyd notifytest
%install %install
rm -rf %{buildroot}
# This is needed to install the perl files correctly # This is needed to install the perl files correctly
pushd perl/imap pushd perl/imap
%{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
@ -284,12 +267,10 @@ find %{buildroot} -name ".packlist" -exec rm -f {} \;
rm -f %{buildroot}%{_mandir}/man8/syncnews.8* rm -f %{buildroot}%{_mandir}/man8/syncnews.8*
find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec rm -f {} \; find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec rm -f {} \;
%clean
rm -rf %{buildroot}
%pre %pre
# Create 'cyrus' user on target host # Create 'cyrus' user on target host
getent group saslauth >/dev/null || /usr/sbin/groupadd -g %{gid} -r saslauth getent group saslauth >/dev/null || /usr/sbin/groupadd -g %{gid} -r saslauth
getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
-G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer}
@ -333,9 +314,8 @@ fi
%systemd_postun_with_restart cyrus-imapd.service %systemd_postun_with_restart cyrus-imapd.service
%files %files
%defattr(-,root,root,-) %license COPYRIGHT
%doc COPYRIGHT README %doc README doc/*
%doc doc/*
%config(noreplace) %{_sysconfdir}/cyrus.conf %config(noreplace) %{_sysconfdir}/cyrus.conf
%config(noreplace) %{_sysconfdir}/imapd.conf %config(noreplace) %{_sysconfdir}/imapd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@ -433,18 +413,15 @@ fi
%attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file} %attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
%files devel %files devel
%defattr(0644,root,root,0755)
%doc COPYRIGHT
%{_includedir}/cyrus %{_includedir}/cyrus
%{_libdir}/lib*.a %{_libdir}/lib*.a
%{_mandir}/man3/imclient.3* %{_mandir}/man3/imclient.3*
%files utils %files utils
%defattr(-,root,root) %license COPYRIGHT
%doc perl/imap/README %doc perl/imap/README
%doc perl/imap/Changes %doc perl/imap/Changes
%doc perl/imap/examples %doc perl/imap/examples
%doc COPYRIGHT
%{_bindir}/* %{_bindir}/*
%dir %{perl_vendorarch}/Cyrus %dir %{perl_vendorarch}/Cyrus
%dir %{perl_vendorarch}/Cyrus/IMAP %dir %{perl_vendorarch}/Cyrus/IMAP
@ -469,6 +446,11 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Wed Sep 09 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.4.17-14
- Use %%license tag
- Have -devel require the base package
- Minor cleanups
* Sat Aug 08 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.4.17-13 * Sat Aug 08 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.4.17-13
- Remove invalid Patch0: URL. - Remove invalid Patch0: URL.
- Use HTTP for upstream source. - Use HTTP for upstream source.
@ -554,11 +536,11 @@ fi
- New upstream release - New upstream release
* Wed Dec 07 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-5 * Wed Dec 07 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-5
- do not use digest-md5 as part of default auth mechanisms, - do not use digest-md5 as part of default auth mechanisms,
it does not coop with pam it does not coop with pam
* Tue Nov 22 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-4 * Tue Nov 22 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-4
- reduce noisy logging, add option to turn on LOG_DEBUG syslog - reduce noisy logging, add option to turn on LOG_DEBUG syslog
messages again (thanks Philip Prindeville) (#754940) messages again (thanks Philip Prindeville) (#754940)
* Mon Oct 24 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-3 * Mon Oct 24 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-3
@ -602,10 +584,10 @@ fi
* Thu Apr 14 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.8-1 * Thu Apr 14 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.8-1
- cyrus-imapd updated to 2.4.8 - cyrus-imapd updated to 2.4.8
- fixed: cannot set unlimited quota through proxy - fixed: cannot set unlimited quota through proxy
- fixed: reconstruct tries to set timestamps again and again - fixed: reconstruct tries to set timestamps again and again
- fixed: response for LIST "" user is wrong - fixed: response for LIST "" user is wrong
- fixed: THREAD command doesn't support quoted charset - fixed: THREAD command doesn't support quoted charset
- fixed crashes in mupdatetest and cyr_expire when using -x - fixed crashes in mupdatetest and cyr_expire when using -x
* Mon Apr 04 2011 Michal Hlaivnka <mhlavink@redhat.com> - 2.4.7-2 * Mon Apr 04 2011 Michal Hlaivnka <mhlavink@redhat.com> - 2.4.7-2
- now using systemd - now using systemd
@ -1090,7 +1072,7 @@ fi
* Wed Dec 1 2004 John Dennis <jdennis@redhat.com> 2.2.10-1.devel * Wed Dec 1 2004 John Dennis <jdennis@redhat.com> 2.2.10-1.devel
- update to Simon Matter's 2.2.10 RPM, - update to Simon Matter's 2.2.10 RPM,
fixes bug #139382, fixes bug #139382,
security advisories: CAN-2004-1011 CAN-2004-1012 CAN-2004-1013 CAN-2004-1015 security advisories: CAN-2004-1011 CAN-2004-1012 CAN-2004-1013 CAN-2004-1015
* Wed Nov 24 2004 Simon Matter <simon.matter@invoca.ch> * Wed Nov 24 2004 Simon Matter <simon.matter@invoca.ch>