[packages/roundcubemail] keep config/ as dir to avoid dir-replaced-symlink upgrade nonsense

glen glen at pld-linux.org
Mon Jan 18 17:17:03 CET 2016


commit e05ae475639af9ba9d5c12640336b160f0074cd3
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jan 18 18:14:51 2016 +0200

    keep config/ as dir to avoid dir-replaced-symlink upgrade nonsense

 roundcubemail.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 9bc4e93..f5f4bd4 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -16,7 +16,7 @@ Summary:	RoundCube Webmail
 Summary(pl.UTF-8):	RoundCube Webmail - poczta przez WWW
 Name:		roundcubemail
 Version:	1.0.8
-Release:	0.1
+Release:	0.2
 License:	GPL v3+
 Group:		Applications/Mail
 Source0:	http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}-dep.tar.gz
@@ -216,7 +216,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_appdatadir},%{_applogdir},%{_archivelogdir},%{_sysconfdir}} \
-	$RPM_BUILD_ROOT{%{_appdir}/{bin,installer,program,skins},/etc/logrotate.d}
+	$RPM_BUILD_ROOT{%{_appdir}/{bin,config,installer,program,skins},/etc/logrotate.d}
 
 # Main application part:
 cp -a program/* $RPM_BUILD_ROOT%{_appdir}/program
@@ -234,9 +234,10 @@ cp -a SQL $RPM_BUILD_ROOT%{_appdir}
 cp -a plugins $RPM_BUILD_ROOT%{_appdir}/plugins
 
 ## Configuration:
-cp -a config/*.php $RPM_BUILD_ROOT%{_sysconfdir}
-ln -sf %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
-
+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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/roundcubemail.git/commitdiff/e05ae475639af9ba9d5c12640336b160f0074cd3



More information about the pld-cvs-commit mailing list