[zarafa] Upgrade to 7.1.4
Robert Scheck
robert at fedoraproject.org
Sun Mar 24 00:20:29 UTC 2013
commit d83551f679d37187fbb413f19f7d8353e19aafe3
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sun Mar 24 01:20:17 2013 +0100
Upgrade to 7.1.4
sources | 2 +-
zarafa-7.1.4-kyotocabinet.patch | 138 +++++++++++++++++++++++++++++
zarafa-7.1.4-swig20.patch | 22 +++++
zarafa.spec | 183 ++++++++++++++++++++++-----------------
4 files changed, 266 insertions(+), 79 deletions(-)
---
diff --git a/sources b/sources
index c0fd5a2..3961adc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b8b9bf22044e618f5c01ee8271c681b zcp-7.0.13.tar.gz
+c1f8e8bf841a40db104e6149fb48830d zcp-7.1.4.tar.gz
diff --git a/zarafa-7.1.4-kyotocabinet.patch b/zarafa-7.1.4-kyotocabinet.patch
new file mode 100644
index 0000000..59bac11
--- /dev/null
+++ b/zarafa-7.1.4-kyotocabinet.patch
@@ -0,0 +1,138 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for zarafa >= 7.1.4, which allows to build Zarafa even
+if Kyoto Cabinet is not available. In the end it's introducing the same behaviour like CLucene has at the
+moment already. If you build using './configure --with-clucene-lib-prefix=' simply no zarafa-search gets
+build. But if you build using './configure --with-clucene-lib-prefix= --disable-kyotocabinet', simply no
+zarafa-search will be build on Zarafa 7.1. If you don't pass both options, it's looking for CLucene and
+Kyoto Cabinet like before. However, there are (experimental) architectures, where one or both is not (yet)
+available and this avoids building Zarafa on these architectures and/or systems. It should not introduce
+any regressions, just give some more flexibility to packagers. https://jira.zarafa.com/browse/ZCP-9862 is
+providing some more information.
+
+--- zarafa-7.1.4/configure.ac 2013-02-28 16:12:05.000000000 +0100
++++ zarafa-7.1.4/configure.ac.kyotocabinetc 2013-03-23 22:32:04.000000000 +0100
+@@ -411,7 +411,15 @@
+ CXXFLAGS=$CXXFLAGS_system
+ CPPFLAGS=$CPPFLAGS_system
+
++AC_ARG_ENABLE(kyotocabinet, AC_HELP_STRING([--enable-kyotocabinet], [enable building with kyotocabinet support]), [want_kyotocabinet=${enableval}], [want_kyotocabinet=yes])
++AM_CONDITIONAL(WITH_KYOTOCABINET, test "$want_kyotocabinet" = "yes")
++if test "$want_kyotocabinet" = "yes"; then
+ PKG_CHECK_MODULES([KYOTOCABINET], [kyotocabinet])
++else
++AC_MSG_CHECKING([for KYOTOCABINET])
++AC_MSG_RESULT([$want_kyotocabinet])
++fi
++AM_CONDITIONAL([WITH_KYOTOCABINET], [test "$want_kyotocabinet" = "yes"])
+ AC_SUBST(KYOTOCABINET_CFLAGS)
+ AC_SUBST(KYOTOCABINET_LIBS)
+
+--- zarafa-7.1.4/ECtools/zarafa-search/Makefile.am 2013-02-28 16:13:19.000000000 +0100
++++ zarafa-7.1.4/ECtools/zarafa-search/Makefile.am.kyotocabinet 2013-03-23 22:32:58.000000000 +0100
+@@ -1,7 +1,9 @@
+ if WITH_CLUCENE
++if WITH_KYOTOCABINET
+ bin_PROGRAMS = zarafa-search
+ noinst_PROGRAMS = dump-index
+ endif
++endif
+
+ AM_CPPFLAGS = \
+ -I${top_srcdir}/mapi4linux/include \
+--- zarafa-7.1.4/configure 2013-03-23 22:39:03.000000000 +0100
++++ zarafa-7.1.4/configure.kyotocabinet 2013-03-23 22:43:14.000000000 +0100
+@@ -797,6 +797,8 @@
+ ICAL_CFLAGS
+ KYOTOCABINET_LIBS
+ KYOTOCABINET_CFLAGS
++WITH_KYOTOCABINET_FALSE
++WITH_KYOTOCABINET_TRUE
+ VMIME_LIBS
+ VMIME_CFLAGS
+ PKG_CONFIG_LIBDIR
+@@ -999,6 +1001,7 @@
+ with_mysql_config
+ enable_embedded_mysql
+ with_vmime_prefix
++enable_kyotocabinet
+ with_ical_prefix
+ with_clucene_lib_prefix
+ with_clucene_include_prefix
+@@ -1674,6 +1677,7 @@
+ --enable-swig enable regenerating swig code
+ --enable-python enable building python binding
+ --enable-embedded-mysql Compile zarafa-server with the embedded MySQL server
++ --enable-kyotocabinet enable building with kyotocabinet support
+ --enable-epoll enable building epoll socket handling
+ --enable-static-boost Prefer the static boost libraries over the shared
+ ones [no]
+@@ -18198,6 +18202,22 @@
+ CXXFLAGS=$CXXFLAGS_system
+ CPPFLAGS=$CPPFLAGS_system
+
++# Check whether --enable-kyotocabinet was given.
++if test "${enable_kyotocabinet+set}" = set; then :
++ enableval=$enable_kyotocabinet; want_kyotocabinet=${enableval}
++else
++ want_kyotocabinet=yes
++fi
++
++ if test "$want_kyotocabinet" = "yes"; then
++ WITH_KYOTOCABINET_TRUE=
++ WITH_KYOTOCABINET_FALSE='#'
++else
++ WITH_KYOTOCABINET_TRUE='#'
++ WITH_KYOTOCABINET_FALSE=
++fi
++
++if test "$want_kyotocabinet" = "yes"; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KYOTOCABINET" >&5
+@@ -18287,6 +18307,19 @@
+ $as_echo "yes" >&6; }
+
+ fi
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for KYOTOCABINET" >&5
++$as_echo_n "checking for KYOTOCABINET... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $want_kyotocabinet" >&5
++$as_echo "$want_kyotocabinet" >&6; }
++fi
++ if test "$want_kyotocabinet" = "yes"; then
++ WITH_KYOTOCABINET_TRUE=
++ WITH_KYOTOCABINET_FALSE='#'
++else
++ WITH_KYOTOCABINET_TRUE='#'
++ WITH_KYOTOCABINET_FALSE=
++fi
+
+
+
+@@ -20872,6 +20905,14 @@
+ as_fn_error $? "conditional \"WITH_XML2\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${WITH_KYOTOCABINET_TRUE}" && test -z "${WITH_KYOTOCABINET_FALSE}"; then
++ as_fn_error $? "conditional \"WITH_KYOTOCABINET\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${WITH_KYOTOCABINET_TRUE}" && test -z "${WITH_KYOTOCABINET_FALSE}"; then
++ as_fn_error $? "conditional \"WITH_KYOTOCABINET\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${WITH_CLUCENE_TRUE}" && test -z "${WITH_CLUCENE_FALSE}"; then
+ as_fn_error $? "conditional \"WITH_CLUCENE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+--- zarafa-7.1.4/ECtools/zarafa-search/Makefile.in 2013-02-28 16:13:47.000000000 +0100
++++ zarafa-7.1.4/ECtools/zarafa-search/Makefile.in.kyotocabinet 2013-03-23 22:53:45.000000000 +0100
+@@ -34,8 +34,8 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+- at WITH_CLUCENE_TRUE@bin_PROGRAMS = zarafa-search$(EXEEXT)
+- at WITH_CLUCENE_TRUE@noinst_PROGRAMS = dump-index$(EXEEXT)
++ at WITH_CLUCENE_TRUE@@WITH_KYOTOCABINET_TRUE at bin_PROGRAMS = zarafa-search$(EXEEXT)
++ at WITH_CLUCENE_TRUE@@WITH_KYOTOCABINET_TRUE at noinst_PROGRAMS = dump-index$(EXEEXT)
+ subdir = ECtools/zarafa-search
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/zarafa-7.1.4-swig20.patch b/zarafa-7.1.4-swig20.patch
new file mode 100644
index 0000000..4f8802c
--- /dev/null
+++ b/zarafa-7.1.4-swig20.patch
@@ -0,0 +1,22 @@
+Patch by Sander Hoentjen <sander at hoentjen.eu> for zarafa >= 7.1.4, which ensures
+building with swig 2.0.x by using PyInt_FromLong instead of SWIG_From_long.
+
+--- zarafa-7.1.4/swig/icalmapi.i 2013-02-28 16:13:24.000000000 +0100
++++ zarafa-7.1.4/swig/icalmapi.i.swig20 2013-03-23 23:22:08.000000000 +0100
+@@ -24,14 +24,14 @@
+ $1 = &temp;
+ }
+ %typemap(argout) (eIcalType* ) {
+- %append_output(SWIG_From_long(*$1));
++ %append_output(PyInt_FromLong(*$1));
+ }
+
+ %typemap(in,numinputs=0) (time_t *) (time_t temp) {
+ $1 = &temp;
+ }
+ %typemap(argout) (time_t* ) {
+- %append_output(SWIG_From_long(*$1));
++ %append_output(PyInt_FromLong(*$1));
+ }
+
+ %typemap(in,numinputs=0) (SBinary *) (SBinary temp) {
diff --git a/zarafa.spec b/zarafa.spec
index de51c90..48f4765 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,7 +1,7 @@
%global beta_or_rc 0
-%global actual_release 2
-%global svnrevision 41388
-%global with_clucene 1
+%global actual_release 1
+%global svnrevision 41394
+%global with_search 1
%global with_ldap 1
%global with_xmlto 1
%global no_multiupload 1
@@ -19,7 +19,7 @@
Summary: Open Source Edition of the Zarafa Collaboration Platform
Name: zarafa
-Version: 7.0.13
+Version: 7.1.4
%if %{beta_or_rc}
Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}
%else
@@ -34,9 +34,9 @@ License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://www.zarafa.com/
%if %{beta_or_rc}
-Source0: http://download.zarafa.com/community/beta/7.0/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
+Source0: http://download.zarafa.com/community/beta/7.1/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
%else
-Source0: http://download.zarafa.com/community/final/7.0/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
+Source0: http://download.zarafa.com/community/final/7.1/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
%endif
Source1: %{name}.ini
Source2: %{name}.logrotate
@@ -44,6 +44,8 @@ Source3: %{name}-webaccess.conf
Patch0: zarafa-7.0.9-rpath.patch
Patch1: zarafa-7.0.8-va_list.patch
+Patch2: zarafa-7.1.4-kyotocabinet.patch
+Patch3: zarafa-7.1.4-swig20.patch
BuildRequires: bison
BuildRequires: gcc-c++
@@ -71,7 +73,8 @@ BuildRequires: %{_bindir}/xsubpp
%endif
BuildRequires: python-devel >= 2.4
-%if %{with_clucene}
+%if %{with_search}
+BuildRequires: kyotocabinet-devel
%if 0%{?fedora} > 15
BuildRequires: clucene09-core-devel >= 0.9.21b-1
%else
@@ -218,8 +221,21 @@ to enable users to access their calendar using iCalendar (RFC 2445/5545)
or CalDAV (RFC 4791) compliant clients. The iCal/CalDAV gateway service
can be configured to listen for HTTP and HTTPS requests.
-%if %{with_clucene}
-%package indexer
+%package monitor
+Summary: Quota Monitor for the Zarafa Collaboration Platform
+Group: System Environment/Daemons
+Requires: zarafa-common = %{version}-%{release}
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
+
+%description monitor
+The zarafa-monitor package includes the Zarafa Monitoring service which
+is responsible for checking the users store (mailbox) size, and sending
+them (and administrators) a warning e-mail when limits are exceeded.
+
+%if %{with_search}
+%package search
Summary: Indexer search engine for the Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}, file
@@ -227,28 +243,18 @@ Requires: catdoc, libxslt, w3m, unzip, %{_bindir}/pdftotext
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
+Provides: zarafa-indexer = %{version}-%{release}
+Provides: zarafa-indexer%{?_isa} = %{version}-%{release}
+Obsoletes: zarafa-indexer < 7.1.0-1
-%description indexer
-The zarafa-indexer package includes the Zarafa Indexing service for fast
+%description search
+The zarafa-search package includes the Zarafa Indexing service for fast
and full-text searching. Using CLucene search engine, this service makes
an index per user of messages and attachments for the Zarafa server. At
search queries, the server will use this index to quickly find messages,
items and even in contents of attached documents.
%endif
-%package monitor
-Summary: Quota Monitor for the Zarafa Collaboration Platform
-Group: System Environment/Daemons
-Requires: zarafa-common = %{version}-%{release}
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/service
-
-%description monitor
-The zarafa-monitor package includes the Zarafa Monitoring service which
-is responsible for checking the users store (mailbox) size, and sending
-them (and administrators) a warning e-mail when limits are exceeded.
-
%package server
Summary: Server component for the Zarafa Collaboration Platform
Group: System Environment/Daemons
@@ -372,6 +378,11 @@ to interact with Zarafa.
%patch0 -p1 -b .rpath
touch -c -r aclocal.m4.rpath aclocal.m4
%patch1 -p1 -b .va_list
+%if !%{with_search}
+%patch2 -p1 -b .kyotocabinet
+touch -c -r configure.ac.kyotocabinet configure.ac
+%endif
+%patch3 -p1 -b .swig20
%build
%if 0%{?rhel}%{?fedora} < 6
@@ -379,16 +390,16 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/boost141"
export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141"
%endif
-%if 0%{?fedora} > 15
+%if %{with_search} && 0%{?rhel}%{?fedora} > 6
export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}/clucene09"
%endif
%configure \
--with-userscript-prefix=%{_sysconfdir}/%{name}/userscripts \
--with-quotatemplate-prefix=%{_sysconfdir}/%{name}/quotamail \
- --with-indexerscripts-prefix=%{_datadir}/%{name}/indexerscripts \
-%if %{with_clucene}
-%if 0%{?fedora} > 15
+ --with-searchscripts-prefix=%{_datadir}/%{name}/searchscripts \
+%if %{with_search}
+%if 0%{?rhel}%{?fedora} > 6
--with-clucene-lib-prefix=%{_libdir}/clucene09 \
--with-clucene-include-prefix=%{_includedir}/clucene09 \
%else
@@ -396,12 +407,12 @@ export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}/clucene09"
--with-clucene-include-prefix=%{_includedir} \
%endif
%else
+ --disable-kyotocabinet \
--with-clucene-lib-prefix= \
%endif
--enable-release \
--enable-epoll \
--enable-swig \
- --disable-perl \
--enable-python \
--disable-static
make %{?_smp_mflags}
@@ -426,7 +437,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,msr-veri
# ensure that all services are off by default at boot time
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
-for service in dagent gateway ical indexer monitor server spooler; do
+for service in dagent gateway ical search monitor server spooler; do
if [ -f installer/linux/%{name}-$service.init.rhel ]; then
sed -e 's at 345@-@' installer/linux/%{name}-$service.init.rhel > \
$RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}-$service
@@ -476,8 +487,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/%{name}-ldap.cfg.5*
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-gateway/
install -p -m 644 tools/python-scripts/optimize-imap.py $RPM_BUILD_ROOT%{_datadir}/%{name}-gateway/
-# Create the default log and lib directory for packaging
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/
+# Create the default log and lib directories for packaging
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib/%{name}/{dagent,spooler}/plugins,log/%{name}}/
# Remove all libtool .la files to avoid packaging of them
rm -f $RPM_BUILD_ROOT{%{_libdir}/{,php/modules,php4,%{name}},%{perl_vendorarch}/auto/MAPI,%{python_sitearch}}/*.la
@@ -486,15 +497,15 @@ rm -f $RPM_BUILD_ROOT{%{_libdir}/{,php/modules,php4,%{name}},%{perl_vendorarch}/
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-gateway}/
# Move Indexer/CLucene related files to its correct places
-%if %{with_clucene}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/indexerscripts/
-mv -f $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/%{name}/indexerscripts/attachments_parser.db
+%if %{with_search}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/searchscripts/
+mv -f $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/%{name}/searchscripts/attachments_parser.db
for helper in attachments_parser xmltotext.xslt zmktemp; do
- ln -s ../../..%{_datadir}/%{name}/indexerscripts/$helper $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/indexerscripts/$helper
+ ln -s ../../..%{_datadir}/%{name}/searchscripts/$helper $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/searchscripts/$helper
done
%else
-rm -f $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},%{_mandir}/man?}/%{name}-indexer*
-rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/indexer.cfg,%{_datadir}/%{name}/indexerscripts/}
+rm -f $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},%{_mandir}/man?}/%{name}-search*
+rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/search.cfg,%{_datadir}/%{name}/searchscripts/}
%endif
# Move the webaccess configuration file to its correct place
@@ -552,18 +563,18 @@ chown %{name}:%{name} %{_localstatedir}/log/%{name}/gateway.* > /dev/null 2>&1 |
# Ensure correct log file ownership after upgrade from official packages
chown %{name}:%{name} %{_localstatedir}/log/%{name}/ical.* > /dev/null 2>&1 || :
-%if %{with_clucene}
-%post indexer
-[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-indexer
-# Ensure correct log file ownership after upgrade from official packages
-chown %{name}:%{name} %{_localstatedir}/log/%{name}/indexer.* > /dev/null 2>&1 || :
-%endif
-
%post monitor
[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-monitor
# Ensure correct log file ownership after upgrade from official packages
chown %{name}:%{name} %{_localstatedir}/log/%{name}/monitor.* > /dev/null 2>&1 || :
+%if %{with_search}
+%post search
+[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-search
+# Ensure correct log file ownership after upgrade from official packages
+chown %{name}:%{name} %{_localstatedir}/log/%{name}/search.* > /dev/null 2>&1 || :
+%endif
+
%post server
[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-server
# Ensure correct log file ownership after upgrade from official packages
@@ -595,20 +606,20 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del %{name}-ical
fi
-%if %{with_clucene}
-%preun indexer
-if [ $1 -eq 0 ]; then
- /sbin/service %{name}-indexer stop > /dev/null 2>&1 || :
- /sbin/chkconfig --del %{name}-indexer
-fi
-%endif
-
%preun monitor
if [ $1 -eq 0 ]; then
/sbin/service %{name}-monitor stop > /dev/null 2>&1 || :
/sbin/chkconfig --del %{name}-monitor
fi
+%if %{with_search}
+%preun search
+if [ $1 -eq 0 ]; then
+ /sbin/service %{name}-search stop > /dev/null 2>&1 || :
+ /sbin/chkconfig --del %{name}-search
+fi
+%endif
+
%preun server
if [ $1 -eq 0 ]; then
/sbin/service %{name}-server stop > /dev/null 2>&1 || :
@@ -636,17 +647,17 @@ if [ $1 -ne 0 ]; then
/sbin/service %{name}-ical condrestart > /dev/null 2>&1 || :
fi
-%if %{with_clucene}
-%postun indexer
+%postun monitor
if [ $1 -ne 0 ]; then
- /sbin/service %{name}-indexer condrestart > /dev/null 2>&1 || :
+ /sbin/service %{name}-monitor condrestart > /dev/null 2>&1 || :
fi
-%endif
-%postun monitor
+%if %{with_search}
+%postun search
if [ $1 -ne 0 ]; then
- /sbin/service %{name}-monitor condrestart > /dev/null 2>&1 || :
+ /sbin/service %{name}-search condrestart > /dev/null 2>&1 || :
fi
+%endif
%postun server
if [ $1 -ne 0 ]; then
@@ -704,14 +715,19 @@ fi
%{_mandir}/man1/%{name}-dagent.1*
%{_mandir}/man1/%{name}-autorespond.1*
%{_mandir}/man5/%{name}-dagent.cfg.5*
+%{_datadir}/%{name}-dagent/
+%dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/dagent/
+%dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/dagent/plugins/
%files devel
%defattr(-,root,root,-)
%{_libdir}/libarchiver.so
+%{_libdir}/libarchiver-core.so
%{_libdir}/libicalmapi.so
%{_libdir}/libinetmapi.so
%{_libdir}/libmapi.so
%{_libdir}/libcommon_mapi.a
+%{_libdir}/libcommon_service.a
%{_libdir}/libcommon_ssl.a
%{_libdir}/libcommon_util.a
%{_libdir}/libfreebusy.a
@@ -741,25 +757,6 @@ fi
%{_mandir}/man1/%{name}-ical.1*
%{_mandir}/man5/%{name}-ical.cfg.5*
-%if %{with_clucene}
-%files indexer
-%defattr(-,root,root,-)
-%{_bindir}/%{name}-indexer
-%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/indexer.cfg
-%{_sysconfdir}/rc.d/init.d/%{name}-indexer
-%dir %{_sysconfdir}/%{name}/indexerscripts/
-%config(noreplace) %{_sysconfdir}/%{name}/indexerscripts/attachments_parser.db
-%{_sysconfdir}/%{name}/indexerscripts/attachments_parser
-%{_sysconfdir}/%{name}/indexerscripts/xmltotext.xslt
-%{_sysconfdir}/%{name}/indexerscripts/zmktemp
-%dir %{_datadir}/%{name}/indexerscripts/
-%{_datadir}/%{name}/indexerscripts/attachments_parser
-%{_datadir}/%{name}/indexerscripts/xmltotext.xslt
-%{_datadir}/%{name}/indexerscripts/zmktemp
-%{_mandir}/man1/%{name}-indexer.1*
-%{_mandir}/man5/%{name}-indexer.cfg.5*
-%endif
-
%files monitor
%defattr(-,root,root,-)
%{_bindir}/%{name}-monitor
@@ -773,6 +770,25 @@ fi
%{_mandir}/man1/%{name}-monitor.1*
%{_mandir}/man5/%{name}-monitor.cfg.5*
+%if %{with_search}
+%files search
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-search
+%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/search.cfg
+%{_sysconfdir}/rc.d/init.d/%{name}-search
+%dir %{_sysconfdir}/%{name}/searchscripts/
+%config(noreplace) %{_sysconfdir}/%{name}/searchscripts/attachments_parser.db
+%{_sysconfdir}/%{name}/searchscripts/attachments_parser
+%{_sysconfdir}/%{name}/searchscripts/xmltotext.xslt
+%{_sysconfdir}/%{name}/searchscripts/zmktemp
+%dir %{_datadir}/%{name}/searchscripts/
+%{_datadir}/%{name}/searchscripts/attachments_parser
+%{_datadir}/%{name}/searchscripts/xmltotext.xslt
+%{_datadir}/%{name}/searchscripts/zmktemp
+%{_mandir}/man1/%{name}-search.1*
+%{_mandir}/man5/%{name}-search.cfg.5*
+%endif
+
%files server
%defattr(-,root,root,-)
%{_bindir}/%{name}-server
@@ -821,12 +837,17 @@ fi
%{_sysconfdir}/rc.d/init.d/%{name}-spooler
%{_mandir}/man1/%{name}-spooler.1*
%{_mandir}/man5/%{name}-spooler.cfg.5*
+%{_datadir}/%{name}-spooler/
+%dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/spooler/
+%dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/spooler/plugins/
%files utils
%defattr(-,root,root,-)
%{_bindir}/%{name}-admin
%{_bindir}/%{name}-fsck
+%{_bindir}/%{name}-mailbox-permissions
%{_bindir}/%{name}-passwd
+%{_bindir}/%{name}-set-oof
%{_bindir}/%{name}-stats
%{_datadir}/%{name}/audit-parse.pl
%{_datadir}/%{name}/db-calc-storesize
@@ -835,7 +856,9 @@ fi
%{_datadir}/%{name}/zarafa7-upgrade
%{_mandir}/man1/%{name}-admin.1*
%{_mandir}/man1/%{name}-fsck.1*
+%{_mandir}/man1/%{name}-mailbox-permissions.1*
%{_mandir}/man1/%{name}-passwd.1*
+%{_mandir}/man1/%{name}-set-oof.1*
%{_mandir}/man1/%{name}-stats.1*
%files webaccess
@@ -852,6 +875,7 @@ fi
%defattr(-,root,root,-)
%dir %{_sysconfdir}/mapi/
%{_libdir}/libarchiver.so.*
+%{_libdir}/libarchiver-core.so.*
%{_libdir}/libicalmapi.so.*
%{_libdir}/libinetmapi.so.*
%{_libdir}/libmapi.so.*
@@ -874,6 +898,9 @@ fi
%{python_sitearch}/*
%changelog
+* Sun Mar 24 2013 Robert Scheck <robert at fedoraproject.org> 7.1.4-1
+- Upgrade to 7.1.4
+
* Fri Mar 22 2013 Remi Collet <rcollet at redhat.com> 7.0.13-2
- rebuild for http://fedoraproject.org/wiki/Features/Php55
More information about the scm-commits
mailing list