icu rebuild

[packages/cyrus-imapd.git] / cyrus-imapd.spec

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index b87d2ede232c6231e84d7dbe6110bbbc5ec34f39..0e7757a09a71b49ac304f395bff37243ddb156e7 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -2,7 +2,7 @@
 
 #
 # Conditional build:
-%bcond_without docs            # don't regenerate docs
+%bcond_without doc             # don't regenerate docs
 %bcond_without http            # build without http support
 %bcond_without ldap            # build without ldap support
 %bcond_without lmdb            # build without lmdb backend support
@@ -12,18 +12,17 @@
 %bcond_with    sphinx          # build with sphinx search engine support (broken)
 %bcond_without xapian          # build without xapian search engine support
 #
-%{?with_perl:%include  /usr/lib/rpm/macros.perl}
 #
 Summary:       High-performance mail store with IMAP and POP3
 Summary(pl.UTF-8):     Wysoko wydajny serwer IMAP i POP3
 Summary(pt_BR.UTF-8):  Um servidor de mail de alto desempenho que suporta IMAP e POP3
 Name:          cyrus-imapd
-Version:       3.0.9
-Release:       4
+Version:       3.0.16
+Release:       2
 License:       BSD-like
 Group:         Networking/Daemons/POP3
-Source0:       https://www.cyrusimap.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 8452f81e3c30fa9af6f456e143e98576
+Source0:       https://github.com/cyrusimap/cyrus-imapd/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: f93394d3bf981d558a8d7e2cb989b568
 Source1:       cyrus-README
 Source2:       cyrus-procmailrc
 Source3:       cyrus-deliver-wrapper.c
@@ -39,7 +38,8 @@ Source13:     cyrus-sync.init
 Patch0:                %{name}-et.patch
 Patch1:                link.patch
 Patch2:                %{name}-clamav-0.101.patch
-Patch3:                %{name}-icu.patch
+Patch3:                %{name}-sphinx3.patch
+Patch4:                openssl3.patch
 URL:           http://www.cyrusimap.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake
@@ -61,14 +61,14 @@ BuildRequires:      net-snmp-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: patchutils
-%{?with_docs:BuildRequires:    perl-Pod-POM-View-Restructured}
+%{?with_doc:BuildRequires:     perl-Pod-POM-View-Restructured}
 %{?with_perl:BuildRequires:    perl-devel >= 1:5.8.0}
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 %{?with_perl:BuildRequires:    rpm-perlprov}
 BuildRequires: rpmbuild(macros) >= 1.527
 %{?with_http:BuildRequires:    shapelib-devel >= 1.4.1}
 %{?with_http:BuildRequires:    sqlite3-devel >= 3}
-%{?with_docs:BuildRequires:    sphinx-pdg-3}
+%{?with_doc:BuildRequires:     sphinx-pdg-3}
 %{?with_xapian:BuildRequires:  xapian-core-devel}
 BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
@@ -206,9 +206,12 @@ Perlowy interfejs do biblioteki cyrus-imapd.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .
 
+find docsrc/ -name '*.pyc' -print0 | xargs --null %{__rm}
+
 %build
 %{__libtoolize}
 %{__aclocal} -I cmulocal
@@ -236,7 +239,7 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .
        %{__with_without mysql} \
        %{__with_without perl perl %{__perl}} \
        %{__with_without pgsql} \
-       %{__with_without docs sphinx-build}
+       %{__with_without doc sphinx-build}
 
 %{__make} -j1 \
        INSTALLDIRS=vendor \
@@ -460,6 +463,7 @@ fi
 %{_libdir}/libcyrus_imap.la
 %{_libdir}/libcyrus_sieve.la
 %{_pkgconfigdir}/libcyrus.pc
+%{_pkgconfigdir}/libcyrus_imap.pc
 %{_pkgconfigdir}/libcyrus_min.pc
 %{_pkgconfigdir}/libcyrus_sieve.pc