packages: roundcubemail/roundcubemail.spec - avoid bogus import message

[glen]

Author: glen                         Date: Thu Jun 10 19:04:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid bogus import message

---- Files affected:
packages/roundcubemail:
   roundcubemail.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: packages/roundcubemail/roundcubemail.spec
diff -u packages/roundcubemail/roundcubemail.spec:1.94 packages/roundcubemail/roundcubemail.spec:1.95
--- packages/roundcubemail/roundcubemail.spec:1.94	Sat May 22 19:45:38 2010
+++ packages/roundcubemail/roundcubemail.spec	Thu Jun 10 21:04:53 2010
@@ -194,15 +194,17 @@
 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
-	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
+	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
 	fi
 fi
 
@@ -345,6 +347,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2010/06/10 19:04:53  glen
+- avoid bogus import message
+
 Revision 1.94  2010/05/22 17:45:38  gotar
 - fixed Group
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roundcubemail/roundcubemail.spec?r1=1.94&r2=1.95&f=u