diff --git a/doc/rpm-build/debian.rules b/doc/rpm-build/debian.rules index 64e484f8af..311f96223f 100644 --- a/doc/rpm-build/debian.rules +++ b/doc/rpm-build/debian.rules @@ -43,7 +43,7 @@ install: build mkdir -p $(CURDIR)/debian/egroupware-epl-core/etc/egroupware cp $(CURDIR)/doc/rpm-build/apache.conf $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache.conf # Debian/Ubuntu uses /usr/lib/ssl/certs with files symlinked from /usr/share/ca-certificates instead for trusted OpenSSL CA - sed -i '' 's|/etc/pki/tls/certs:/etc/pki/ca-trust|/usr/lib/ssl/certs:/usr/share/ca-certificates|g' $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache.conf + sed -i 's|/etc/pki/tls/certs:/etc/pki/ca-trust|/usr/lib/ssl/certs:/usr/share/ca-certificates|g' $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache.conf # Univention needs access to /usr/sbin/univention-directory-manager symlinked to /usr/share/univention-directory-manager-tools/directory-manager-cli sed 's|\(open_basedir .*\)|\1:/usr/sbin/univention-directory-manager:/usr/share/univention-directory-manager-tools/directory-manager-cli|' \ $(CURDIR)/doc/rpm-build/apache.conf > $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache-univention.conf diff --git a/doc/rpm-build/egroupware-epl.spec b/doc/rpm-build/egroupware-epl.spec index 56df05a0ce..782bf17103 100644 --- a/doc/rpm-build/egroupware-epl.spec +++ b/doc/rpm-build/egroupware-epl.spec @@ -1,5 +1,5 @@ Name: egroupware-epl -Version: 17.1.20171115 +Version: 17.1.20180118 Release: Summary: EGroupware is a web-based groupware suite written in php Group: Web/Database @@ -577,7 +577,7 @@ cp egroupware/doc/rpm-build/apache.conf $RPM_BUILD_ROOT%{httpdconfd}/egroupware. %if 0%{?suse_version} # RHEL/CentOS needs open_basedir to include /etc/pki/tls/certs:/etc/pki/ca-trust # SUSE uses /var/lib/ca-certificates/openssl instead for trusted OpenSSL CA - sed -i '' 's|/etc/pki/tls/certs:/etc/pki/ca-trust|/var/lib/ca-certificates/openssl|g' $RPM_BUILD_ROOT%{httpdconfd}/egroupware.conf + sed -i 's|/etc/pki/tls/certs:/etc/pki/ca-trust|/var/lib/ca-certificates/openssl|g' $RPM_BUILD_ROOT%{httpdconfd}/egroupware.conf %endif mkdir -p $RPM_BUILD_ROOT/etc/cron.d sed 's/apache/%{apache_user}/' egroupware/doc/rpm-build/egroupware.cron > $RPM_BUILD_ROOT/etc/cron.d/egroupware