avoid .sh ext for .php scripts

[packages/roundcubemail.git] / roundcubemail.spec

diff --git a/roundcubemail.spec b/roundcubemail.spec
index 199af504ada264ea66eb7c8c8855cb69c2bbc473..df6bb1d6c5e02d5527c363bf816e84549fba96ba 100644 (file)
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -15,12 +15,12 @@
 Summary:       RoundCube Webmail
 Summary(pl.UTF-8):     RoundCube Webmail - poczta przez WWW
 Name:          roundcubemail
-Version:       0.9.4
-Release:       1
+Version:       1.0.8
+Release:       0.3
 License:       GPL v3+
 Group:         Applications/Mail
 Source0:       http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}-dep.tar.gz
-# Source0-md5: 8ec32e093983128ef1a87c561bb48c99
+# Source0-md5: 9465b80be1c13534646a04b0b5562d56
 Source1:       apache.conf
 Source2:       %{name}.logrotate
 Source3:       lighttpd.conf
@@ -36,7 +36,7 @@ Patch4:               %{name}-password-anon-ldap-bind.patch
 URL:           http://www.roundcube.net/
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.566
+BuildRequires: rpmbuild(macros) >= 1.654
 BuildRequires: sed >= 4.0
 Requires:      %{name}-skin
 Requires:      php(core) >= %{php_min_version}
@@ -62,12 +62,13 @@ Requires:   webserver(php)
 Requires(post):        openssl-tools
 Suggests:      php(exif)
 Suggests:      php(fileinfo)
-Suggests:      php-gd
-Suggests:      php-intl
-Suggests:      php-json
-Suggests:      php-mbstring
-Suggests:      php-mcrypt
-Suggests:      php-openssl
+Suggests:      php(gd)
+Suggests:      php(intl)
+Suggests:      php(json)
+Suggests:      php(mbstring)
+Suggests:      php(mcrypt)
+Suggests:      php(openssl)
+Suggests:      php(xml)
 Suggests:      php-pear-Auth_SASL
 # at least one MDB2 db driver needed
 Suggests:      php-pear-MDB2_Driver_mysql
@@ -76,7 +77,6 @@ Suggests:     php-pear-MDB2_Driver_sqlite
 Suggests:      php-pear-Net_LDAP2
 Suggests:      php-pear-Net_Sieve
 Suggests:      php-pear-Net_Socket
-Suggests:      php-xml
 Obsoletes:     roundcube-plugin-jqueryui
 Obsoletes:     roundcubemail-skin-default
 Conflicts:     apache-base < 2.4.0-1
@@ -94,14 +94,13 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                find_lang       sh %{SOURCE5} %{buildroot}
 
-# bad depsolver
-%define                _noautopear     pear
+%define                _noautoreq_pear .*
 
 # exclude optional php dependencies
 %define                _noautophp      php-sqlite php-mysql php-mysqli php-pgsql php-hash php-json php-xml
 
 # put it together for rpmbuild
-%define                _noautoreq      %{?_noautophp} %{?_noautopear}
+%define                _noautoreq      %{?_noautophp}
 
 %description
 RoundCube Webmail is a browser-based multilingual IMAP client with an
@@ -177,28 +176,24 @@ find -name .svn | xargs -r rm -rf
 # undos the source
 %undos -f php,inc,js,css
 
-# kill extensions and fill proper shebang
-%{__sed} -i -e '1s,^#!.*php,#!%{__php},' bin/*.sh
-for a in bin/*.sh; do
+# fill proper shebang
+%{__sed} -i -e '1s,^#!.*php,#!/usr/bin/php,' bin/*.sh
+# these are php scripts really
+for a in $(grep -l '<?php' bin/*.sh); do
        mv $a ${a%.sh}
 done
-
 %{__sed} -i s/indexcontacts.sh/indexcontacts/g bin/update
+%{__sed} -i s/updatedb.sh/updatedb/g bin/update
 
 # tools to pack js
-rm bin/{jsshrink,jsunshrink}
-
-# php-pear-Net_Sieve 1.3.0
-rm plugins/managesieve/lib/Net/Sieve.php
-
-# now empty dirs
-rmdir plugins/managesieve/lib/Net
+rm bin/jsshrink.sh
+rm bin/cssshrink.sh
 
 # pear package junk
 rm -v plugins/*/package.xml
 
-mv config/db.inc.php.dist config/db.inc.php
-mv config/main.inc.php.dist config/main.inc.php
+mv config/config.inc.php{.sample,}
+
 %if %{with postfixadmin}
 mv rcpfa-%{rcpfa_ver} rcpfa
 cd rcpfa
@@ -216,7 +211,7 @@ cp -p code/pfa.php ../program/include
 %{__patch} -d .. -p1 < diffs/index.php.diff
 %{__patch} -d .. -p1 < diffs/labels.inc.diff
 %{__patch} -d .. -p1 < diffs/main.inc.diff
-%{__patch} -d .. -p1 < diffs/main.inc.php.diff
+%{__patch} -d .. -p1 < diffs/config.inc.php.diff
 %{__patch} -d .. -p1 < diffs/messages.inc.diff
 %{__patch} -d .. -p1 < diffs/rcube_user.php.diff
 %{__patch} -d .. -p1 < diffs/settingstabs.html.diff
@@ -240,19 +235,16 @@ cp -a skins/* $RPM_BUILD_ROOT%{_appdir}/skins
 
 # Installer part
 cp -a installer/* $RPM_BUILD_ROOT%{_appdir}/installer
-cp -a config/db.inc.php $RPM_BUILD_ROOT%{_appdir}/config/db.inc.php.dist
-cp -a config/main.inc.php $RPM_BUILD_ROOT%{_appdir}/config/main.inc.php.dist
 cp -a SQL $RPM_BUILD_ROOT%{_appdir}
 
 # Plugins
 cp -a plugins $RPM_BUILD_ROOT%{_appdir}/plugins
 
 ## Configuration:
-cp -a config/db.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/db.inc.php
-cp -a config/main.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/main.inc.php
-ln -sf %{_sysconfdir}/db.inc.php $RPM_BUILD_ROOT%{_appdir}/config/db.inc.php
-ln -sf %{_sysconfdir}/main.inc.php $RPM_BUILD_ROOT%{_appdir}/config/main.inc.php
-
+for a in config/*.php; do
+       cp -p $a $RPM_BUILD_ROOT%{_sysconfdir}
+       ln -s %{_sysconfdir}/$(basename $a) $RPM_BUILD_ROOT%{_appdir}/config
+done
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
@@ -273,7 +265,7 @@ for p in $RPM_BUILD_ROOT%{_appdir}/plugins/*; do
                localization)
                        continue
                        ;;
-               README | Changelog | config.inc.php.dist)
+               README | Changelog | composer.json | config.inc.php.dist)
                        echo "%doc $p"
                        ;;
                *)
@@ -293,29 +285,11 @@ makedesstr() {
        openssl rand -hex 12
 }
 
-if grep -q '24ByteDESkey' %{_sysconfdir}/main.inc.php; then
+if grep -q '24ByteDESkey' %{_sysconfdir}/config.inc.php; then
        des=$(makedesstr)
        # precaution if random str generation failed
        if [ c$(echo -n "$des" | wc -c) = c24 ]; then
-               %{__sed} -i -e "s/rcmail-\!24ByteDESkey\*Str/$des/" %{_sysconfdir}/main.inc.php
-       fi
-fi
-
-%pretrans
-if [ ! -f %{_sysconfdir}/db.inc.php -o ! -f %{_sysconfdir}/main.inc.php ]; then
-       # import configs from previously manually installed site
-       d=/home/services/httpd/html/config
-       if [ -f $d/db.inc.php -o -f $d/main.inc.php ]; then
-               echo >&2 "Importing site configs from $d"
-               mkdir -p %{_sysconfdir}
-               if [ -f $d/db.inc.php ]; then
-                       [ -f %{_sysconfdir}/db.inc.php ] && mv -f %{_sysconfdir}/db.inc.php{,.rpmorig}
-                       cp -af $d/db.inc.php %{_sysconfdir}/db.inc.php
-               fi
-               if [ -f $d/main.inc.php ]; then
-                       [ -f %{_sysconfdir}/main.inc.php ] && mv -f %{_sysconfdir}/main.inc.php{,.rpmorig}
-                       cp -af $d/main.inc.php %{_sysconfdir}/main.inc.php
-               fi
+               %{__sed} -i -e "s/rcmail-\!24ByteDESkey\*Str/$des/" %{_sysconfdir}/config.inc.php
        fi
 fi
 
@@ -357,12 +331,13 @@ EOF
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.inc.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/defaults.inc.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mimetypes.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %dir %{_appdir}
 %{_appdir}/*.php
-%dir %{_appdir}/config
-%{_appdir}/config/*.php
+%{_appdir}/config
 %dir %{_appdir}/program
 %{_appdir}/program/include
 %{_appdir}/program/js
@@ -389,7 +364,6 @@ EOF
 %{_appdir}/installer/client.js
 %{_appdir}/installer/styles.css
 %{_appdir}/installer/images
-%{_appdir}/config/*.php.dist
 %{_appdir}/SQL
 
 %files skin-classic