(fix) adjust doc and packaging regarding oc cleanup script

This commit is contained in:
Ludovic Marcotte
2015-11-25 10:56:39 -05:00
parent 8df311547f
commit 2d1a4b320c
5 changed files with 7 additions and 322 deletions
-1
View File
@@ -83,7 +83,6 @@ install-arch: build-arch
install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo
install -d -m 750 debian/tmp/etc/sogo/
install -D -m 640 Scripts/sogo.conf debian/tmp/etc/sogo/sogo.conf
install -D -m 755 Scripts/openchange_user_cleanup debian/tmp/usr/sbin/openchange_user_cleanup
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
-1
View File
@@ -85,7 +85,6 @@ install-arch: build-arch
install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo
install -d -m 750 debian/tmp/etc/sogo
install -D -m 640 Scripts/sogo.conf debian/tmp/etc/sogo/sogo.conf
install -D -m 755 Scripts/openchange_user_cleanup debian/tmp/usr/sbin/openchange_user_cleanup
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
+5 -5
View File
@@ -175,9 +175,9 @@ rm -fr ${RPM_BUILD_ROOT}
# small tweak to the python script for RHEL5
# if hex(sys.hexversion) < 0x02060000
%if %{python_sys_pyver} < 33947648
sed -i 's!/usr/bin/env python!/usr/bin/env python2.6!' Scripts/openchange_user_cleanup
%endif
#%if %{python_sys_pyver} < 33947648
# sed -i 's!/usr/bin/env python!/usr/bin/env python2.6!' Scripts/openchange_user_cleanup
#%endif
# ****************************** build ********************************
@@ -244,7 +244,7 @@ install -d ${RPM_BUILD_ROOT}/var/run/sogo
install -d ${RPM_BUILD_ROOT}/var/spool/sogo
install -d -m 750 -o %sogo_user -g %sogo_user ${RPM_BUILD_ROOT}/etc/sogo
install -m 640 -o %sogo_user -g %sogo_user Scripts/sogo.conf ${RPM_BUILD_ROOT}/etc/sogo/
install -m 755 Scripts/openchange_user_cleanup ${RPM_BUILD_ROOT}/%{_sbindir}
#install -m 755 Scripts/openchange_user_cleanup ${RPM_BUILD_ROOT}/%{_sbindir}
cat Apache/SOGo.conf | sed -e "s@/lib/@/%{_lib}/@g" > ${RPM_BUILD_ROOT}/etc/httpd/conf.d/SOGo.conf
install -m 600 Scripts/sogo.cron ${RPM_BUILD_ROOT}/etc/cron.d/sogo
cp Scripts/tmpwatch ${RPM_BUILD_ROOT}/etc/cron.daily/sogo-tmpwatch
@@ -304,7 +304,7 @@ rm -fr ${RPM_BUILD_ROOT}
%dir %attr(0700, %sogo_user, %sogo_user) %{_var}/spool/sogo
%dir %attr(0750, root, %sogo_user) %{_sysconfdir}/sogo
%{_sbindir}/sogod
%{_sbindir}/openchange_user_cleanup
#%{_sbindir}/openchange_user_cleanup
%{_libdir}/sogo/libSOGo.so*
%{_libdir}/sogo/libSOGoUI.so*
%{_libdir}/GNUstep/SOGo/AdministrationUI.SOGo