Kolab Groupware OBS

Changes of Revision 14

cyrus-imapd.spec Changed

@@ -127,6 +127,9 @@
 Requires(postun):   initscripts
 %endif
 
+Obsoletes:          %{name}-perl < %{version}-%{release}
+Obsoletes:          %{name}-utils < %{version}-%{release}
+
 %description
 The %{name} package contains the core of the Cyrus IMAP server.
 It is a scaleable enterprise mail system designed for use from
@@ -163,27 +166,6 @@
 The %{name}-devel package contains header files and libraries
 necessary for developing applications which use the imclient library.
 
-%package perl
-Group: System Environment/Libraries
-Summary: Cyrus IMAP server utility Perl modules
-
-%description perl
-The %{name}-perl contains Perl modules necessary to use the
-Cyrus IMAP server administration utilities.
-
-%package utils
-Group: Applications/System
-Summary: Cyrus IMAP server administration utilities
-Requires(pre): shadow-utils
-Requires(post): grep, coreutils, make, openssl
-Requires(postun): shadow-utils
-Requires: %{name}-perl = %{version}-%{release}
-
-%description utils
-The %{name}-utils package contains administrative tools for the
-Cyrus IMAP server. It can be installed on systems other than the
-one running the server.
-
 %prep
 %setup -q -n %{_name}-%{real_version}%{?dot_snapshot_version}
 %patch1 -p1
@@ -451,14 +433,6 @@
     fi
 %endif
 
-%post utils
-# FIXME: remove when setup > 2.8.10 is released
-# Add service entries if necessary
-if ! %{__grep} -q ^csync %{_sysconfdir}/services; then
-  echo -e 'csync\t\t2005/tcp\t\t\t# Cyrus IMAP Replication Daemon' >> %{_sysconfdir}/services
-  echo -e 'csync\t\t2005/udp\t\t\t# Cyrus IMAP Replication Daemon' >> %{_sysconfdir}/services
-fi
-
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README
@@ -558,15 +532,6 @@
 %{_mandir}/man8/*
 %dir %{_sysconfdir}/pki/%{_name}
 %attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
-
-%files devel
-%defattr(0644,root,root,0755)
-%{_includedir}/cyrus
-%{_libdir}/lib*.a
-%{_mandir}/man3/imclient.3*
-
-%files perl
-%defattr(-,root,root)
 %doc perl/imap/README
 %doc perl/imap/Changes
 %doc perl/imap/examples
@@ -590,12 +555,15 @@
 %{_mandir}/man3/Cyrus::IMAP.3pm.gz
 %{_mandir}/man3/Cyrus::IMAP::IMSP.3pm.gz
 %{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz
-
-%files utils
-%defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 
+%files devel
+%defattr(0644,root,root,0755)
+%{_includedir}/cyrus
+%{_libdir}/lib*.a
+%{_mandir}/man3/imclient.3*
+
 %changelog
 * Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.17-2
 - Refresh patch for normalization of the UID - actually enable disabling it