From e68276229d47b7f6447b38a28dafbf2455bf41d9 Mon Sep 17 00:00:00 2001 From: Elan Ruusamäe Date: Mon, 2 Apr 2012 09:49:15 +0000 Subject: - dir to symlink conflict resolving on upgrade Changed files: ppp.spec -> 1.154 diff --git a/ppp.spec b/ppp.spec index 90a79af..8d5cf23 100644 --- a/ppp.spec +++ b/ppp.spec @@ -17,7 +17,7 @@ Summary(tr.UTF-8): PPP sunucu süreci Summary(zh_CN.UTF-8): PPP 配置和管理软件包. Name: ppp Version: 2.4.5 -Release: 6 +Release: 7 Epoch: 3 License: distributable Group: Networking/Daemons @@ -187,6 +187,15 @@ ln -s plugins $v %clean rm -rf $RPM_BUILD_ROOT +%pretrans +# %{version} used to be directory +if [ -d %{_libdir}/pppd/%{version} -a ! -L %{_libdir}/pppd/%{version} ]; then + set -e + rm -f %{_libdir}/pppd/plugins + mv %{_libdir}/pppd/{%{version},plugins} + ln -sn plugins %{_libdir}/pppd/%{version} +fi + %files %defattr(644,root,root,755) %doc README.linux debian/README.debian scripts -- cgit v0.10.2