diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php index 402ae987b3..dbebbe9220 100755 --- a/doc/rpm-build/checkout-build-archives.php +++ b/doc/rpm-build/checkout-build-archives.php @@ -19,7 +19,7 @@ date_default_timezone_set('Europe/Berlin'); // to get ride of 5.3 warnings $verbose = 0; $config = array( 'packagename' => 'egroupware-epl', - 'version' => '14.1', // '1.6' + 'version' => '14.2', // '1.6' 'packaging' => date('Ymd'), // '001' 'egwdir' => 'egroupware', 'svndir' => '/tmp/build_root/epl_trunk_buildroot-svn', @@ -30,15 +30,15 @@ $config = array( 'svnbranch' => 'trunk', // 'branches/1.6' or 'tags/1.6.001' 'svnalias' => 'aliases/default-ssh', // default alias 'aliasdir' => 'egroupware', // directory created by the alias - 'extra' => array('egw-pear', '$stylitebase/$svnbranch/stylite','$stylitebase/$svnbranch/jdots','$stylitebase/$svnbranch/pixelegg', '$stylitebase/$svnbranch/esyncpro'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'), + 'extra' => array('egw-pear', '$stylitebase/$svnbranch/stylite','$stylitebase/$svnbranch/jdots','$stylitebase/$svnbranch/pixelegg', '$stylitebase/$svnbranch/esyncpro'),//, '$stylitebase/$svnbranch/groups'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'), 'types' => array('tar.bz2','tar.gz','zip'), 'svn' => '/usr/bin/svn', - 'rsync' => 'rsync --progress -e ssh', + 'rsync' => 'rsync --progress -e ssh --exclude "*-stylite-*" --exclude "*-esyncpro-*"', 'clamscan' => '/usr/bin/clamscan', 'freshclam' => '/usr/bin/freshclam', 'gpg' => '/usr/bin/gpg', 'packager' => 'build@stylite.de', - 'obs' => '../obs/stylite-epl-trunk', + 'obs' => '../obs/stylite-epl', 'obs_package_alias' => '', // name used in obs package, if different from packagename 'changelog' => false, // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes 'changelog_packager' => 'Ralf Becker ', @@ -46,9 +46,9 @@ $config = array( 'editor' => '/usr/bin/vi', 'svntag' => 'tags/$version.$packaging', 'release' => 'ralfbecker,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/eGroupware-$version/eGroupware-$version.$packaging/', - 'copychangelog' => 'ralfbecker,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/eGroupware-$version/README', + 'copychangelog' => '$sourcedir/README', //'ralfbecker,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/README', 'skip' => array(), - 'run' => array('editsvnchangelog','svntag','checkout','copy','virusscan','create','sign','obs'), + 'run' => array('editsvnchangelog','svntag','checkout','copy','virusscan','create','sign','obs', 'copychangelog'), 'patchCmd' => '# run cmd after copy eg. "cd $egw_buildroot; patch -p1 /path/to/patch"', ); diff --git a/doc/rpm-build/class.uiasyncservice.inc.php.patch b/doc/rpm-build/class.uiasyncservice.inc.php.patch index a076c6e347..fd826d5afa 100644 --- a/doc/rpm-build/class.uiasyncservice.inc.php.patch +++ b/doc/rpm-build/class.uiasyncservice.inc.php.patch @@ -1,10 +1,10 @@ Index: egroupware/admin/inc/class.uiasyncservice.inc.php =================================================================== ---- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 46642) +--- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 49786) +++ egroupware/admin/inc/class.uiasyncservice.inc.php (Arbeitskopie) -@@ -99,16 +99,20 @@ - $config->save_repository(); - unset($config); +@@ -95,16 +95,20 @@ + { + config::save_value('asyncservice', $GLOBALS['egw_info']['server']['asyncservice']=$_POST['asyncservice'], 'phpgwapi'); } +/* if (!$async->only_fallback) @@ -23,7 +23,7 @@ Index: egroupware/admin/inc/class.uiasyncservice.inc.php echo '

'.lang('Run Asynchronous services').''. ' \n". lang("for the times below (empty values count as '*', all empty = every minute)")."

\n"; @@ -44,9 +44,9 @@ Index: egroupware/admin/inc/class.uiasyncservice.inc.php echo "
\n"; Index: egroupware/phpgwapi/inc/class.egw.inc.php =================================================================== ---- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 46642) +--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 49786) +++ egroupware/phpgwapi/inc/class.egw.inc.php (Arbeitskopie) -@@ -597,11 +597,13 @@ +@@ -606,11 +606,13 @@ _egw_log_exception($ex); } } diff --git a/doc/rpm-build/debian.changes b/doc/rpm-build/debian.changes index 60e7488f26..46cd0158f8 100644 --- a/doc/rpm-build/debian.changes +++ b/doc/rpm-build/debian.changes @@ -1,4 +1,4 @@ -egroupware-epl (14.1.20141205-1) hardy; urgency=low +egroupware-epl (14.2.20141209-1) hardy; urgency=low * first beta for 14.2 release * Home: new dashboard like app showing lists from favorits and entries dragged there from all apps diff --git a/doc/rpm-build/debian.config b/doc/rpm-build/debian.config new file mode 100644 index 0000000000..299afcdcf0 --- /dev/null +++ b/doc/rpm-build/debian.config @@ -0,0 +1,28 @@ +#! /bin/sh + +set -e + +. /usr/share/debconf/confmodule +db_version 2.0 + +if grep -q '^DISTRIB_ID="Univention"$' /etc/lsb-release +then + # Univention requires non-interactive install: + # mysql credentials are read from their config + # admin user is existing "Administrator" with unchanged password + # header user is random and gets written to /root/egroupware-epl-install.log + : +else + if [ "$1" = configure -o "$1" = upgrade ] + then + db_input high "egroupware/header/user" || true + db_input high "egroupware/header/password" || true + db_input high "egroupware/admin/user" || true + db_input high "egroupware/admin/password" || true + db_input high "egroupware/lang" || true + db_input high "egroupware/db_root" || true + db_input high "egroupware/db_root_pw" || true + db_go + fi +fi + diff --git a/doc/rpm-build/debian.control b/doc/rpm-build/debian.control index 92ed823028..34b6f69252 100644 --- a/doc/rpm-build/debian.control +++ b/doc/rpm-build/debian.control @@ -8,8 +8,37 @@ Homepage: http://www.stylite.de/EPL Package: egroupware-epl Architecture: all -Depends: egroupware-epl-core, egroupware-epl-stylite, egroupware-epl-jdots, egroupware-epl-pixelegg, ${egw:Modules}, ${misc:Depends} +Depends: + egroupware-epl-core (= ${binary:Version}), + egroupware-epl-egw-pear (= ${binary:Version}), + egroupware-epl-jdots (= ${binary:Version}), + egroupware-epl-pixelegg (= ${binary:Version}), + egroupware-epl-stylite (= ${binary:Version}), + egroupware-epl-esync (= ${binary:Version}), + egroupware-epl-bookmarks (= ${binary:Version}), + egroupware-epl-calendar (= ${binary:Version}), + egroupware-epl-developer-tools (= ${binary:Version}), + egroupware-epl-emailadmin (= ${binary:Version}), + egroupware-epl-mail (= ${binary:Version}), + egroupware-epl-filemanager (= ${binary:Version}), + egroupware-epl-infolog (= ${binary:Version}), + egroupware-epl-importexport (= ${binary:Version}), + egroupware-epl-manual (= ${binary:Version}), + egroupware-epl-news-admin (= ${binary:Version}), + egroupware-epl-notifications (= ${binary:Version}), + egroupware-epl-phpbrain (= ${binary:Version}), + egroupware-epl-phpfreechat (= ${binary:Version}), + egroupware-epl-projectmanager (= ${binary:Version}), + egroupware-epl-registration (= ${binary:Version}), + egroupware-epl-resources (= ${binary:Version}), + egroupware-epl-sambaadmin (= ${binary:Version}), + egroupware-epl-sitemgr (= ${binary:Version}), + egroupware-epl-timesheet (= ${binary:Version}), + egroupware-epl-tracker (= ${binary:Version}), + egroupware-epl-wiki (= ${binary:Version}), + ${misc:Depends} Replaces: egroupware +Conflicts: egroupware Description: web-based groupware suite - metapackage ${commondesc} . @@ -20,22 +49,26 @@ Description: web-based groupware suite - metapackage Package: egroupware-epl-core Architecture: all Depends: apache2, - libapache2-mod-php5, + php5 (>= 5.3.3), php5-cli, php5-sqlite, php5-mysql | php5-pgsql | php5-odbc, - php5-gd, php-log, php-pear, + php5-json, + php5-gd, php-pear, egroupware-epl-egw-pear, - perl, php5-mcrypt, + php5-xsl, ${misc:Depends} -Recommends: mysql-server, php-apc, mysql-client | postgresql-client +Recommends: mysql-server, php-apc, php5-pecl-smb, php5-tidy, mysql-client | postgresql-client Suggests: egroupware-epl, php5-ldap, php5-mhash, - php5-auth-pam + php5-auth-pam, + php-log Provides: egroupware-epl-addressbook, egroupware-epl-etemplate -Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook, egroupware-etemplate, egroupware-epl-etemplate +Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook, egroupware-etemplate, egroupware-epl-etemplate, + egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupare-epl-phpsysinfo +Conflicts: egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupware-epl-phpsysinfo Description: web-based groupware suite - core modules ${commondesc} . @@ -49,6 +82,7 @@ Package: egroupware-epl-bookmarks Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-bookmarks Replaces: egroupware-bookmarks Description: web-based groupware suite - bookmark management application ${commondesc} @@ -60,6 +94,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-infolog (>= ${binary:Version}), egroupware-epl-notifications (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-calendar Replaces: egroupware-calendar Description: web-based groupware suite - calendar management application ${commondesc} @@ -71,6 +106,7 @@ Package: egroupware-epl-developer-tools Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-developer-tools Replaces: egroupware-developer-tools Description: web-based groupware suite - developer tools ${commondesc} @@ -83,7 +119,9 @@ Description: web-based groupware suite - developer tools Package: egroupware-epl-emailadmin Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), - ${misc:Depends}, php5-imap + ${misc:Depends} +Recommends: php5-bcmath +Conflicts: egroupware-emailadmin Replaces: egroupware-emailadmin Description: web-based groupware suite - e-mail user administration application ${commondesc} @@ -96,17 +134,30 @@ Package: egroupware-epl-esync Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-esync Replaces: egroupware-esync Description: web-based groupware suite - esync application ${commondesc} . Z-Push based ActiveSync protocol implementation. +Package: egroupware-epl-phpfreechat +Architecture: all +Depends: egroupware-epl-core (>= ${binary:Version}), + ${misc:Depends} +Replaces: egroupware-phpfreechat +Conflicts: egroupware-phpfreechat +Description: web-based groupware suite - chat application + ${commondesc} + . + Chat application based on phpFreeChat. + Package: egroupware-epl-mail Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-emailadmin (>= ${binary:Version}), ${misc:Depends} Provides: mail-reader, imap-client +Conflicts: egroupware-felamimail, egroupware-epl-felamimail Replaces: egroupware-felamimail, egroupware-epl-felamimail Description: web-based groupware suite - e-mail application ${commondesc} @@ -118,6 +169,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} Suggests: php5-cli +Conflicts: egroupware-filemanager Replaces: egroupware-filemanager Description: web-based groupware suite - file manager application ${commondesc} @@ -132,16 +184,18 @@ Package: egroupware-epl-importexport Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-importexport Replaces: egroupware-importexport Description: web-based groupware suite - importexport application ${commondesc} . This eGroupWare application is a framework for egroupware to handle imports and exports. - + Package: egroupware-epl-infolog Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-infolog Replaces: egroupware-infolog Description: web-based groupware suite - infolog application ${commondesc} @@ -153,6 +207,7 @@ Package: egroupware-epl-manual Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-wiki (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-manual Replaces: egroupware-manual Description: web-based groupware suite - manual ${commondesc} @@ -164,6 +219,7 @@ Package: egroupware-epl-news-admin Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-news-admin Replaces: egroupware-news-admin Description: web-based groupware suite - news administration interface ${commondesc} @@ -175,17 +231,19 @@ Package: egroupware-epl-notifications Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-notifications Replaces: egroupware-notifications Description: web-based groupware suite - notifications ${commondesc} . This package contains the EGroupware notifications, provided as an EGroupware application. - + Package: egroupware-epl-phpbrain Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-phpbrain Replaces: egroupware-phpbrain Description: web-based groupware suite - phpbrain application ${commondesc} @@ -194,8 +252,9 @@ Description: web-based groupware suite - phpbrain application Package: egroupware-epl-projectmanager Architecture: all -Depends: egroupware-epl-core (>= ${binary:Version}), php5-gd, jpgraph-epl, +Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-projectmanager Replaces: egroupware-projectmanager Description: web-based groupware suite - project management application ${commondesc} @@ -206,6 +265,7 @@ Package: egroupware-epl-registration Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-registration Replaces: egroupware-registration Description: web-based groupware suite - registration application ${commondesc} @@ -219,6 +279,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-filemanager (>= ${binary:Version}), ${misc:Depends} Suggests: egroupware-epl-calendar +Conflicts: egroupware-resources Replaces: egroupware-resources Description: web-based groupware suite - resource manager application ${commondesc} @@ -231,6 +292,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), php5-ldap, ${misc:Depends} +Conflicts: egroupware-sambaadmin Replaces: egroupware-sambaadmin Description: web-based groupware suite - Samba administration application ${commondesc} @@ -241,6 +303,7 @@ Package: egroupware-epl-sitemgr Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-sitemgr Replaces: egroupware-sitemgr Description: web-based groupware suite - site manager application ${commondesc} @@ -249,9 +312,10 @@ Description: web-based groupware suite - site manager application Package: egroupware-epl-timesheet Architecture: all -Depends: egroupware-epl-core (>= ${binary:Version}), +Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} Suggests: egroupware-epl-projectmanager +Conflicts: egroupware-timesheet Replaces: egroupware-timesheet Description: web-based groupware suite - timesheet application ${commondesc} @@ -263,6 +327,7 @@ Package: egroupware-epl-tracker Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-notifications (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-tracker Replaces: egroupware-tracker Description: web-based groupware suite - tracker application ${commondesc} @@ -272,8 +337,9 @@ Description: web-based groupware suite - tracker application Package: egroupware-epl-wiki Architecture: all -Depends: egroupware-epl-core (>= ${binary:Version}), +Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-wiki Replaces: egroupware-wiki Description: web-based groupware suite - wiki application ${commondesc} diff --git a/doc/rpm-build/debian.postinst b/doc/rpm-build/debian.postinst new file mode 100644 index 0000000000..858c43ba1c --- /dev/null +++ b/doc/rpm-build/debian.postinst @@ -0,0 +1,98 @@ +#! /bin/sh + +#export DEBCONF_DEBUG=developer +set -e +# das hier muss ganz oben stehen (man debconf-devel) +. /usr/share/debconf/confmodule +db_version 2.0 + + +webserver_soft_reload() { + if command -v invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d "$1" force-reload || : + else + [ -x /etc/init.d/"$1" ] && /etc/init.d/"$1" force-reload || : + fi +} + + +if [ "$1" = configure -o "$1" = upgrade ] +then + mkdir -p /var/lib/egroupware/default/files + mkdir -p /var/lib/egroupware/default/backup + + config="/var/lib/egroupware/header.inc.php" + template="/usr/share/egroupware/header.inc.php.template" + + install_log="/root/egroupware-epl-install.log" + date >> $install_log + + # If upgrading, $2 contains the release currently installed, otherwise it's empty + if [ "$2" ] + then + /usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log + else + if grep -q '^DISTRIB_ID="Univention"$' /etc/lsb-release + then + /usr/share/egroupware/doc/rpm-build/post_install.php \ + --admin_user "Administrator" \ + --admin_passwd "*unchanged*" 2>&1 | /usr/bin/tee -a $install_log + else + # Get configuration passwords + db_get "egroupware/header/user" + header_user="$RET" + db_get "egroupware/header/password" + header_password="$RET" + + # Get first egroupware user / pw + db_get "egroupware/admin/user" + admin_user="$RET" + db_get "egroupware/admin/password" + admin_password="$RET" + + # Get egroupware language + db_get "egroupware/lang" + lang="$RET" + + # Get mysql root / pw + db_get "egroupware/db_root" + db_root="$RET" + db_get "egroupware/db_root_pw" + db_root_pw="$RET" + + /usr/share/egroupware/doc/rpm-build/post_install.php \ + --config_user "$header_user" \ + --config_passwd "$header_password" \ + --admin_user "$admin_user" \ + --admin_passwd "$admin_password" \ + --lang "$lang" \ + --db_type mysql \ + --db_root "$db_root" \ + --db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log + fi + fi + echo "EGroupware install log saved to $install_log" + + # Only change permissions during initial installation, in case + # someone wants a different setup. + if [ -z "$2" ]; then + chown -R www-data:www-data /var/lib/egroupware/ + chmod 600 $config + fi + + # Set up web server and reload it. + if [ -d /etc/apache2/conf.d ] ; then + ln -fs ../../egroupware/apache.conf /etc/apache2/conf.d/egroupware + else + if [ -d /etc/apache2/sites-available ] ; then + ln -fs ../../egroupware/apache.conf /etc/apache2/sites-available/egroupware.conf + a2ensite egroupware + fi + fi + a2enmod actions >/dev/null + webserver_soft_reload apache2 +fi + +#DEBHELPER# + +db_stop diff --git a/doc/rpm-build/debian.tar.gz b/doc/rpm-build/debian.tar.gz index 9aa6b91c75..04bcb2688a 100644 Binary files a/doc/rpm-build/debian.tar.gz and b/doc/rpm-build/debian.tar.gz differ diff --git a/doc/rpm-build/egroupware-epl-rpmlintrc b/doc/rpm-build/egroupware-epl-rpmlintrc new file mode 100644 index 0000000000..a471ba0adc --- /dev/null +++ b/doc/rpm-build/egroupware-epl-rpmlintrc @@ -0,0 +1,3 @@ +#addFilter("eGroupware-gallery* wrong-script-interpreter") +setBadness('wrong-script-interpreter', 0) + diff --git a/doc/rpm-build/egroupware-epl.dsc b/doc/rpm-build/egroupware-epl.dsc index 3856826752..c2b3dc1088 100644 --- a/doc/rpm-build/egroupware-epl.dsc +++ b/doc/rpm-build/egroupware-epl.dsc @@ -2,10 +2,10 @@ Format: 1.0 Source: egroupware-epl Binary: egroupware-epl, egroupware-epl-core, egroupware-epl-bookmarks, egroupware-epl-calendar, egroupware-epl-developer-tools, egroupware-epl-emailadmin, egroupware-epl-esync, egroupware-epl-mail, egroupware-epl-filemanager, egroupware-epl-infolog, egroupware-epl-manual, egroupware-epl-news-admin, egroupware-epl-notifications, egroupware-epl-phpbrain, egroupware-epl-projectmanager, egroupware-epl-registration, egroupware-epl-resources, egroupware-epl-sambaadmin, egroupware-epl-sitemgr, egroupware-epl-timesheet, egroupware-epl-tracker, egroupware-epl-wiki, egroupware-esync, egroupware-phpfreechat Architecture: all -Version: 14.1.20140417-1 +Version: 14.1.20141106-1 Maintainer: Ralf Becker Homepage: http://www.stylite.de/EPL Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5), po-debconf -Debtransform-Tar: egroupware-epl-14.1.20140417.tar.gz +Debtransform-Tar: egroupware-epl-14.2.20141209.tar.gz Debtransform-Files-Tar: debian.tar.gz phpfreechat_data_public.tar.gz diff --git a/doc/rpm-build/egroupware-epl.spec b/doc/rpm-build/egroupware-epl.spec index aa2364c6a8..c7ddb623f4 100644 --- a/doc/rpm-build/egroupware-epl.spec +++ b/doc/rpm-build/egroupware-epl.spec @@ -1,10 +1,10 @@ Name: egroupware-epl -Version: 14.1.20140417 +Version: 14.2.20141209 Release: Summary: EGroupware is a web-based groupware suite written in php Group: Web/Database -License: GPLv2 -URL: http://www.egroupware.org/ +License: GPLv2 with exception of stylite and esyncpro module, which is proprietary +URL: http://www.stylite.de/EPL Vendor: Stylite GmbH, http://www.stylite.de/ Packager: Ralf Becker Prefix: /usr/share @@ -83,9 +83,9 @@ Distribution: %{distribution} Source0: %{name}-%{version}.tar.gz Source1: %{name}-egw-pear-%{version}.tar.bz2 -#Source2: %{name}-stylite-%{version}.tar.bz2 +Source2: %{name}-stylite-%{version}.tar.bz2 Source3: %{name}-pixelegg-%{version}.tar.bz2 -#Source4: %{name}-esyncpro-%{version}.tar.bz2 +Source4: %{name}-esyncpro-%{version}.tar.bz2 Source5: %{name}-jdots-%{version}.tar.bz2 Source6: phpfreechat_data_public.tar.gz Source8: %{name}-rpmlintrc @@ -103,7 +103,7 @@ AutoReqProv: no Requires: %{name}-core = %{version} Requires: %{name}-egw-pear = %{version} -#Requires: %{name}-stylite = %{version} +Requires: %{name}-stylite = %{version} Requires: %{name}-jdots = %{version} Requires: %{name}-esync = %{version} Requires: %{name}-bookmarks = %{version} @@ -159,8 +159,13 @@ Obsoletes: %{egw_packagename}-tracker Obsoletes: %{egw_packagename}-wiki # packages no longer in 14.1 Obsoletes: %{name}-felamimail +Obsoletes: %{name}-syncml Obsoletes: %{name}-phpsysinfo Obsoletes: %{name}-polls +Obsoletes: %{egw_packagename}-felamimail +Obsoletes: %{egw_packagename}-syncml +Obsoletes: %{egw_packagename}-phpsysinfo +Obsoletes: %{egw_packagename}-polls %post # Check binary paths and create links for opensuse/sles @@ -278,7 +283,7 @@ Summary: The EGroupware emailadmin application Group: Web/Database AutoReqProv: no Requires: egw-core >= %{version} -Requires: %{php}-imap +Requires: %{php}-bcmath Requires: %{name}-egw-pear >= %{version} Obsoletes: %{egw_packagename}-emailadmin %description emailadmin @@ -343,6 +348,7 @@ Summary: New default template for EGroupware Group: Web/Database AutoReqProv: no Requires: egw-core >= %{version} +Requires: %{name}-jdots >= %{version} %description pixelegg New 14.1 default template from Pixelegg. @@ -470,17 +476,18 @@ Obsoletes: %{egw_packagename}-sitemgr %description sitemgr This is the Sitemanager CMS app for EGroupware. -#%package stylite -#Version: %{version} -#Summary: Stylite EPL enhancements -#License: proprietary, see http://www.stylite.de/EPL -#Group: Web/Database -#AutoReqProv: no -#Requires: egw-core >= %{version} -#%description stylite -#The package contains Stylite proprietary EPL enhancements: -#- stylite.links stream wrapper allows browsing of app directories -#- filemanger favorites +%package stylite +Version: %{version} +Summary: Stylite EPL enhancements +License: proprietary, see http://www.stylite.de/EPL +Group: Web/Database +AutoReqProv: no +Requires: egw-core >= %{version} +Obsoletes: %{name}-groups +%description stylite +The package contains Stylite proprietary EPL enhancements: +- stylite.links stream wrapper allows browsing of app directories +- filemanger favorites %package timesheet Version: %{version} @@ -514,30 +521,30 @@ Obsoletes: %{egw_packagename}-wiki %description wiki This is the wiki app for EGroupware. -#%package esyncpro -#Version: %{version} -#Summary: Stylite eSync Provisioning -#License: proprietary -#Group: Web/Database -#AutoReqProv: no -#Requires: egw-core >= %{version}, %{name}-esync >= %{version} -#%description esyncpro -#Stylite's eSync Provisioning app allows to edit and assign -#policies to devices and keeps a central list of syncing devices. -#It also allows to remote wipe or view sync logs of all devices. +%package esyncpro +Version: %{version} +Summary: Stylite eSync Provisioning +License: proprietary +Group: Web/Database +AutoReqProv: no +Requires: egw-core >= %{version}, %{name}-esync >= %{version} +%description esyncpro +Stylite's eSync Provisioning app allows to edit and assign +policies to devices and keeps a central list of syncing devices. +It also allows to remote wipe or view sync logs of all devices. -#%post esyncpro +%post esyncpro # update/install esyncpro -#%{post_install} --install-update-app esyncpro 2>&1 | tee -a %{install_log} +%{post_install} --install-update-app esyncpro 2>&1 | tee -a %{install_log} %prep echo "Detected php: %{php}" echo "post_install: %{post_install}" %setup0 -c -n %{egwdirname} %setup1 -T -D -a 1 -n %{egwdirname} -#%setup2 -T -D -a 2 -n %{egwdirname} +%setup2 -T -D -a 2 -n %{egwdirname} %setup3 -T -D -a 3 -n %{egwdirname} -#%setup4 -T -D -a 4 -n %{egwdirname} +%setup4 -T -D -a 4 -n %{egwdirname} %setup5 -T -D -a 5 -n %{egwdirname} %setup6 -T -D -a 6 -n %{egwdirname} #%setup9 -T -D -a 9 -n %{egwdirname} @@ -583,6 +590,7 @@ ln -s ../../..%{egwdatadir}/header.inc.php %{egwdir}/redirect.php %{egwdir}/remote.php %{egwdir}/rpc.php +%{egwdir}/share.php %{egwdir}/set_box.php %{egwdir}/status.php %{egwdir}/svn-helper.php @@ -618,9 +626,9 @@ ln -s ../../..%{egwdatadir}/header.inc.php %defattr(-,root,root) %{egwdir}/activesync -#%files esyncpro -#%defattr(-,root,root) -#%{egwdir}/esyncpro +%files esyncpro +%defattr(-,root,root) +%{egwdir}/esyncpro %%files calendar %defattr(-,root,root) @@ -710,9 +718,9 @@ ln -s ../../..%{egwdatadir}/header.inc.php %defattr(-,root,root) %{egwdir}/sitemgr -#%files stylite -#%defattr(-,root,root) -#%{egwdir}/stylite +%files stylite +%defattr(-,root,root) +%{egwdir}/stylite %files timesheet %defattr(-,root,root)