[packages/anaconda/anaconda-19] fix path to libexec; tools need to be executable
glen
glen at pld-linux.org
Sat May 18 00:57:57 CEST 2013
commit 0fda9cc52fbbbc2b114324a24646baa596eb7482
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat May 18 01:57:23 2013 +0300
fix path to libexec; tools need to be executable
anaconda.spec | 11 +++++++++--
libexec.patch | 11 +++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/anaconda.spec b/anaconda.spec
index 834a5cf..a09ab63 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -31,12 +31,13 @@ Summary: Graphical system installer
Summary(pl.UTF-8): Graficzny instalator systemu
Name: anaconda
Version: 19.25
-Release: 0.12
+Release: 0.14
License: GPL
Group: Applications/System
Source0: http://pkgs.fedoraproject.org/repo/pkgs/anaconda/%{name}-%{version}.tar.bz2/b3f242b630aa1d4a458756b5816a0603/anaconda-%{version}.tar.bz2
# Source0-md5: b3f242b630aa1d4a458756b5816a0603
Patch0: interfaces-dir.patch
+Patch1: libexec.patch
URL: http://fedoraproject.org/wiki/Anaconda
BuildRequires: NetworkManager-devel >= %{nmver}
BuildRequires: audit-libs-devel
@@ -164,6 +165,7 @@ anaconda runtime on NFS/HTTP/FTP servers or local disks.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# / on %{_prefix} kicks in
%{__sed} -i -e '1 s,#!/usr/bin/bash,#!/bin/sh,' scripts/run-anaconda
@@ -225,7 +227,12 @@ update-desktop-database
%attr(755,root,root) %{_sbindir}/logpicker
%{_datadir}/anaconda
%exclude %{_datadir}/anaconda/tzmapdata/*
-%{_libdir}/anaconda
+%dir %{_libdir}/anaconda
+%attr(755,root,root) %{_libdir}/anaconda/anaconda-yum
+%attr(755,root,root) %{_libdir}/anaconda/auditd
+%attr(755,root,root) %{_libdir}/anaconda/run-anaconda
+%attr(755,root,root) %{_libdir}/anaconda/upd-updates
+%{_libdir}/anaconda/pyrc.py
%{py_sitedir}/pyanaconda
%{py_sitedir}/log_picker
diff --git a/libexec.patch b/libexec.patch
new file mode 100644
index 0000000..77fe897
--- /dev/null
+++ b/libexec.patch
@@ -0,0 +1,11 @@
+--- site-packages/pyanaconda/packaging/yumpayload.py~ 2013-05-18 00:48:37.000000000 +0300
++++ site-packages/pyanaconda/packaging/yumpayload.py 2013-05-18 00:58:31.635659944 +0300
+@@ -1550,7 +1550,7 @@
+ # Watch output for progress, debug and error information
+ install_errors = []
+ try:
+- for line in execReadlines("/usr/libexec/anaconda/anaconda-yum", args):
++ for line in execReadlines("/usr/lib/anaconda/anaconda-yum", args):
+ if line.startswith("PROGRESS_"):
+ key, text = line.split(":", 2)
+ msg = progress_map[key] + text
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/anaconda.git/commitdiff/0fda9cc52fbbbc2b114324a24646baa596eb7482
More information about the pld-cvs-commit
mailing list