[httrack] Test finished, merge back to real fix
Christopher Meng
cicku at fedoraproject.org
Mon Mar 2 13:22:05 UTC 2015
commit bab1c667001ca227dbc128a68a3ee0757e005f48
Author: Christopher Meng <i at cicku.me>
Date: Mon Mar 2 08:21:17 2015 -0500
Test finished, merge back to real fix
httrack.spec | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/httrack.spec b/httrack.spec
index 92dd94a..423a300 100644
--- a/httrack.spec
+++ b/httrack.spec
@@ -114,16 +114,8 @@ end
local path2 = "%{_pkgdocdir}/html"
local st2 = posix.stat(path2)
-if st2 and st2.type == "directory" then
- local status2 = os.rename(path2, path2..".rpmmoved")
- if not status2 then
- local suffix2 = 0
- while not status2 do
- suffix2 = suffix2 + 1
- status2 = os.rename(path2..".rpmmoved", path2..".rpmmoved."..suffix2)
- end
- os.rename(path2, path2..".rpmmoved")
- end
+if st2 and st2.type == "link" then
+ os.remove(path2)
end
%post
@@ -141,9 +133,8 @@ fi
require "os"
local path1 = "%{_datadir}/httrack/html"
-local path2 = "%{_pkgdocdir}/html"
os.execute("gtk-update-icon-cache".." %{_datadir}/icons/hicolor ".."&>/dev/null ".."|| "..":")
-os.execute("rm".." -fr".." "..path1..".rpmmoved*".." "..path2..".rpmmoved*")
+os.execute("rm".." -fr".." "..path1..".rpmmoved*")
%files
# There is an unofficial but widespread french translation of gpl
More information about the scm-commits
mailing list