Kolab Groupware OBS

Changes of Revision 20

cyrus-imapd.spec Changed

@@ -34,8 +34,8 @@
 # Upstream sources
 Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{_name}-%{real_version}%{?dot_snapshot_version}.tar.gz
 Source1:            cyrus-imapd.imap-2.3.x-conf
-Source2:           cyrus-imapd.cvt_cyrusdb_all
-Source3:           cyrus-imapd.magic
+Source2:            cyrus-imapd.cvt_cyrusdb_all
+Source3:            cyrus-imapd.magic
 
 # Distribution specific sources
 Source11:           cyrus-imapd.logrotate
@@ -184,13 +184,6 @@
 %patch903 -p1
 %patch905 -p1
 
-# add additional sources
-mkdir doc/{m4,contrib}
-%{__install} -m 644 %{SOURCE10} %{SOURCE15} %{SOURCE16} %{SOURCE17} \
-        %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21}     doc/contrib/
-%{__install} -m 644 %{SOURCE33} %{SOURCE8}  %{SOURCE9}    doc/
-%{__install} -m 644 %{SOURCE26} %{SOURCE4}  %{SOURCE27} %{SOURCE29}   doc/m4/
-
 # only to update config.* files
 automake -a -f -c || :
 aclocal -I cmulocal
@@ -291,27 +284,26 @@
   doc/contrib
 
 # Install additional files
-%{__install} -m 755 %{SOURCE13}   %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
-%{__install} -m 755 %{SOURCE28}   %{buildroot}%{_cyrexecdir}/rpm_set_permissions
-%{__install} -m 644 %{SOURCE14}   %{buildroot}%{_datadir}/%{_name}/rpm/magic
 %{__install} -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
-%{__install} -p -m 644 %{SOURCE6}    %{buildroot}%{_sysconfdir}/imapd.conf
-%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/pop
-%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/imap
-%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/sieve
-%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/mupdate
-%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/lmtp
-%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/nntp
-%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/csync
-%{__install} -p -m 644 %{SOURCE5}    %{buildroot}%{_sysconfdir}/logrotate.d/%{_name}
-%{__install} -p -m 644 %{SOURCE12}   %{buildroot}%{_sysconfdir}/sysconfig/%{_name}
-%{__install} -p -m 755 %{SOURCE25}   %{buildroot}%{_sysconfdir}/cron.daily/%{_name}
+%{__install} -p -m 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/imapd.conf
+%{__install} -p -m 755 %{SOURCE2}   %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
+%{__install} -p -m 644 %{SOURCE3}   %{buildroot}%{_datadir}/%{_name}/rpm/magic
+%{__install} -p -m 644 %{SOURCE11}    %{buildroot}%{_sysconfdir}/logrotate.d/%{_name}
+%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/pop
+%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/imap
+%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/sieve
+%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/mupdate
+%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/lmtp
+%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/nntp
+%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/csync
+%{__install} -p -m 755 %{SOURCE13}   %{buildroot}%{_sysconfdir}/cron.daily/%{_name}
+%{__install} -p -m 644 %{SOURCE22}   %{buildroot}%{_sysconfdir}/sysconfig/%{_name}
 
 %if 0%{?with_systemd}
-%{__install} -p -D -m 644 %{SOURCE12}   %{buildroot}%{_unitdir}/cyrus-imapd.service
-%{__install} -p -D -m 755 %{SOURCE13}   %{buildroot}%{_cyrexecdir}/cyr_systemd_helper
+%{__install} -p -D -m 644 %{SOURCE31}   %{buildroot}%{_unitdir}/cyrus-imapd.service
+%{__install} -p -D -m 755 %{SOURCE32}   %{buildroot}%{_cyrexecdir}/cyr_systemd_helper
 %else
-%{__install} -p -m 755 %{SOURCE11}   %{buildroot}%{_sysconfdir}/rc.d/init.d/%{_name}
+%{__install} -p -m 755 %{SOURCE21}   %{buildroot}%{_sysconfdir}/rc.d/init.d/%{_name}
 %endif
 
 # Cleanup of doc dir