Hello community, here is the log from the commit of package dovecot21 for openSUSE:Factory checked in at 2014-08-07 08:08:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dovecot21 (Old) and /work/SRC/openSUSE:Factory/.dovecot21.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dovecot21" Changes: -------- --- /work/SRC/openSUSE:Factory/dovecot21/dovecot21.changes 2013-06-29 14:25:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dovecot21.new/dovecot21.changes 2014-08-07 08:08:23.000000000 +0200 @@ -1,0 +2,27 @@ +Tue Jul 29 14:28:04 UTC 2014 - mrueckert@suse.de + +- only build clucene for sle 11 or newer + +------------------------------------------------------------------- +Tue Jul 29 14:21:20 UTC 2014 - mrueckert@suse.de + +- don't package /var/run on systemd systems + +------------------------------------------------------------------- +Tue Jul 29 14:06:35 UTC 2014 - mrueckert@suse.de + +- only lzma support on sle 11 or newer + +------------------------------------------------------------------- +Tue Jul 29 13:44:20 UTC 2014 - mrueckert@suse.de + +- moved all the conditionals in the spec file to bcond_with +- added new conditinal for lz4 +- enabled lzma support +- fixed systemd support: + - added tmpfiles.d config for dovecot + - only install the old init script on non systemd systems. + - updated %pre*/%post scriptlets to the previous change +- added dovecot-rpmlintrc to sources list + +------------------------------------------------------------------- New: ---- dovecot.tmpfiles.d ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dovecot21.spec ++++++ --- /var/tmp/diff_new_pack.YsgpKC/_old 2014-08-07 08:08:23.000000000 +0200 +++ /var/tmp/diff_new_pack.YsgpKC/_new 2014-08-07 08:08:23.000000000 +0200 @@ -23,23 +23,44 @@ %define sieve_version 2.1 %define dovecot_version 2.1.17 %define dovecot_pigeonhole_docdir %{_docdir}/%{pkg_name}/dovecot-pigeonhole -%define with_solr 1 -%define with_clucene 1 -%define with_sqlite 1 +%if 0%{?suse_version} > 1230 +%bcond_without systemd +%else +%bcond_with systemd +%endif +%bcond_without solr +%if 0%{?suse_version} >= 1110 +%bcond_without clucene +%else +%bcond_with clucene +%endif +%bcond_without sqlite +%if 0%{?suse_version} >= 1110 +%bcond_without lzma +%else +%bcond_with lzma +%endif +%bcond_with lz4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: flex BuildRequires: libtool +%if %{with lzma} +BuildRequires: lzma-devel +%endif +%if %{with lz4} +BuildRequires: lz4-devel +%endif BuildRequires: mysql-devel BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: tcpd-devel -%if 0%{with_sqlite} +%if %{with sqlite} BuildRequires: sqlite-devel > 3 %endif -%if 0%{?with_clucene} +%if %{with clucene} BuildRequires: clucene-core-devel BuildRequires: gcc-c++ %endif @@ -53,12 +74,12 @@ %if 0%{?suse_version} > 1020 BuildRequires: libbz2-devel %endif -%if 0%{?with_solr} +%if %{with solr} BuildRequires: curl-devel BuildRequires: libexpat-devel %endif -%if 0%{?suse_version} > 1140 -BuildRequires: systemd +%if %{with systemd} +BuildRequires: pkgconfig(systemd) %{?systemd_requires} %define has_systemd 1 %endif @@ -68,7 +89,7 @@ Obsoletes: dovecot < %{version} %if 0%{?suse_version} >= 1010 Recommends: %{name}-backend-mysql = %{version} %{name}-backend-pgsql = %{version} -%if 0%{with_sqlite} +%if %{with sqlite} Recommends: %{name}-backend-sqlite = %{version} %endif %endif @@ -82,6 +103,8 @@ Source3: %{pkg_name}.pam Source4: %{pkg_name}.README.SuSE Source5: %{pkg_name}-fw +Source6: dovecot.tmpfiles.d +Source7: dovecot-rpmlintrc Summary: IMAP and POP3 Server Written Primarily with Security in Mind License: BSD-3-Clause and LGPL-2.1+ and MIT Group: Productivity/Networking/Email/Servers @@ -135,7 +158,7 @@ This package holds the files needed for PostgreSQL support. -%if 0%{?with_sqlite} +%if %{with sqlite} %package backend-sqlite Requires: %{name} = %{version} @@ -159,7 +182,7 @@ %endif -%if 0%{?with_clucene} +%if %{with clucene} %package fts-lucene Requires: %{name} = %{version} @@ -183,7 +206,7 @@ %endif -%if 0%{?with_solr} +%if %{with solr} %package fts-solr Requires: %{name} = %{version} @@ -247,7 +270,7 @@ #{__libtoolize} --force #{__automake} --add-missing #{__autoconf} -%if 0%{?with_clucene} +%if %{with clucene} export CFLAGS="$CFLAGS -I%{_libdir}" export CXXFLAGS="$CFLAGS -I%{_libdir}" %endif @@ -263,22 +286,28 @@ --with-gssapi=plugin \ --with-pgsql \ --with-mysql \ -%if 0%{with_sqlite} +%if %{with sqlite} --with-sqlite \ %endif -%if 0%{?with_clucene} +%if %{with clucene} --with-lucene \ %endif -%if 0%{?with_solr} +%if %{with solr} --with-solr \ %endif --with-ssl=openssl \ --with-zlib \ --with-bzlib \ +%if %{with lzma} + --with-lzma \ +%endif +%if %{with lz4} + --with-lz4 \ +%endif --with-libcap \ --with-libwrap \ --with-docs \ -%if 0%{?has_systemd} +%if %{with systemd} --with-systemdsystemunitdir=%{_unitdir} \ %endif --disable-static @@ -313,8 +342,13 @@ %{buildroot}%{_var}/lib/%{pkg_name}/ # install the init script +%if %{with systemd} +%{__install} -D -m 644 %{S:6} %{buildroot}/usr/lib/tmpfiles.d/dovecot.conf +%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{pkg_name} +%else %{__install} -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name} %{__ln_s} -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name} +%endif # install pam config %{__install} -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/pam.d/%{pkg_name} @@ -332,7 +366,7 @@ # additional docs for the main package %{__install} -m 0644 \ AUTHORS ChangeLog* COPYING* NEWS TODO README* \ -%if 0%{?with_solr} +%if %{with solr} doc/*.xml \ %endif %{buildroot}%{_docdir}/%{pkg_name}/ @@ -353,38 +387,42 @@ /usr/sbin/groupadd -r %{pkg_name} &>/dev/null || : /usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "User for Dovecot imapd" -d %{_var}/run/%{pkg_name} %{pkg_name} &>/dev/null || : /usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "User for Dovecot login" -d %{_var}/run/%{pkg_name} dovenull &>/dev/null || : -%if 0%{?has_systemd} +%if %{with systemd} %service_add_pre %{pkg_name}.service %{pkg_name}.socket %endif %preun -%stop_on_removal %{pkg_name} -%if 0%{?has_systemd} +%if %{with systemd} %service_del_preun %{pkg_name}.service %{pkg_name}.socket +%else +%stop_on_removal %{pkg_name} %endif %post /sbin/ldconfig -%fillup_and_insserv -f %{pkg_name} -%if 0%{?has_systemd} +%if %{with systemd} +systemd-tmpfiles --create /usr/lib/tmpfiles.d/dovecot.conf || true %service_add_post %{pkg_name}.service %{pkg_name}.socket %endif %postun /sbin/ldconfig -%insserv_cleanup -%restart_on_update %{pkg_name} -%if 0%{?has_systemd} +%if %{with systemd} %service_del_postun %{pkg_name}.service %{pkg_name}.socket +%else +%restart_on_update %{pkg_name} +%insserv_cleanup %endif %files %defattr(-,root,root) -%if 0%{?has_systemd} +%if %{with systemd} +/usr/lib/tmpfiles.d/dovecot.conf %{_unitdir}/dovecot.service %{_unitdir}/dovecot.socket -%endif +%else %{_sysconfdir}/init.d/%{pkg_name} +%endif %{_sbindir}/rc%{pkg_name} %{_sbindir}/%{pkg_name} %{_bindir}/doveadm @@ -493,12 +531,14 @@ %{_mandir}/man1/sieved.1* %{_mandir}/man7/pigeonhole.7* %doc %{_docdir}/%{pkg_name} -%if 0%{?with_solr} +%if %{with solr} %exclude %{_docdir}/%{pkg_name}/solr-schema.xml %endif # setting up permissions +%if ! %{with systemd} %dir %attr(0755,root,root) %ghost %{_var}/run/%{pkg_name}/ %dir %attr(0750,root,%{pkg_name}) %ghost %{_var}/run/%{pkg_name}/login/ +%endif %dir %attr(0750,root,root) %{_var}/lib/%{pkg_name}/ %{_bindir}/sieve-filter %{_mandir}/man1/sieve-filter.1* @@ -515,7 +555,7 @@ %{_libdir}/%{pkg_name}/modules/auth/libdriver_pgsql.so %{_libdir}/%{pkg_name}/modules/dict/libdriver_pgsql.so -%if 0%{?with_sqlite} +%if %{with sqlite} %files backend-sqlite %defattr(-,root,root,-) %{_libdir}/%{pkg_name}/modules/libdriver_sqlite.so @@ -523,14 +563,14 @@ %{_libdir}/%{pkg_name}/modules/dict/libdriver_sqlite.so %endif -%if 0%{?with_clucene} +%if %{with clucene} %files fts-lucene %defattr(-,root,root,-) %{_libdir}/%{pkg_name}/modules/lib21_fts_lucene_plugin.so %{_libdir}/%{pkg_name}/modules/doveadm/lib20_doveadm_fts_lucene_plugin.so %endif -%if 0%{?with_solr} +%if %{with solr} %files fts-solr %defattr(-,root,root,-) %{_libdir}/%{pkg_name}/modules/lib21_fts_solr_plugin.so ++++++ dovecot.tmpfiles.d ++++++ # Type Path Mode UID GID Age Argument d /var/run/dovecot/ 0755 root root - - d /var/run/dovecot/login/ 0750 root dovecot - - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org