January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit horde3-turba for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package horde3-turba for openSUSE:Factory checked in at Mon Jan 24 16:28:29 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3-turba/horde3-turba.changes 2010-12-09 12:07:27.000000000 +0100 @@ -0,0 +1,60 @@ +------------------------------------------------------------------- +Wed Oct 13 15:16:25 UTC 2010 - lang(a)b1-systems.de + +- moved to external logfile +- made build on SLE 11 & Friends + +------------------------------------------------------------------- +Wed Oct 13 15:14:59 UTC 2010 - lang(a)b1-systems.de + +- added old log + + +* Tue Oct 12 2010 Ralf Lang <lang(a)b1-systems.de> +- upgraded to horde-turba-2.3.5 +- Changed description to fit into 79 character rule +- removed the name to id patches +- updated the php to php5 patch +* Mon Mar 17 2008 Matthias Boettger <mhoppe(a)suse.de> +- applied fixed turba-h3-2.2-rc3-php5_exec.patch to solve dependency problem +- disabled Patch: + Patch9: HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch +* Sun Mar 16 2008 Matthias Boettger <mhoppe(a)suse.de> +- updated to 2.2-rc3 +- fixed turba-h3-2.1.2-php5_exec.patch + renamed to turba-h3-2.2-rc3-php5_exec.patch +- added new %{_turbadir}/addressbooks +* Sat Dec 08 2007 Marcus H�we <suse-tux(a)gmx.de> +- updated to 2.2-rc1 +- renamed package to horde-turba +- disabled the following patches: + Patch1: HK-GW-Fix_notice_on_addressbook_creation.patch + Patch2: HK-GW-Fix_address_book_deletion_1.patch + Patch3: HK-GW-Changes_after_ALPHA.patch + Patch4: HK-GW-Fix_share_id_change.patch + Patch5: HK-GW-Fix_editing_contacts.patch + Patch6: HK-GW-Ldap_read_only_fix.patch +- added the following patches: + Patch7: HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch + Patch8: HK-GW-turba_2.2_RC1-Fix_share_id_change.patch + Patch9: HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch +* Wed Nov 07 2007 Marcus H�we <suse-tux(a)gmx.de> +- updated to 2.2-alpha +- updated Source1 +- updated Patch0 (turba-h3-2.1.2-php5_exec.patch) +- the following patches were taken from kolab cvs in order to make + turba work with kolab: + Patch1: HK-GW-Fix_notice_on_addressbook_creation.patch + Patch2: HK-GW-Fix_address_book_deletion_1.patch + Patch3: HK-GW-Changes_after_ALPHA.patch + Patch4: HK-GW-Fix_share_id_change.patch + Patch5: HK-GW-Fix_editing_contacts.patch + Patch6: HK-GW-Ldap_read_only_fix.patch +* Sun Nov 05 2006 Marcus Hüwe <suse-tux(a)gmx.de> +- new upstream version 2.1.3 +* Thu Aug 24 2006 Marcus Hüwe <suse-tux(a)gmx.de> +- new upstream version (2.1.2) +- added turba-h3-2.1.2-php5_exec.patch +* Sat Jun 17 2006 Marcus Hüwe <suse-tux(a)gmx.de> +- initial build + calling whatdependson for head-i586 New: ---- HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch HK-GW-turba_2.2_RC1-Fix_share_id_change.patch HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch horde3-turba.changes horde3-turba.spec turba-h3-2.2-alpha-sources.php.kolab turba-h3-2.3.5-php5_exec.patch turba-h3-2.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3-turba.spec ++++++ # # spec file for package horde3-turba # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde %define _turbadir %{_hordedir}/turba %define _pversion 2.3.5 Name: horde3-turba Version: 2.3.5 Release: 1 Summary: The Horde Groupware Address Book License: Other License(s), see package, Other uncritical OpenSource License Group: Productivity/Networking/Other Url: http://www.horde.org/turba Source0: turba-h3-%{_pversion}.tar.bz2 Source1: turba-h3-2.2-alpha-sources.php.kolab Patch0: turba-h3-2.3.5-php5_exec.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: turba = %{version} Obsoletes: turba <= 2.3.4 Requires: horde3 >= 3.3.0 Requires: php5-pear-mdb2 Requires: php5-pear-net_ldap BuildRequires: apache2-devel %if 0%{?sles_version} != 10 BuildRequires: fdupes %endif %description Turba is a set of PHP scripts that implement a contacts directory and management interface. Turba also provides an API for external applications to interface with address books, providing adding and searching features that you can hook right into other applications. Authors: -------- Chuck Hagenbuch Jon Parise Jan Schneider Michael J. Rubinsky %prep %setup -qn turba-h3-%{_pversion} %__cp %{S:1} ./config/sources.php.kolab %patch0 %build pushd config/ for i in *.dist; do %__mv $i ${i%.dist}; done popd %install %__mkdir_p %{buildroot}%{_turbadir} %__cp -r ./* %{buildroot}%{_turbadir} %__rm -rf %{buildroot}%{_turbadir}/{docs,README,LICENSE} # remove and link duplicate files if not SLES 10 %if 0%{?sles_version} != 10 %fdupes %buildroot/%{_turbadir} %endif %clean %__rm -rf %{buildroot} %files %defattr(-, root, root) %doc docs README LICENSE %dir %{_hordedir} %dir %{_turbadir} %lang(ar_SY) %{_turbadir}/locale/ar_SY/LC_MESSAGES/turba.mo %lang(bg_BG) %{_turbadir}/locale/bg_BG/LC_MESSAGES/turba.mo %lang(ca_ES) %{_turbadir}/locale/ca_ES/LC_MESSAGES/turba.mo %lang(cs_CZ) %{_turbadir}/locale/cs_CZ/LC_MESSAGES/turba.mo %lang(el_GR) %{_turbadir}/locale/el_GR/LC_MESSAGES/turba.mo %lang(et_EE) %{_turbadir}/locale/et_EE/LC_MESSAGES/turba.mo %lang(da_DK) %{_turbadir}/locale/da_DK/LC_MESSAGES/turba.mo %lang(de_DE) %{_turbadir}/locale/de_DE/LC_MESSAGES/turba.mo %lang(es_ES) %{_turbadir}/locale/es_ES/LC_MESSAGES/turba.mo %lang(eu_ES) %{_turbadir}/locale/eu_ES/LC_MESSAGES/turba.mo %lang(fa_IR) %{_turbadir}/locale/fa_IR/LC_MESSAGES/turba.mo %lang(fi_FI) %{_turbadir}/locale/fi_FI/LC_MESSAGES/turba.mo %lang(fr_FR) %{_turbadir}/locale/fr_FR/LC_MESSAGES/turba.mo %lang(gl_ES) %{_turbadir}/locale/gl_ES/LC_MESSAGES/turba.mo %lang(hr_HR) %{_turbadir}/locale/hr_HR/LC_MESSAGES/turba.mo %lang(hu_HU) %{_turbadir}/locale/hu_HU/LC_MESSAGES/turba.mo %lang(is_IS) %{_turbadir}/locale/is_IS/LC_MESSAGES/turba.mo %lang(it_IT) %{_turbadir}/locale/it_IT/LC_MESSAGES/turba.mo %lang(ja_JP) %{_turbadir}/locale/ja_JP/LC_MESSAGES/turba.mo %lang(ko_KR) %{_turbadir}/locale/ko_KR/LC_MESSAGES/turba.mo %lang(lt_LT) %{_turbadir}/locale/lt_LT/LC_MESSAGES/turba.mo %lang(lv_LV) %{_turbadir}/locale/lv_LV/LC_MESSAGES/turba.mo %lang(mk_MK) %{_turbadir}/locale/mk_MK/LC_MESSAGES/turba.mo %lang(nb_NO) %{_turbadir}/locale/nb_NO/LC_MESSAGES/turba.mo %lang(nl_NL) %{_turbadir}/locale/nl_NL/LC_MESSAGES/turba.mo %lang(nn_NO) %{_turbadir}/locale/nn_NO/LC_MESSAGES/turba.mo %lang(pl_PL) %{_turbadir}/locale/pl_PL/LC_MESSAGES/turba.mo %lang(pt_BR) %{_turbadir}/locale/pt_BR/LC_MESSAGES/turba.mo %lang(pt_PT) %{_turbadir}/locale/pt_PT/LC_MESSAGES/turba.mo %lang(ro_RO) %{_turbadir}/locale/ro_RO/LC_MESSAGES/turba.mo %lang(ru_RU) %{_turbadir}/locale/ru_RU/LC_MESSAGES/turba.mo %lang(sk_SK) %{_turbadir}/locale/sk_SK/LC_MESSAGES/turba.mo %lang(sl_SI) %{_turbadir}/locale/sl_SI/LC_MESSAGES/turba.mo %lang(sv_SE) %{_turbadir}/locale/sv_SE/LC_MESSAGES/turba.mo %lang(tr_TR) %{_turbadir}/locale/tr_TR/LC_MESSAGES/turba.mo %lang(zh_TW) %{_turbadir}/locale/zh_TW/LC_MESSAGES/turba.mo %lang(uk_UA) %{_turbadir}/locale/uk_UA/LC_MESSAGES/turba.mo %lang(zh_CN) %{_turbadir}/locale/zh_CN/LC_MESSAGES/turba.mo %dir %{_turbadir}/locale %dir %{_turbadir}/locale/* %dir %{_turbadir}/locale/*/LC_MESSAGES %{_turbadir}/locale/*/*.xml %{_turbadir}/locale/.htaccess %{_turbadir}/*.php %{_turbadir}/addressbooks %{_turbadir}/js %{_turbadir}/lib #%{_turbadir}/locale %{_turbadir}/po %{_turbadir}/scripts %{_turbadir}/templates %{_turbadir}/themes %attr(0750, wwwrun, www) %dir %{_turbadir}/config %attr(0640, wwwrun, www) %config(noreplace) %{_turbadir}/config/* %attr(0640, wwwrun, www) %config(noreplace) %{_turbadir}/config/.htaccess %changelog ++++++ HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch ++++++ Fixes editing contacts. diff -r e2bcaaed2d6b turba/lib/Driver/share.php --- a/turba/lib/Driver/share.php Wed Nov 28 17:23:14 2007 +0100 +++ b/turba/lib/Driver/share.php Wed Nov 28 17:24:17 2007 +0100 @@ -58,7 +58,7 @@ class Turba_Driver_share extends Turba_D */ function getName() { - $share_parts = explode(':', $this->_share->getName()); + $share_parts = explode(':', $this->_share->getId()); return array_pop($share_parts); } ++++++ HK-GW-turba_2.2_RC1-Fix_share_id_change.patch ++++++ This fixes a problem with the way the Kolab share driver handles ids. diff -r 0ffb2574c923 turba/lib/Turba.php --- a/turba/lib/Turba.php Wed Nov 28 17:04:21 2007 +0100 +++ b/turba/lib/Turba.php Wed Nov 28 17:23:14 2007 +0100 @@ -439,7 +439,7 @@ class Turba { $source_config = $sources[$source]; $source_config['params']['share'] = &$share; - $sources[$sourceKey] = $source_config; + $sources[$share->getId()] = $source_config; } else { $notification->push($driver, 'horde.error'); } @@ -564,7 +564,7 @@ class Turba { /* Add the new addressbook to the user's list of visible * address books. */ $prefs = explode("\n", $GLOBALS['prefs']->getValue('addressbooks')); - if (array_search($share_id, $prefs) === false) { + if (array_search($share->getId(), $prefs) === false) { $GLOBALS['prefs']->setValue('addressbooks', $GLOBALS['prefs']->getValue('addressbooks') . "\n" . $share_id); } return $share; ++++++ HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch ++++++ This is a temporary fix to mark the ldap addressbook as read-only. This should be solved with the Horde Perms package but this needs a new driver. diff -r 449ef255c5ff turba/lib/Driver/ldap.php --- a/turba/lib/Driver/ldap.php Wed Nov 28 17:24:17 2007 +0100 +++ b/turba/lib/Driver/ldap.php Wed Nov 28 17:26:17 2007 +0100 @@ -53,6 +53,9 @@ class Turba_Driver_ldap extends Turba_Dr } if (empty($params['deref'])) { $params['deref'] = LDAP_DEREF_NEVER; + } + if (empty($params['read_only'])) { + $params['read_only'] = false; } parent::Turba_Driver($params); @@ -749,4 +752,25 @@ class Turba_Driver_ldap extends Turba_Dr return $dn; } + /** + * Checks if the current user has the requested permission + * on this source. + * + * @param integer $perm The permission to check for. + * + * @return boolean true if user has permission, false otherwise. + */ + function hasPermission($perm) + { + if ($this->_params['read_only'] === false) { + return parent::hasPermission($perm); + } else { + switch ($perm) { + case PERMS_EDIT: return false; + case PERMS_DELETE: return false; + default: return parent::hasPermission($perm); + } + } + } + } ++++++ turba-h3-2.2-alpha-sources.php.kolab ++++++ <?php /* Configuration for a Kolab-Server * if you are going to use horde in combination with kolab you can * use this file (backup your existing sources.php and rename this * too sources.php) */ /* Begin Kolab sources. */ if (!empty($GLOBALS['conf']['kolab']['enabled'])) { require_once 'Horde/Kolab.php'; if (!is_callable('Kolab', 'getServer')) { $server = $GLOBALS['conf']['kolab']['ldap']['server']; } else { $server = Kolab::getServer('ldap'); } /* A global address book for a Kolab Server. This is typically a * read-only public directory, stored in the default Kolab LDAP server. * The user accessing this should have read permissions to the shared * directory in LDAP. */ $cfgSources['kolab_global'] = array( 'title' => _("Global Address Book"), 'type' => 'ldap', 'params' => array( 'server' => $server, 'port' => $GLOBALS['conf']['kolab']['ldap']['port'], 'tls' => false, 'root' => $GLOBALS['conf']['kolab']['ldap']['basedn'], 'sizelimit' => 200, 'dn' => array('cn'), 'objectclass' => array( 'inetOrgPerson' ), 'scope' => 'one', 'charset' => 'utf-8', 'version' => 3, 'bind_dn' => '', 'bind_password' => '', ), 'map' => array( '__key' => 'dn', 'name' => 'cn', 'firstname' => 'givenName', 'lastname' => 'sn', 'email' => 'mail', 'alias' => 'alias', 'title' => 'title', 'company' => 'o', 'workStreet' => 'street', 'workCity' => 'l', 'workProvince' => 'st', 'workPostalCode' => 'postalCode', 'workCountry' => 'c', 'homePhone' => 'homePhone', 'workPhone' => 'telephoneNumber', 'cellPhone' => 'mobile', 'fax' => 'fax', 'notes' => 'description', 'freebusyUrl' => 'kolabHomeServer', ), 'search' => array( 'name', 'firstname', 'lastname', 'email', 'title', 'company', 'workAddress', 'workCity', 'workProvince', 'workPostalCode', 'workCountry', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'notes', ), 'strict' => array( 'dn', ), 'export' => true, 'browse' => true, ); /** * The local address books for a Kolab user. These are stored in specially * flagged contact folder within the users Cyrus IMAP mailbox. */ $cfgSources['kolab'] = array( 'title' => _("Contacts"), 'type' => 'kolab', 'params' => array( 'charset' => 'utf-8', ), 'map' => array( '__key' => 'uid', 'name' => 'full-name', 'firstname' => 'given-name', 'lastname' => 'last-name', 'title' => 'job-title', 'company' => 'organization', 'notes' => 'body', 'website' => 'web-page', 'nickname' => 'nick-name', 'emails' => 'emails', 'homePhone' => 'phone-home1', 'workPhone' => 'phone-business1', 'cellPhone' => 'phone-mobile', 'fax' => 'phone-businessfax', 'workStreet' => 'addr-business-street', 'workCity' => 'addr-business-locality', 'workProvince' => 'addr-business-region', 'workPostalCode' => 'addr-business-postal-code', 'workCountry' => 'addr-business-country', 'homeStreet' => 'addr-home-street', 'homeCity' => 'addr-home-locality', 'homeProvince' => 'addr-home-region', 'homePostalCode' => 'addr-home-postal-code', 'homeCountry' => 'addr-home-country', ), 'search' => array( 'name', 'firstname', 'lastname', 'emails', 'title', 'company', 'notes', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'workStreet', 'workCity', 'workProvince', 'workPostalCode', 'workCountry', 'homeStreet', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', 'website', 'nickname' ), 'strict' => array( 'uid', ), 'export' => true, 'browse' => true, 'use_shares' => true, 'shares_only' => true, ); } /* End Kolab sources. */ ++++++ turba-h3-2.3.5-php5_exec.patch ++++++ Index: scripts/import_squirrelmail_file_abook.php =================================================================== --- scripts/import_squirrelmail_file_abook.php.orig +++ scripts/import_squirrelmail_file_abook.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script imports SquirrelMail file-based addressbooks into Turba. Index: scripts/import_squirrelmail_sql_abook.php =================================================================== --- scripts/import_squirrelmail_sql_abook.php.orig +++ scripts/import_squirrelmail_sql_abook.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script imports SquirrelMail database addressbooks into Turba. Index: scripts/import_vcards.php =================================================================== --- scripts/import_vcards.php.orig +++ scripts/import_vcards.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script imports VCARD data into turba address books. Index: scripts/upgrades/2.1_to_2.2_sql_schema.php =================================================================== --- scripts/upgrades/2.1_to_2.2_sql_schema.php.orig +++ scripts/upgrades/2.1_to_2.2_sql_schema.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * Very basic migration script for moving to the Turba 2.2 default sql schema. Index: scripts/upgrades/public_to_horde_share.php =================================================================== --- scripts/upgrades/public_to_horde_share.php.orig +++ scripts/upgrades/public_to_horde_share.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * Script to migrate an existing 'public' Turba address book to the Index: scripts/upgrades/create_default_histories.php =================================================================== --- scripts/upgrades/create_default_histories.php.orig +++ scripts/upgrades/create_default_histories.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * $Horde: turba/scripts/upgrades/create_default_histories.php,v 1.1.2.5 2008-03-31 17:06:52 jan Exp $ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at Mon Jan 24 16:27:05 CET 2011. -------- --- openldap2/openldap2-client.changes 2011-01-07 09:29:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/openldap2/openldap2-client.changes 2011-01-19 17:54:57.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 19 15:05:27 UTC 2011 - rhafer(a)suse.de + +- Install the correct schema2ldif script (bnc#665530) + +------------------------------------------------------------------- openldap2.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.9BYAwN/_old 2011-01-24 16:25:58.000000000 +0100 +++ /var/tmp/diff_new_pack.9BYAwN/_new 2011-01-24 16:25:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client (Version 2.4.23) +# spec file for package openldap2-client # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif Version: 2.4.23 -Release: 5 +Release: 6 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -347,7 +347,7 @@ chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so* -install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif +install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/schema2ldif %if "%{name}" == "openldap2" %define DOCDIR %{_defaultdocdir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates openldap2.spec: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit horde3-passwd for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package horde3-passwd for openSUSE:Factory checked in at Mon Jan 24 16:25:12 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3-passwd/horde3-passwd.changes 2010-12-09 12:07:05.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sat Oct 30 12:20:48 UTC 2010 - Ralf Lang <lang(a)b1-systems.de> + +- upgrading to passwd 3.1.3 + calling whatdependson for head-i586 New: ---- horde3-passwd.changes horde3-passwd.spec passwd-h3-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3-passwd.spec ++++++ # # spec file for package horde3-passwd # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde %define _passwddir %{_hordedir}/passwd %define _pversion 3.1.3 Name: horde3-passwd Version: 3.1.3 Release: 1 Summary: Passwd is the Horde password changing application License: GPLv2 Group: Productivity/Networking/Other Url: http://www.horde.org/passwd Source0: passwd-h3-%{_pversion}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: passwd = %{version} Requires: horde3 >= 3.1.0 BuildRequires: apache2-devel %description Passwd is the Horde password changing application. While it has been released and is in production use at many sites, it is also under heavy development in an effort to expand and improve the module. Right now, Passwd provides fairly complete support for changing passwords via Poppassd, LDAP, Unix expect scripts, the Unix smbpasswd command for SMB/CIFS passwords, Kolab, ADSI, Pine, Serv-U FTP, VMailMgr, vpopmail, and SQL passwords. Passwd is part of a suite of account management modules for Horde consisting of Accounts, Forwards, Passwd, and Vacation. Collectively these modules now comprise what is known as Sork. There is a mailing list available for these modules. See http://lists.horde.org/mailman/listinfo/sork/ for information or to subscribe. Authors: -------- * Eric Rostetter <eric.rostetter(a)physics.utexas.edu> * Jan Schneider <jan(a)horde.org> %prep %setup -qn passwd-h3-%{_pversion} %build pushd config/ for i in *.dist; do %__mv $i ${i%.dist}; done popd %install %__mkdir_p %{buildroot}%{_passwddir} %__cp -r ./* %{buildroot}%{_passwddir} %__rm -rf %{buildroot}%{_passwddir}/{docs,README,COPYING} %clean %__rm -rf %{buildroot} %files %defattr(-, root, root) %doc docs README COPYING %dir %{_hordedir} %dir %{_passwddir} %{_passwddir}/*.php %{_passwddir}/lib %{_passwddir}/locale %{_passwddir}/po %{_passwddir}/scripts %{_passwddir}/templates %{_passwddir}/themes %attr(0750, wwwrun, www) %dir %{_passwddir}/config %attr(0640, wwwrun, www) %config(noreplace) %{_passwddir}/config/* %attr(0640, wwwrun, www) %config(noreplace) %{_passwddir}/config/.htaccess %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysvinit for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Mon Jan 24 16:24:02 CET 2011. -------- --- sysvinit/sysvinit.changes 2010-11-09 16:32:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-01-21 19:32:25.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 21 19:26:44 CET 2011 - werner(a)suse.de + +- Killproc: Do not be fooled if a device is mounted several times + +------------------------------------------------------------------- @@ -19 +24 @@ -- New killporc version 2.17 +- New killproc version 2.17 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.oEs6Nq/_old 2011-01-24 16:23:29.000000000 +0100 +++ /var/tmp/diff_new_pack.oEs6Nq/_new 2011-01-24 16:23:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sysvinit (Version 2.88) +# spec file for package sysvinit # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ Group: System/Base AutoReqProv: on Version: 2.88 -Release: 23 +Release: 24 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel ++++++ killproc-2.17.dif ++++++ --- /var/tmp/diff_new_pack.oEs6Nq/_old 2011-01-24 16:23:29.000000000 +0100 +++ /var/tmp/diff_new_pack.oEs6Nq/_new 2011-01-24 16:23:29.000000000 +0100 @@ -1,6 +1,29 @@ --- libinit.c -+++ libinit.c 2010-10-27 08:17:06.371926813 +0000 -@@ -728,19 +728,21 @@ int pidof (const char * inname, const ch ++++ libinit.c 2011-01-21 18:25:49.019926024 +0000 +@@ -307,15 +307,16 @@ static void init_mounts(void) + } + } + +-static MNTINFO *find_mount(const char * path) ++static int find_mount(const char * path, MNTINFO *s) + { +- MNTINFO *m; ++ MNTINFO *m, *p = s->parent; + for (m = mounts; m; m = m->next) { +- if (strncmp(path, m->point, m->nlen)) +- continue; +- break; ++ if (s == m && strncmp(path, m->point, m->nlen) == 0) ++ return 1; ++ if (p == m && strncmp(path, p->point, p->nlen) == 0) ++ return 1; + } +- return m; ++ return 0; + } + + extern inline char * handl_buf(char *restrict buf) +@@ -728,19 +729,21 @@ int pidof (const char * inname, const ch if (!(flags & (KTHREAD|KSHORT)) && !isscrpt) { char entry[PATH_MAX+1]; char *realname = NULL; @@ -26,13 +49,13 @@ - if (prefix && find_mount(name) != prefix) - continue; -+ if (find_mount(name) != prefix) ++ if (!find_mount(name, prefix)) + continue; + } if (fstatat(dfd, here(d->d_name, "exe"), &pid_st, 0) < 0) { if (errno != EPERM && errno != EACCES) -@@ -765,12 +767,22 @@ int pidof (const char * inname, const ch +@@ -765,12 +768,22 @@ int pidof (const char * inname, const ch if (strlen(fullname) > PATH_MAX) continue; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit horde3-nag for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package horde3-nag for openSUSE:Factory checked in at Mon Jan 24 16:23:23 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3-nag/horde3-nag.changes 2010-12-09 12:06:37.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Sat Oct 30 12:54:53 UTC 2010 - lang(a)b1-systems.de + +- fixed sed filter for php shebang +- use findlang + calling whatdependson for head-i586 New: ---- HK-JS-nag_2.2_RC1-Fix_library_import.patch horde3-nag.changes horde3-nag.spec nag-h3-2.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3-nag.spec ++++++ # # spec file for package horde3-nag # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde %define _nagdir %{_hordedir}/nag %define _pversion 2.3.6 Name: horde3-nag Version: 2.3.6 Release: 1 Summary: Nag is the Horde task list application License: GPL Group: Productivity/Networking/Other Url: http://www.horde.org/nag Source0: nag-h3-%{_pversion}.tar.bz2 #Patch0: HK-JS-nag_2.2_RC1-Fix_library_import.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: nag = %{version} Obsoletes: nag <= 2.3.5 Requires: horde3 >= 3.3.0 Requires: php5-pear-db BuildRequires: apache2-devel %description Nag is the Horde task list application. It stores todo items, things due later this week, etc. It is very similar in functionality to the Palm ToDo application. Authors: -------- Jon Parise Chuck Hagenbuch Jan Schneider %prep %setup -qn nag-h3-%{_pversion} #%patch0 -p2 %build pushd scripts/ sed -i 's|/usr/bin/php|%{_bindir}/php5|g' {upgrades/create_missing_add_histories_sql.php,upgrades/2004-09-13_add_uid_field.php,upgrades/2006-04-18_add_creator_and_assignee_fields.php,import_vtodos.php} popd pushd config/ for i in *.dist; do %__mv $i ${i%.dist}; done popd %install %__mkdir_p %{buildroot}%{_nagdir} %__cp -r ./* %{buildroot}%{_nagdir} %__rm -rf %{buildroot}%{_nagdir}/{docs,README,COPYING} %find_lang nag %clean %__rm -rf %{buildroot} %files -f nag.lang %defattr(-, root, root) %doc docs README COPYING %dir %{_hordedir} %dir %{_nagdir} %{_nagdir}/*.php %{_nagdir}/js %{_nagdir}/lib %dir %{_nagdir}/locale %{_nagdir}/locale/en_US %{_nagdir}/po %{_nagdir}/scripts %{_nagdir}/templates %{_nagdir}/tasks %{_nagdir}/tasklists %{_nagdir}/themes %attr(0750, wwwrun, www) %dir %{_nagdir}/config %attr(0640, wwwrun, www) %config(noreplace) %{_nagdir}/config/* %attr(0640, wwwrun, www) %config(noreplace) %{_nagdir}/config/.htaccess %changelog ++++++ HK-JS-nag_2.2_RC1-Fix_library_import.patch ++++++ Fixes a problem with importing the WebDAV library. diff -r 39ccfa2e6380 nag/tasklists.php --- a/nag/tasklists.php Thu Nov 29 09:54:49 2007 +0100 +++ b/nag/tasklists.php Thu Nov 29 09:56:00 2007 +0100 @@ -14,7 +14,9 @@ @define('NAG_BASE', dirname(__FILE__)); require_once NAG_BASE . '/lib/base.php'; require_once 'Horde/RPC.php'; -require_once 'Horde/RPC/webdav.php'; +if (@include_once 'HTTP/WebDAV/Server.php') { + require_once 'Horde/RPC/webdav.php'; +} /* Exit if this isn't an authenticated user. */ if (!Auth::getAuth()) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmpd for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package libmpd for openSUSE:Factory checked in at Mon Jan 24 16:22:28 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libmpd/libmpd.changes 2010-12-29 21:17:28.000000000 +0100 @@ -0,0 +1,81 @@ +------------------------------------------------------------------- +Wed Dec 29 19:40:07 UTC 2010 - gber(a)opensuse.org + +- update to version 0.20.0 + * add replaygain support + * add mpd_playlist_load +- cleanup + * do not build static libs + * dropped empty documentation files + * improved summary/description + * use separate .changes files +- build and include API documentation + +------------------------------------------------------------------- +Wed Sep 2 00:00:00 UTC 2009 - detlef(a)links2linux.de + +- new upstream version <0.19.0> + +------------------------------------------------------------------- +Tue Mar 10 00:00:00 UTC 2009 - detlef(a)links2linux.de + +- new upstream version <0.18.0> + +------------------------------------------------------------------- +Sat Dec 27 00:00:00 UTC 2008 - detlef(a)links2linux.de + +- new upstream version <0.17.0> + * Concatenate artist/composer/performer tag. + * Support Query changes using idle command. + * Unix socket support. + * Fix false MPD_CST_STORED_PLAYLIST update. + * Fix build on opensolaris. + * Convert error messages to utf-8 before passing to gmpc. + * Fix memory leak in idle check. + * Several typo's fixed (thx to Priyank) + * (Open) Solaris build fix. + * Fix document distribution (thx to Priyank). + * Support for playlist modification time. + * Get more changed signals using idle command. + * Convert debug output to locale before outputting. + +------------------------------------------------------------------- +Fri Sep 26 00:00:00 UTC 2008 - detlef(a)links2linux.de + +- new upstream version <0.16.1> + * Allow the error_callback to make an error critical (causing + libmpd to disconnect) + +------------------------------------------------------------------- +Mon Sep 22 00:00:00 UTC 2008 - detlef(a)links2linux.de + +- new upstream version <0.16.0> + +------------------------------------------------------------------- +Mon Dec 17 00:00:00 UTC 2007 - detlef(a)links2linux.de + +- new upstream version <0.15.0> + +------------------------------------------------------------------- +Thu Jul 26 00:00:00 UTC 2007 - detlef(a)links2linux.de + +- new upstream release <0.14.0> +- rename libmpd -> libmpd0 + +------------------------------------------------------------------- +Wed Mar 28 00:00:00 UTC 2007 - detlef(a)links2linux.de + +- new upstream release <0.13.0> +- fix URL + +------------------------------------------------------------------- +Mon Jul 24 00:00:00 UTC 2006 - bernhard(a)links2linux.de + +- new upstream release + +------------------------------------------------------------------- +Wed Feb 22 00:00:00 UTC 2006 - bernhard(a)links2linux.de + +- first package + + calling whatdependson for head-i586 New: ---- libmpd-0.20.0.tar.bz2 libmpd-overflow.patch libmpd.changes libmpd.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmpd.spec ++++++ # # spec file for package libmpd # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libmpd Version: 0.20.0 Release: 1 License: GPLv2+ Summary: Client Library to the Music Player Daemon Url: http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client Group: System/Libraries Source: libmpd-0.20.0.tar.bz2 Patch0: libmpd-overflow.patch BuildRequires: pkgconfig(glib-2.0) BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-build %define libname libmpd1 %description libmpd is a library that provides high-level, callback-based access to Music Player Daemon. %package -n %libname Summary: The libmpd package Group: System/Libraries %description -n %libname libmpd is a library that provides high-level, callback-based access to Music Player Daemon. %package devel License: GPLv2+ Summary: The libmpd development package Group: Development/Languages/C and C++ Requires: %libname = %version %description devel libmpd is a library that provides high-level, callback-based access to Music Player Daemon. This package provides the API documentation and development files needed to develop applications based on libmpd. %prep %setup -q %patch0 %build %configure --disable-static make %{?_smp_mflags} make doc %install %make_install rm -f %{buildroot}%{_libdir}/%{name}.la %post -n %libname -p /sbin/ldconfig %postun -n %libname -p /sbin/ldconfig %clean rm -rf %{buildroot} %files -n %libname %defattr(-,root,root,-) %{_libdir}/%{name}.so.* %files devel %defattr(-,root,root,-) %doc ChangeLog COPYING doc/html %{_includedir}/* %{_libdir}/%{name}.so %{_libdir}/pkgconfig/*.pc %changelog ++++++ libmpd-overflow.patch ++++++ Index: src/libmpdclient.c =================================================================== --- src/libmpdclient.c.orig +++ src/libmpdclient.c @@ -436,7 +436,7 @@ static int mpd_connect_un(mpd_Connection close(connection->sock); connection->sock = 0; - snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH, + snprintf(connection->errorStr,MPD_ERRORSTR_MAX_LENGTH, "problems connecting to \"%s\": %s", host, strerror(errno)); connection->error = MPD_ERROR_CONNPORT; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit horde3-mnemo for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package horde3-mnemo for openSUSE:Factory checked in at Mon Jan 24 16:21:48 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3-mnemo/horde3-mnemo.changes 2010-12-09 13:07:12.000000000 +0100 @@ -0,0 +1,30 @@ +------------------------------------------------------------------- +Sat Oct 16 18:10:37 UTC 2010 - Ralf Lang <lang(a)b1-systems.de> + +- changed source of 2.2.4 to bz2 format + +------------------------------------------------------------------- +Sat Oct 16 17:56:05 UTC 2010 - Ralf Lang <lang(a)b1-systems.de> + +- tagged language files as %lang and changed package description + to conform rpmlint + +------------------------------------------------------------------- +Sat Oct 16 16:02:11 UTC 2010 - lang(a)b1-systems.de + +- updated to 2.2.4 + +------------------------------------------------------------------- +Sat Oct 16 15:34:46 UTC 2010 - lang(a)b1-systems.de + +- removed packager statement as it's provoking a warning +- moved log to .changes file + + +------------------------------------------------------------------- +Sat Nov 04 01:00:00 UTC 2006 - Marcus Hüwe <suse-tux(a)gmx.de> +- new upstream version 2.1.1 +------------------------------------------------------------------- +Thu Jun 22 01:00:00 UTC 2006 - Marcus Hüwe <suse-tux(a)gmx.de> +- initial build + calling whatdependson for head-i586 New: ---- horde3-mnemo.changes horde3-mnemo.spec mnemo-h3-2.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3-mnemo.spec ++++++ # # spec file for package horde3-mnemo # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde %define _mnemodir %{_hordedir}/mnemo Name: horde3-mnemo Version: 2.2.4 Release: 1 Summary: The Horde notes and memos application License: Other License(s), see package, Other uncritical OpenSource License Group: Productivity/Networking/Other Url: http://www.horde.org/mnemo Source0: mnemo-h3-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: horde3 >= 3.3.0 BuildRequires: apache2-devel %if 0%{?sles_version} != 10 BuildRequires: fdupes %endif %description Mnemo is the Horde notes and memos application. It lets users keep free-text notes and other bits of information which doesn't fit as a contact, a todo item, an event, etc. It is very similar in functionality to the Palm Memo application. %prep %setup -qn mnemo-h3-%{version} %build %if %suse_version >= 1010 sed -i 's|/usr/bin/php|%{_bindir}/php5|g' scripts/import_vnotes.php sed -i 's|/usr/bin/php|%{_bindir}/php5|g' scripts/import_text_note.php sed -i 's|/usr/bin/php|%{_bindir}/php5|g' scripts/upgrades/convert_datatree_shares_to_sql.php %endif pushd config/ for i in *.dist; do %__mv $i ${i%.dist}; done popd %install %__mkdir_p %{buildroot}%{_mnemodir} %__cp -r ./* %{buildroot}%{_mnemodir} %__rm -rf %{buildroot}%{_mnemodir}/{docs,README,LICENSE} %if 0%{?sles_version} != 10 %fdupes %buildroot%{_mnemodir} %endif %find_lang mnemo %clean %__rm -rf %{buildroot} %files -f mnemo.lang %defattr(-, root, root) %doc docs README LICENSE %dir %{_hordedir} %dir %{_mnemodir} %{_mnemodir}/*.php %{_mnemodir}/js %{_mnemodir}/lib %dir %{_mnemodir}/locale %{_mnemodir}/locale/en_US %{_mnemodir}/po %{_mnemodir}/note %{_mnemodir}/notes %{_mnemodir}/notepads %{_mnemodir}/scripts %{_mnemodir}/templates %{_mnemodir}/themes %attr(0750, wwwrun, www) %dir %{_mnemodir}/config %attr(0640, wwwrun, www) %config(noreplace) %{_mnemodir}/config/* %attr(0640, wwwrun, www) %config(noreplace) %{_mnemodir}/config/.htaccess %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit horde3-mimp for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package horde3-mimp for openSUSE:Factory checked in at Mon Jan 24 16:19:06 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3-mimp/horde3-mimp.changes 2010-12-09 12:02:20.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Sat Oct 30 12:32:32 UTC 2010 - Ralf Lang <lang(a)b1-systems.de> + +- dropped kolab patch as announced on the mailing list (needs separate set of packages to work) +- proper findlang usage + calling whatdependson for head-i586 New: ---- horde3-mimp.changes horde3-mimp.spec mimp-h3-1.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3-mimp.spec ++++++ # # spec file for package horde3-mimp # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde/ %define _mimpdir %{_hordedir}/mimp Name: horde3-mimp Version: 1.1.3 Release: 1 Summary: The reduced mobile device frontend for IMP webmail License: GPL Group: Productivity/Networking/Other Url: http://www.horde.org/mimp Source0: mimp-h3-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: horde3 >= 3.3.0 horde3-imp BuildRequires: apache2-devel %description MIMP is a project to create a version of IMP suitable for mobile devices such as WAP phones or PDAs. Basic IMP functionality is implemented including mailbox viewing and paging, viewing messages, deleting, replying, forwarding, and composing new messages. This is probably the last version of the standalone MIMP packages as MIMP will be an integrated part of further IMP releases Authors: -------- Chuck Hagenbuch <chuck(a)horde.org> Jan Schneider <jan(a)horde.org> Michael Slusarz <slusarz(a)curecanti.org> %prep %setup -qn mimp-h3-%{version} %build pushd config/ for i in *.dist; do %__mv $i ${i%.dist}; done popd %install %__mkdir_p %{buildroot}%{_mimpdir} %__cp -r ./* %{buildroot}%{_mimpdir} %__rm -rf %{buildroot}%{_mimpdir}/{docs,README,COPYING} %find_lang mimp %clean %__rm -rf %{buildroot} %files -f mimp.lang %defattr(-, root, root) %doc docs README COPYING %dir %{_hordedir} %dir %{_mimpdir} %{_mimpdir}/*.php %{_mimpdir}/lib %{_mimpdir}/po %dir %{_mimpdir}/locale %dir /srv/www/htdocs/horde/mimp/locale/* %dir /srv/www/htdocs/horde/mimp/locale/*/LC_MESSAGES %{_mimpdir}/templates %{_mimpdir}/themes %attr(0750, wwwrun, www) %dir %{_mimpdir}/config %attr(0640, wwwrun, www) %config(noreplace) %{_mimpdir}/config/* %attr(0640, wwwrun, www) %config(noreplace) %{_mimpdir}/config/.htaccess %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit horde3-kronolith for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package horde3-kronolith for openSUSE:Factory checked in at Mon Jan 24 16:16:42 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3-kronolith/horde3-kronolith.changes 2010-12-09 12:01:52.000000000 +0100 @@ -0,0 +1,39 @@ +------------------------------------------------------------------- +Thu Dec 9 10:29:19 UTC 2010 - lang(a)b1-systems.de + +- Prepared packaging for 11.4 factory + +* old changelog here + +* Wed Oct 13 2010 Ralf Lang <lang(a)b1-systems.de> upstream 2.3.5 +- removed RC2.2 patches +- updated to upstream 2.3.5 +* Mon Dec 10 2007 Marcus Hüwe <suse-tux(a)gmx.de> +- added new Requires: php5-pear-date_holiday +* Sat Dec 08 2007 Marcus Hüwe <suse-tux(a)gmx.de> +- updated to 2.2-rc1 +- renamed package to horde-kronolith +- disabled the following patches: + Patch1: HK-GW-Fix_create_new_event.patch + Patch2: HK-GW-Fix_share_right_editing.patch + Patch3: HK-UV-Fix_list_events.patch +- added the following patches (from kolab-cvs): + Patch4: HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch (slightly modified to apply flawlessly) + Patch5: HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch + Patch6: HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch + Patch7: HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch +* Wed Nov 07 2007 Marcus Hüwe <suse-tux(a)gmx.de> +- updated to 2.2-alpha +- added Patch0 (kronolith-h3-2.2-alpha-php5_exec.diff) +- fixed Requires +- added kolab specific patches from kolab-cvs: + Patch1: HK-GW-Fix_create_new_event.patch + Patch2: HK-GW-Fix_share_right_editing.patch + Patch3: HK-UV-Fix_list_events.patch +* Sat Nov 04 2006 Marcus Hüwe <suse-tux(a)gmx.de> +- new upstream version 2.1.3 +* Wed Jun 21 2006 Marcus Hüwe <suse-tux(a)gmx.de> +- initial build + + + calling whatdependson for head-i586 New: ---- HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch horde3-kronolith.changes horde3-kronolith.spec kronolith-h3-2.3.5-php5_exec.diff kronolith-h3-2.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3-kronolith.spec ++++++ # # spec file for package horde3-kronolith # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde/ %define _kronolithdir %{_hordedir}/kronolith %define _pversion 2.3.5 Name: horde3-kronolith Version: 2.3.5 Release: 1 Summary: The Horde calendar application License: GPL Group: Productivity/Networking/Other Url: http://www.horde.org/kronolith Source0: kronolith-h3-%{_pversion}.tar.bz2 Patch0: kronolith-h3-2.3.5-php5_exec.diff #Patch1: HK-GW-Fix_create_new_event.patch #Patch2: HK-GW-Fix_share_right_editing.patch #Patch3: HK-UV-Fix_list_events.patch #Patch4: HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch #Patch5: HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch #Patch6: HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch #Patch7: HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kronolith = %{version} Obsoletes: kronolith <= 2.3.4 Requires: horde3 >= 3.3.0 Requires: php5 Requires: php5-pear-http_request Requires: php5-pear-date, php5-pear-date_holidays Requires: php5-pear-db, php5-pear-mail BuildRequires: apache2-devel %description Kronolith is the Horde calendar application. It provides a stable and featureful individual calendar system for every Horde user, with integrated collaboration/scheduling features. It makes extensive use of the Horde Framework to provide integration with other applications. Right now, Kronolith implements a solid, stand-alone calendar system, allowing repeating events, all-day events, custom fields, keywords, shared calendars, iCalendar support, generation of free/busy information, and managing multiple users through Horde Authentication. The calendar API that Kronolith uses is abstracted such that it could work with any backend, but right now we provide SQL (abstracted to support most databases, including MySQL, PostgreSQL, Oracle, and MSSQL via PEAR DB), and Kolab backend libraries. Authors: -------- The Kronolith Team %prep %setup -qn kronolith-h3-%{_pversion} %patch0 #%patch1 -p2 #%patch2 -p2 #%patch3 -p2 #%patch4 -p2 #%patch5 -p2 #%patch6 -p2 #%patch7 -p2 %build pushd config/ for i in *.dist; do %__mv $i ${i%.dist}; done popd %install %__mkdir_p %{buildroot}%{_kronolithdir} %__cp -r ./* %{buildroot}%{_kronolithdir} %__rm -rf %{buildroot}%{_kronolithdir}/{docs,README,COPYING} %clean %__rm -rf %{buildroot} %files %defattr(-, root, root) %doc docs README COPYING %dir %{_hordedir} %dir %{_kronolithdir} %{_kronolithdir}/*.php %{_kronolithdir}/calendars %{_kronolithdir}/feed %{_kronolithdir}/js %{_kronolithdir}/lib %{_kronolithdir}/locale %{_kronolithdir}/po %{_kronolithdir}/scripts %{_kronolithdir}/templates %{_kronolithdir}/themes %attr(0750, wwwrun, www) %dir %{_kronolithdir}/config %attr(0640, wwwrun, www) %config(noreplace) %{_kronolithdir}/config/* %attr(0640, wwwrun, www) %config(noreplace) %{_kronolithdir}/config/.htaccess %changelog ++++++ HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch ++++++ Allows to set the free/busy relevance on a calendar. diff -r e7fdad8797ac kronolith/templates/calendars/calendars.inc --- a/kronolith/templates/calendars/calendars.inc Thu Nov 29 14:36:50 2007 +0100 +++ b/kronolith/templates/calendars/calendars.inc Thu Nov 29 14:43:24 2007 +0100 @@ -8,7 +8,8 @@ var fields = []; <?php foreach ($my_calendars as $id => $cal): ?> fields['<?php echo htmlspecialchars($id) ?>'] = [ "<?php echo rawurlencode(String::convertCharset($cal->get('name'), NLS::getCharset(), 'UTF-8')) ?>", - "<?php echo rawurlencode(String::convertCharset($cal->get('desc'), NLS::getCharset(), 'UTF-8')) ?>"]; + "<?php echo rawurlencode(String::convertCharset($cal->get('desc'), NLS::getCharset(), 'UTF-8')) ?>", + "<?php echo $fbrelevance[$id] ?>"]; <?php endforeach; ?> function newChoice() @@ -25,6 +26,7 @@ function newChoice() document.shares.edit_share.value = share; document.shares.id.value = decodeURIComponent(fields[share][0]); document.shares.description.value = decodeURIComponent(fields[share][1]); + document.shares.fbrelevance[fields[share][2]].checked = true; urlObj.innerHTML = "<?php echo Util::addParameter(Horde::applicationUrl('month.php', true, -1), 'display_cal', '') ?>" + share; subscriptionUrlObj.innerHTML = "<?php echo $webdav ? (Horde::url($registry->get('webroot', 'horde'), true, -1) . '/rpc.php/kronolith/" + share + ".ics"') : Util::addParameter(Horde::applicationUrl('ics.php', true, -1), 'c', '') . '" + share' ?>; } @@ -126,11 +128,55 @@ function checkSubmit() <textarea id="description" name="description" rows="4" cols="60"></textarea> </td> </tr> - <tr> - <td valign="top" class="nowrap rightAlign"> +</table> + +<div class="control"> + <?php echo _("Free/Busy relevance") ?> +</div> + +<table width="100%" cellspacing="0"> + <tr> + <td colspan="2"> + <?php echo _("This calendar is only included into the free/busy data for ...") ?> + </td> + </tr> + <tr> + <td width="15%" class="nowrap rightAlign"> + <strong><?php echo _("owners/administrators") ?></strong>  + </td> + <td width="85%"> + <input id="admins" name="fbrelevance" type="radio" class="checkbox" value="0"/><br /> + </td> + </tr> + <tr> + <td valign="top" class="nowrap rightAlign"> + <strong><?php echo _("readers") ?></strong>  + </td> + <td> + <input id="readers" name="fbrelevance" type="radio" class="checkbox" value="1"/> + </td> + </tr> + <tr> + <td valign="top" class="nowrap rightAlign"> + <strong><?php echo _("no one") ?></strong>  + </td> + <td> + <input id="none" name="fbrelevance" type="radio" class="checkbox" value="2"/><br /> + </td> + </tr> + <td> +</table> + +<div class="control"> + <?php echo _("Calendar links:") ?> +</div> + +<table width="100%" cellspacing="0"> + <tr> + <td width="15%" class="nowrap rightAlign"> <strong><?php echo _("URL") ?></strong>  </td> - <td> + <td width="85%"> <span id="calendar_url"><em><?php echo _("Select a calendar above to display the URL") ?></em></span> </td> </tr> --- a/kronolith/calendars.php 2007-12-08 14:11:26.000000000 +0100 +++ b/kronolith/calendars.php 2007-12-08 14:11:35.000000000 +0100 @@ -37,6 +37,7 @@ $cal = $kronolith_shares->newShare(md5(microtime())); $cal->set('name', $id); $cal->set('desc', Util::getFormData('description', '')); + $cal->set('params', serialize(array('fbrelevance' => (int) Util::getFormData('fbrelevance', 0)))); $result = $kronolith_shares->addShare($cal); if (is_a($result, 'PEAR_Error')) { $notification->push($result, 'horde.error'); @@ -48,6 +49,7 @@ $original_name = $cal->get('name'); $cal->set('name', $id); $cal->set('desc', Util::getFormData('description', '')); + $cal->set('params', serialize(array('fbrelevance' => (int) Util::getFormData('fbrelevance', 0)))); if ($original_name != $id) { $result = $kronolith_driver->rename($original_name, $id); @@ -123,9 +125,16 @@ $remote_calendars = unserialize($prefs->getValue('remote_cals')); $current_user = Auth::getAuth(); $my_calendars = array(); +$fbrelevance = array(); foreach (Kronolith::listCalendars() as $id => $cal) { if ($cal->get('owner') == $current_user) { $my_calendars[$id] = $cal; + $params = @unserialize($cal->get('params')); + if (isset($params['fbrelevance'])) { + $fbrelevance[$id] = $params['fbrelevance']; + } else { + $fbrelevance[$id] = 0; + } } } ++++++ HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch ++++++ diff -r 14457cf2ea2c kronolith/perms.php --- a/kronolith/perms.php Thu Nov 29 15:20:49 2007 +0100 +++ b/kronolith/perms.php Thu Nov 29 15:25:36 2007 +0100 @@ -15,6 +15,34 @@ require_once KRONOLITH_BASE . '/lib/base require_once KRONOLITH_BASE . '/lib/base.php'; require_once 'Horde/Group.php'; +function &getFbperms($share) +{ + $fbperms = array(); + $params = $share->get('params'); + if (!is_a($params, 'PEAR_Error')) { + $params = @unserialize($params); + if (isset($params['xfbaccess'])) { + $xfbusers = $params['xfbaccess']; + foreach ($xfbusers as $user) { + $fbperms[$user] = PERMS_READ; + } + } + } + return $fbperms; +} + +function setFbperms($share, $xfbusers) +{ + $fbperms = array(); + $params = $share->get('params'); + if (!is_a($params, 'PEAR_Error')) { + $params = @unserialize($params); + $params['xfbaccess'] = $xfbusers; + $params = serialize($params); + $share->set('params', $params); + } +} + $shares = &Horde_Share::singleton('kronolith'); $groups = &Group::singleton(); $auth = &Auth::singleton($conf['auth']['driver']); @@ -36,6 +64,8 @@ case 'edit': $notification->push($share, 'horde.error'); } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) { exit('permission denied'); + } else { + $fbperms = getFbperms($share); } break; @@ -251,6 +281,24 @@ case 'editform': } } + // Process free/busy permissions. + $fb_names = Util::getFormData('fb_names'); + $fb_read = Util::getFormData('fb_read'); + + $fbperms = getFbperms($share); + foreach ($fb_names as $key => $user) { + if (empty($user)) { + continue; + } + + if (!empty($fb_read[$key])) { + $fbperms[$user] = PERMS_READ; + } else { + unset($fbperms[$user]); + } + } + setFbperms($share, array_keys($fbperms)); + $share->setPermission($perm, false); $share->save(); $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success'); diff -r 14457cf2ea2c kronolith/templates/perms/perms.inc --- a/kronolith/templates/perms/perms.inc Thu Nov 29 15:20:49 2007 +0100 +++ b/kronolith/templates/perms/perms.inc Thu Nov 29 15:25:36 2007 +0100 @@ -355,6 +355,61 @@ <td> </td> </tr> + +<tr valign="middle"> + <td class="header leftAlign"> + <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Extended free/busy access") ?> + </td> + <td class="header" align="center"> </td> + <td class="header" align="center"><?php echo _("Read") ?></td> + <td class="header" align="center"> </td> + <td class="header" align="center"> </td> + <td class="header" align="center"> </td> + <td class="header"> </td> +</tr> +<?php foreach ($fbperms as $user => $fbperm) { if ($user != $owner) { ?> +<tr> + <td class="light"><?php echo htmlspecialchars(Auth::removeHook($user)) ?><input type="hidden" name="fb_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td> + <td align="center"> </td> + <td align="center"> + <input type="checkbox" id="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" name="fb_read[<?php echo htmlspecialchars($user) ?>]"<?php echo ($fbperm & PERMS_READ) ? ' checked="checked"' : '' ?> /> + <label for="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" class="hidden"><?php echo _("Read") ?></label> + </td> + <td align="center"> </td> + <td align="center"> </td> + <td align="center"> </td> + <td> </td> +</tr> +<?php } } ?> + +<tr> +<?php if ($auth->hasCapability('list')): ?> + <td class="light"> + <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label> + <select id="fb_names_new" name="fb_names[||new]"> + <option value=""><?php echo _("Select a user to add:") ?></option> + <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?> + <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option> + <?php } } ?> + </select> + </td> +<?php else: ?> + <td class="light"> + <label for="fb_names_new" class="hidden"><?php echo _("User to add:") ?></label> + <input type="text" id="fb_names_new" name="fb_names[||new]" /> + </td> +<?php endif; ?> + <td align="center"> </td> + <td align="center"> + <input type="checkbox" id="fb_read_new" name="fb_read[||new]" /> + <label for="fb_read_new" class="hidden"><?php echo _("Read") ?></label> + </td> + <td align="center"> </td> + <td align="center"> </td> + <td align="center"> </td> + <td> </td> +</tr> + <tr> <td colspan="7"> </td> </tr> ++++++ HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch ++++++ This includes extra parameters into the free/busy view. The params are hardcoded so this patch won't make it upstream. diff -r 735b35f9f866 kronolith/lib/FBView.php --- a/kronolith/lib/FBView.php Thu Nov 29 11:32:43 2007 +0100 +++ b/kronolith/lib/FBView.php Thu Nov 29 11:35:20 2007 +0100 @@ -86,8 +86,8 @@ class Kronolith_FreeBusy_View { $template = new Horde_Template(); $rows = ''; foreach ($this->_requiredMembers as $member) { - $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy")); - $template = new Horde_Template(); + $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams()); + $template = &new Horde_Template(); $template->set('blocks', $blocks); $template->set('name', $member->getName()); $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.tpl'); @@ -107,8 +107,8 @@ class Kronolith_FreeBusy_View { $template = new Horde_Template(); $rows = ''; foreach ($this->_optionalMembers as $member) { - $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy")); - $template = new Horde_Template(); + $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams()); + $template = &new Horde_Template(); $template->set('blocks', $blocks); $template->set('name', $member->getName()); $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.tpl'); @@ -122,6 +122,9 @@ class Kronolith_FreeBusy_View { $template->set('legend', ''); $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.tpl'); } + + //********** + //This has been disabled in kolab-fbview. Make this optional? // Possible meeting times. $optimal->setAttribute('ORGANIZER', _("All Attendees")); @@ -144,6 +147,9 @@ class Kronolith_FreeBusy_View { $template->set('name', _("Required Attendees")); $template->set('blocks', $blocks); $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.tpl'); + + //This has been disabled in kolab-fbview. Make this optional? + //********** // Reset locale. setlocale(LC_NUMERIC, $lc); @@ -217,7 +223,7 @@ class Kronolith_FreeBusy_View { return $instances[$view]; } - function _getBlocks($member, $periods, $blockfile, $label) + function _getBlocks($member, $periods, $blockfile, $label, $extra = array()) { $template = new Horde_Template(); $template->set('label', $label); @@ -250,6 +256,21 @@ class Kronolith_FreeBusy_View { $template->set('left', $left . '%'); $template->set('width', $width . '%'); + $template->set('evclick', ''); + + if (isset($extra[$periodStart])) { + if (!empty($extra[$periodStart]['X-UID'])) { + $link = "javascript:performAction('viewaction', '" + . addslashes($member->getName() . "#" + . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), + 'UTF-8',NLS::getCharset())) . "')"; + $template->set('evclick', $link); + } + if (!empty($extra[$periodStart]['X-SUMMARY'])) { + $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8', + NLS::getCharset())); + } + } $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile); } else { diff -r 735b35f9f866 kronolith/templates/fbview/busyblock.tpl --- a/kronolith/templates/fbview/busyblock.tpl Thu Nov 29 11:32:43 2007 +0100 +++ b/kronolith/templates/fbview/busyblock.tpl Thu Nov 29 11:35:20 2007 +0100 @@ -1,1 +1,1 @@ -<td><div class="busy" style="left:<tag:left />;width:<tag:width />;"> </div></td> +<td><div class="busy" onclick="<tag:evclick />" style="cursor:pointer;left:<tag:left />;width:<tag:width />;" title="<tag:label />"> </div></td> ++++++ HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch ++++++ Provides a patch to store the list of attendees in the user preferences. This is a broken patch that has been rejected upstream (http://bugs.horde.org/ticket/?id=4788) This should be solved using Horde::Groups. diff -r 848f241f83e0 kronolith/attendees.php --- a/kronolith/attendees.php Thu Nov 29 10:56:04 2007 +0100 +++ b/kronolith/attendees.php Thu Nov 29 11:32:43 2007 +0100 @@ -155,6 +155,16 @@ case 'clear': $attendees = array(); $_SESSION['kronolith']['attendees'] = $attendees; break; + +case 'save': + if (empty($attendees)) { + break; + } + $savedattlist = unserialize($prefs->getValue('saved_attendee_list')); + $savedattlist[] = array_keys($attendees); + $prefs->setValue('saved_attendee_list', serialize($savedattlist)); + $notification->push(_('Successfully saved attendee list'), 'horde.success'); + break; } // Get the current Free/Busy view; default to the 'day' view if none specified. @@ -226,6 +236,14 @@ Imple::factory('ContactAutoCompleter', a $title = _("Edit attendees"); require KRONOLITH_TEMPLATES . '/common-header.inc'; + +if ($browser->hasFeature('javascript')) { + Horde::addScriptFile('open_savedattlist_win.js'); + $savedattlist_url = 'javascript:open_savedattlist_win();'; +} else { + $savedattlist_url = Horde::applicationUrl('savedattlist.php'); +} + $notification->notify(array('status')); require KRONOLITH_TEMPLATES . '/attendees/attendees.inc'; require $registry->get('templates', 'horde') . '/common-footer.inc'; diff -r 848f241f83e0 kronolith/config/prefs.php.dist --- a/kronolith/config/prefs.php.dist Thu Nov 29 10:56:04 2007 +0100 +++ b/kronolith/config/prefs.php.dist Thu Nov 29 11:32:43 2007 +0100 @@ -465,3 +465,11 @@ if ($GLOBALS['registry']->hasMethod('con 'shared' => false, 'type' => 'implicit' ); + +$_prefs['saved_attendee_list'] = array( + 'value' => 'a:0:{}', + 'locked' => false, + 'shared' => false, + 'type' => 'implicit', + 'desc' => _("A saved list of attendees") +); diff -r 848f241f83e0 kronolith/savedattlist.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kronolith/savedattlist.php Thu Nov 29 11:32:43 2007 +0100 @@ -0,0 +1,77 @@ +<?php +/** + * $Horde: kronolith/attendeeshandler.php,v 1.1 2004/05/25 08:34:21 stuart Exp $ + * + * Copyright 2004 Code Fusion <http://www.codefusion.co.za/> + * Stuart Binge <s.binge(a)codefusion.co.za> + * + * See the enclosed file COPYING for license information (GPL). If you + * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. + */ + +@define('KRONOLITH_BASE', dirname(__FILE__)); +require_once KRONOLITH_BASE . '/lib/base.php'; +require_once KRONOLITH_BASE . '/lib/FBView.php'; + +$title = _('Load Attendee List'); + +Horde::addScriptFile('tooltip.js', 'horde'); +require KRONOLITH_TEMPLATES . '/common-header.inc'; + +// Get our list of saved attendees +$savedattlist = unserialize($prefs->getValue('saved_attendee_list')); + +// Preformat our image urls +$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde')); +$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde')); + +// Get our Action ID & Value. This specifies what action the user initiated. +$actionID = Util::getFormData('actionID', false); +$actionValue = Util::getFormData('actionValue', false); +if (!$actionID) { + $actionID = (Util::getFormData('addNew', false) ? 'add' : false); + $actionValue = Util::getFormData('newAttendees', ''); +} + +// Perform the specified action, if there is one. +switch ($actionID) { +case 'remove': + // Remove the specified attendee + if (array_key_exists($actionValue, $savedattlist)) { + unset($savedattlist[$actionValue]); + $prefs->setValue('saved_attendee_list', serialize($savedattlist)); + } + + break; + +case 'dismiss': + // Make sure we're actually allowed to dismiss + if (!$allow_dismiss) break; + + // Close the attendee window + global $browser; + + if ($browser->hasFeature('javascript')) { + Util::closeWindowJS(); + } else { + $url = Util::getFormData('url'); + + if (!empty($url)) { + $location = Horde::applicationUrl($url, true); + } else { + $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month')); + $url = Util::addParameter($url, 'year', Util::getFormData('year')); + $location = Horde::applicationUrl($url, true); + } + + // Make sure URL is unique. + $location = Util::addParameter($location, 'unique', md5(microtime())); + + header('Location: ' . $location); + } + break; +} + +$form_handler = Horde::applicationUrl('savedattlist.php'); +require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc'; +require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc'; diff -r 848f241f83e0 kronolith/templates/attendees/attendees.inc --- a/kronolith/templates/attendees/attendees.inc Thu Nov 29 10:56:04 2007 +0100 +++ b/kronolith/templates/attendees/attendees.inc Thu Nov 29 11:32:43 2007 +0100 @@ -92,6 +92,8 @@ function switchDateView(view, timestamp) <div> <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" /> <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" /> + <input type="button" class="button" name="loadAttList" value="<?php echo htmlspecialchars(_("Load Attendee List")) ?>" onclick="<?php echo $savedattlist_url ?>" /> + <?php if (!empty($attendees)): ?><input type="button" class="button" name="saveAttList" value="<?php echo htmlspecialchars(_("Save Attendee List")) ?>" onclick="performAction('save', '');" /><?php endif; ?> <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all attendees")) ?>" /><?php endif; ?> </div> diff -r 848f241f83e0 kronolith/templates/javascript/open_savedattlist_win.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kronolith/templates/javascript/open_savedattlist_win.js Thu Nov 29 11:32:43 2007 +0100 @@ -0,0 +1,36 @@ +<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript"> + +</script> +<?php endif; ?> diff -r 848f241f83e0 kronolith/templates/savedattlist/savedattlist.inc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kronolith/templates/savedattlist/savedattlist.inc Thu Nov 29 11:32:43 2007 +0100 @@ -0,0 +1,68 @@ + +<script language="JavaScript" type="text/javascript"> + +</script> + +<form method="post" action="<?php echo $form_handler; ?>" name="savedattlistForm"> +<?php Util::pformInput(); ?> +<input type="hidden" name="actionID" value="" /> +<input type="hidden" name="actionValue" value="" /> + +<div align="center"> + +<table border="0" width="500" cellspacing="0" cellpadding="2"> + + +<tr><td colspan="4" class="header"><b><?php echo $title ?></b></td></tr> + + +<tr class="item"> + <td nowrap="nowrap" width="2%" align="center"><?php echo $loadimg ?></td> + <td nowrap="nowrap" width="2%" align="center"><?php echo $delimg ?></td> + <td nowrap="nowrap" width="96%"><b><?php echo htmlspecialchars(_("Attendees")) ?></b></td> +</tr> + + +<?php $i = 0 ?> +<?php if (empty($savedattlist)): ?> + <tr class="item<?php echo ($i++ % 2) ?>"><td align="center" colspan="3"><i><?php echo htmlspecialchars('-- ' . _("No saved attendee lists are available") . ' --') ?></i></td></tr> +<?php else: foreach ($savedattlist as $index => $list): ?> + <tr class="item<?php echo ($i++ % 2) ?>"> + <?php + echo '<td align="center">', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, "</a></td>"; + ?> + <?php + echo '<td align="center">', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, "</a></td>"; + ?> + <td><?php echo implode(', ', $list); ?></td> + </tr> +<?php endforeach; endif; ?> +</table> +</div> +</form> ++++++ kronolith-h3-2.3.5-php5_exec.diff ++++++ Index: scripts/import_icals.php =================================================================== --- scripts/import_icals.php.orig +++ scripts/import_icals.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script imports iCalendar/vCalendar data into Kronolith calendars. Index: scripts/reminders.php =================================================================== --- scripts/reminders.php.orig +++ scripts/reminders.php @@ -1,4 +1,4 @@ -#!/usr/bin/php -q +#!/usr/bin/php5 -q <?php /** * $Horde: kronolith/scripts/reminders.php,v 1.17.10.10 2009-01-06 15:24:50 jan Exp $ Index: scripts/import_squirrelmail_calendar.php =================================================================== --- scripts/import_squirrelmail_calendar.php.orig +++ scripts/import_squirrelmail_calendar.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script imports SquirrelMail database calendars into Kronolith. Index: scripts/migrate_to_sql_driver.php =================================================================== --- scripts/migrate_to_sql_driver.php.orig +++ scripts/migrate_to_sql_driver.php @@ -1,4 +1,4 @@ -#!/usr/local/bin/php +#!/usr/bin/php5 <?php /** * $Horde: kronolith/scripts/migrate_to_sql_driver.php,v 1.1.10.3 2007-01-02 13:55:06 jan Exp $ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dmidecode for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package dmidecode for openSUSE:Factory checked in at Mon Jan 24 16:16:21 CET 2011. -------- --- dmidecode/dmidecode.changes 2010-09-08 18:18:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/dmidecode/dmidecode.changes 2011-01-20 13:57:16.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Jan 20 13:53:27 CET 2011 - jdelvare(a)suse.de + +- Update to upstream version 2.11: + * Adds support for SMBIOS 2.6.1 and 2.7. This includes new + enumerated values for recent hardware. + * Obsoletes dmidecode-fix-makefile-for-GNU-make-3.82.patch. + * Various minor fixes and clean-ups. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dmidecode-2.10.tar.bz2 dmidecode-fix-makefile-for-GNU-make-3.82.patch New: ---- dmidecode-2.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmidecode.spec ++++++ --- /var/tmp/diff_new_pack.p65faO/_old 2011-01-24 16:15:14.000000000 +0100 +++ /var/tmp/diff_new_pack.p65faO/_new 2011-01-24 16:15:14.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package dmidecode (Version 2.10) +# spec file for package dmidecode # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,15 +20,14 @@ Name: dmidecode Url: http://www.nongnu.org/dmidecode/ -Version: 2.10 -Release: 10 +Version: 2.11 +Release: 1 License: GPLv2+ Group: System/Console Provides: pmtools:/usr/sbin/dmidecode AutoReqProv: on Summary: DMI table decoder Source: %{name}-%{version}.tar.bz2 -Patch1: %{name}-fix-makefile-for-GNU-make-3.82.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 Obsoletes: pmtools < 20071117 @@ -49,7 +48,6 @@ %prep %setup -%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" ++++++ dmidecode-2.10.tar.bz2 -> dmidecode-2.11.tar.bz2 ++++++ ++++ 2453 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0