Author: glen                         Date: Mon Mar 16 17:55:25 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package config templates for installer (-setup pkg), add SQL dir to -setup pkg

---- Files affected:
SPECS:
   roundcubemail.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/roundcubemail.spec
diff -u SPECS/roundcubemail.spec:1.75 SPECS/roundcubemail.spec:1.76
--- SPECS/roundcubemail.spec:1.75       Tue Feb  3 21:08:43 2009
+++ SPECS/roundcubemail.spec    Mon Mar 16 18:55:20 2009
@@ -5,19 +5,19 @@
 # - use pear-deps system?
 # - use system js/tiny_mce
 # - package: http://blog.ilohamail.org/ and remove boundled classess from it
-#
+# - Some php-database backend. Suggests?
 #
 %bcond_with    spamfilter      # Build with spamfilter patch
 %bcond_with    postfixadmin    # Build with postfixadmin support patch
 
-%define                subver  stable
-%define                rel     2
+%define                subver          stable
+%define                rel                     2
+%define                rcpfa_ver       1.0.4
 Summary:       RoundCube Webmail
 Summary(pl.UTF-8):     RoundCube Webmail - poczta przez WWW
 Name:          roundcubemail
 Version:       0.2
 Release:       0.%{subver}.%{rel}
-%define        rcpfa_ver       1.0.4
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       
http://dl.sourceforge.net/roundcubemail/%{name}-%{version}-%{subver}.tar.gz
@@ -41,7 +41,6 @@
 Requires:      php(pcre)
 Requires:      php(sockets)
 Requires:      php-pear-DB
-# Some php-database backend. Suggests?
 Requires:      webapps
 Suggests:      php(gd)
 Suggests:      php(iconv)
@@ -157,10 +156,13 @@
 
 # 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}
 
 ## Configuration:
-install config/db.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/db.inc.php
-install config/main.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/main.inc.php
+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
 
@@ -192,7 +194,7 @@
 if [ "$1" = 0 ]; then
 %banner -e %{name} <<'EOF'
 To customize installed languages set
- %%_install_langs in /etc/rpm/macros
+ %%_install_langs in /etc/rpm/macros.lang
 
 EOF
 fi
@@ -217,7 +219,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG INSTALL README UPGRADING SQL
+%doc CHANGELOG INSTALL README UPGRADING
 %dir %attr(750,root,http) %{_sysconfdir}
 %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
@@ -314,6 +316,8 @@
 %{_appdir}/installer/styles.css
 %{_appdir}/installer/welcome.html
 %{_appdir}/installer/images
+%{_appdir}/config/*.php.dist
+%{_appdir}/SQL
 
 %files skin-default
 %defattr(644,root,root,755)
@@ -325,6 +329,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2009/03/16 17:55:20  glen
+- package config templates for installer (-setup pkg), add SQL dir to -setup 
pkg
+
 Revision 1.75  2009/02/03 20:08:43  dzeus
 - fixed attachment upload problem
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/roundcubemail.spec?r1=1.75&r2=1.76&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to