Hello community, here is the log from the commit of package horde5 for openSUSE:Factory checked in at 2017-05-03 15:56:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/horde5 (Old) and /work/SRC/openSUSE:Factory/.horde5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "horde5" Wed May 3 15:56:47 2017 rev:10 rq:492326 version:5.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/horde5/horde5.changes 2016-10-10 16:23:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.horde5.new/horde5.changes 2017-05-03 15:56:48.583448147 +0200 @@ -1,0 +2,16 @@ +Mon Apr 24 15:36:11 UTC 2017 - [email protected] + +- Sources are now at https locations + +------------------------------------------------------------------- +Mon Apr 24 13:10:09 UTC 2017 - [email protected] + +- Reverted last change, because it breaks all buildings except + thumbleweed and factory. + +------------------------------------------------------------------- +Mon Mar 20 18:08:50 CET 2017 - [email protected] + +- Require system user wwwrun and group www + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde5.spec ++++++ --- /var/tmp/diff_new_pack.z316ag/_old 2017-05-03 15:56:49.467323366 +0200 +++ /var/tmp/diff_new_pack.z316ag/_new 2017-05-03 15:56:49.471322802 +0200 @@ -1,7 +1,7 @@ # # spec file for package horde5 # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,40 @@ %define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear) -%define xmldir /var/lib/pear -%define hordedir /usr/share/php5/PEAR/www/horde - -Summary: Horde Base Application -License: LGPL-2.1 -Group: Productivity/Networking/Web/Utilities - +%define xmldir %{_localstatedir}/lib/pear +%define hordedir %{_datadir}/php5/PEAR/www/horde Name: horde5 Version: 5.2.12 Release: 0 -Source0: http://pear.horde.org/get/horde-%{version}.tgz +Summary: Horde Base Application +License: LGPL-2.1 +Group: Productivity/Networking/Web/Utilities +Url: https://www.horde.org/ +Source0: https://pear.horde.org/get/horde-%{version}.tgz Source1: horde.conf Source2: horde.vhost.conf.template Source3: registry.local.php -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://www.horde.org/ +BuildRequires: fdupes BuildRequires: php-pear >= 1.8.2 +BuildRequires: php5-pear-Horde_Role >= 1.0.1 +BuildRequires: php5-pear-channel-horde +## php pecl +Requires: php-ctype +Requires: php-ftp +Requires: php-gettext +Requires: php-hash +Requires: php-json +Requires: php-mbstring +## Conflicts +Requires: php-pear >= 1.8.2 +Requires: php-zip +## The following are "optional" but functionality will fail without further notice when they are missing +## People were discussing so it's probably wiser to add them by default +Requires: php5-pear-Auth_SASL +## As of horde H5, pear Date should not be needed for the base horde installation anymore ## Ralf Lang ## 2012-11-27 +#Requires: php5-pear-Date +Requires: php5-pear-HTTP_Request +Requires: php5-pear-HTTP_WebDAV_Server ## Required pear modules Requires: php5-pear-Horde_Alarm >= 2.0.0 Requires: php5-pear-Horde_Argv >= 2.0.0 @@ -66,6 +83,21 @@ Requires: php5-pear-Horde_Util >= 2.0.0 Requires: php5-pear-Horde_Vfs >= 2.0.0 Requires: php5-pear-Horde_View >= 2.0.0 +## Normal pear requirements +Requires: php5-pear-MDB2 +Requires: php5-pear-Net_SMTP +Requires: php5-pear-XML_Serializer +## Channel file +Requires: php5-pear-channel-horde +Suggests: php-fileinfo +Suggests: php-filter +Suggests: php-iconv +Suggests: php-pear-Services_Weather +Suggests: php-ssh2 +Suggests: php-tidy +Suggests: php5-pear-Console_Getopt +Suggests: php5-pear-Console_Table +Suggests: php5-pear-File_Find Suggests: php5-pear-Horde_ActiveSync >= 2.0.3 Suggests: php5-pear-Horde_Db >= 2.0.1 Suggests: php5-pear-Horde_Feed >= 2.0.0 @@ -74,48 +106,11 @@ Suggests: php5-pear-Horde_Service_Twitter >= 2.0.0 Suggests: php5-pear-Horde_Service_Weather >= 2.0.0 Suggests: php5-pear-Horde_SyncMl >= 2.0.0 - -## The following are "optional" but functionality will fail without further notice when they are missing -## People were discussing so it's probably wiser to add them by default -Requires: php5-pear-Auth_SASL -## As of horde H5, pear Date should not be needed for the base horde installation anymore ## Ralf Lang ## 2012-11-27 -#Requires: php5-pear-Date -Requires: php5-pear-HTTP_Request -Requires: php5-pear-HTTP_WebDAV_Server -Requires: php5-pear-Net_SMTP -Requires: php5-pear-XML_Serializer - +Suggests: php5-pear-MDB2_Driver_mysql +Suggests: php5-pear-MDB2_Driver_mysqli ## These are less frequently necessary and don't result in things just not working Suggests: php5-pear-Net_DNS2 -Suggests: php5-pear-Console_Getopt -Suggests: php5-pear-Console_Table -Suggests: php5-pear-File_Find -Suggests: php-filter -Suggests: php-pear-Services_Weather -Suggests: php-ssh2 -Suggests: php-fileinfo -Suggests: php-tidy -Suggests: php-iconv - -## Channel file -Requires: php5-pear-channel-horde -## php pecl - -Requires: php-ctype -Requires: php-ftp -Requires: php-gettext -Requires: php-hash -Requires: php-json -Requires: php-mbstring -Requires: php-zip -## Conflicts -Requires: php-pear >= 1.8.2 -BuildRequires: php5-pear-Horde_Role >= 1.0.1 -BuildRequires: php5-pear-channel-horde -## Normal pear requirements -Requires: php5-pear-MDB2 -Suggests: php5-pear-MDB2_Driver_mysqli php5-pear-MDB2_Driver_mysql -BuildRequires: fdupes +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -151,32 +146,32 @@ pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0} ## configs written by the web configurator should go to etc -%{__install} -m 0660 -D %{buildroot}/%{hordedir}/config/conf.php.dist %{buildroot}/etc/horde/horde/conf.php -%{__install} -m 0660 -D %{buildroot}/%{hordedir}/config/conf.php.dist %{buildroot}/etc/horde/horde/conf.bak.php -%{__rm} %{buildroot}/%{hordedir}/config/conf.php.dist -%{__ln_s} /etc/horde/horde/conf.php %{buildroot}/%{hordedir}/config/conf.php -%{__ln_s} /etc/horde/horde/conf.bak.php %{buildroot}/%{hordedir}/config/conf.bak.php +install -m 0660 -D %{buildroot}/%{hordedir}/config/conf.php.dist %{buildroot}%{_sysconfdir}/horde/horde/conf.php +install -m 0660 -D %{buildroot}/%{hordedir}/config/conf.php.dist %{buildroot}%{_sysconfdir}/horde/horde/conf.bak.php +rm %{buildroot}/%{hordedir}/config/conf.php.dist +ln -s %{_sysconfdir}/horde/horde/conf.php %{buildroot}/%{hordedir}/config/conf.php +ln -s %{_sysconfdir}/horde/horde/conf.bak.php %{buildroot}/%{hordedir}/config/conf.bak.php ## registry modifications should happen in etc -%{__rm} %{buildroot}/%{hordedir}/config/registry.d/README -%{__mv} %{buildroot}/%{hordedir}/config/registry.d %{buildroot}/etc/horde/horde/registry.d -%{__ln_s} /etc/horde/horde/registry.d %{buildroot}/%{hordedir}/config/registry.d -%{__install} -m 0660 -D %{SOURCE3} %{buildroot}/etc/horde/horde/registry.local.php -%{__ln_s} /etc/horde/horde/registry.local.php %{buildroot}/%{hordedir}/config/registry.local.php +rm %{buildroot}/%{hordedir}/config/registry.d/README +mv %{buildroot}/%{hordedir}/config/registry.d %{buildroot}%{_sysconfdir}/horde/horde/registry.d +ln -s %{_sysconfdir}/horde/horde/registry.d %{buildroot}/%{hordedir}/config/registry.d +install -m 0660 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/horde/horde/registry.local.php +ln -s %{_sysconfdir}/horde/horde/registry.local.php %{buildroot}/%{hordedir}/config/registry.local.php ## custom prefs should be configured in prefs.local.php -%{__install} -m 0660 -D %{buildroot}/%{hordedir}/config/prefs.php %{buildroot}/etc/horde/horde/prefs.local.php -%{__ln_s} /etc/horde/horde/prefs.local.php %{buildroot}/%{hordedir}/config/prefs.local.php +install -m 0660 -D %{buildroot}/%{hordedir}/config/prefs.php %{buildroot}%{_sysconfdir}/horde/horde/prefs.local.php +ln -s %{_sysconfdir}/horde/horde/prefs.local.php %{buildroot}/%{hordedir}/config/prefs.local.php -%{__install} -m 0660 -D %{SOURCE1} %{buildroot}/etc/horde/apache-snippets.d/horde.conf -%{__install} -m 0660 -D %{SOURCE2} %{buildroot}/etc/apache2/vhosts.d/horde.vhost.conf.template +install -m 0660 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/horde/apache-snippets.d/horde.conf +install -m 0660 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/apache2/vhosts.d/horde.vhost.conf.template ## clean individual .htaccess files as they are incorporated into vhost snippets -%{__rm} %{buildroot}/%{hordedir}/.htaccess -%{__rm} %{buildroot}/%{hordedir}/locale/.htaccess -%{__rm} %{buildroot}/%{hordedir}/config/.htaccess -%{__rm} %{buildroot}/%{hordedir}/templates/.htaccess -%{__rm} %{buildroot}/%{hordedir}/lib/.htaccess -%{__rm} %{buildroot}/%{peardir}/data/horde/scripts/.htaccess -%{__rm} %{buildroot}/%{hordedir}/rpc/.htaccess +rm %{buildroot}/%{hordedir}/.htaccess +rm %{buildroot}/%{hordedir}/locale/.htaccess +rm %{buildroot}/%{hordedir}/config/.htaccess +rm %{buildroot}/%{hordedir}/templates/.htaccess +rm %{buildroot}/%{hordedir}/lib/.htaccess +rm %{buildroot}/%{peardir}/data/horde/scripts/.htaccess +rm %{buildroot}/%{hordedir}/rpc/.htaccess # remove INSTALL file rm -f %{buildroot}%{_docdir}/%{name}/INSTALL rm -f %{buildroot}%{_docdir}/%{name}/horde/INSTALL @@ -186,7 +181,7 @@ # Clean up unnecessary files rm pearrc -%{__rm} -rf %{buildroot}%{peardir}/.{filemap,lock,registry,channels,depdb,depdblock} +rm -rf %{buildroot}%{peardir}/.{filemap,lock,registry,channels,depdb,depdblock} # Install XML package description mkdir -p %{buildroot}%{xmldir} @@ -248,20 +243,20 @@ %{_bindir}/horde-sql-shell %{_bindir}/horde-themes %{_bindir}/horde-translation -%dir /etc/apache2 -%dir /etc/apache2/vhosts.d +%dir %{_sysconfdir}/apache2 +%dir %{_sysconfdir}/apache2/vhosts.d ## the config stuff in /etc %defattr(0640, wwwrun, root, 0750) -%dir /etc/horde -%dir /etc/horde/horde -%dir /etc/horde/horde/registry.d -%dir /etc/horde/apache-snippets.d -%config /etc/horde/apache-snippets.d/horde.conf -%config(noreplace) /etc/horde/horde/conf.php -%config(noreplace) /etc/horde/horde/conf.bak.php -%config(noreplace) /etc/horde/horde/registry.local.php -%config(noreplace) /etc/horde/horde/prefs.local.php -%config /etc/apache2/vhosts.d/horde.vhost.conf.template +%dir %{_sysconfdir}/horde +%dir %{_sysconfdir}/horde/horde +%dir %{_sysconfdir}/horde/horde/registry.d +%dir %{_sysconfdir}/horde/apache-snippets.d +%config %{_sysconfdir}/horde/apache-snippets.d/horde.conf +%config(noreplace) %{_sysconfdir}/horde/horde/conf.php +%config(noreplace) %{_sysconfdir}/horde/horde/conf.bak.php +%config(noreplace) %{_sysconfdir}/horde/horde/registry.local.php +%config(noreplace) %{_sysconfdir}/horde/horde/prefs.local.php +%config %{_sysconfdir}/apache2/vhosts.d/horde.vhost.conf.template %files lang -f horde.lang %defattr(0644,root,root,0755)
