From 959982f01dc3aa9c80759fb5603192841ff18dde Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Jul 15 2011 21:05:21 +0000 Subject: Fix bogus cruft from TX. --- diff --git a/chkconfig-fix-tx.patch b/chkconfig-fix-tx.patch new file mode 100644 index 0000000..5cc982d --- /dev/null +++ b/chkconfig-fix-tx.patch @@ -0,0 +1,69 @@ +diff --git a/po/is.po b/po/is.po +index 8658ee0..a63e9e7 100644 +--- a/po/is.po ++++ b/po/is.po +@@ -100,12 +100,12 @@ msgstr "gat ekki opnað möppuna %s: %s\n" + #: ../chkconfig.c:591 + #, c-format + msgid "Note: Forwarding request to 'systemctl %s %s'.\n" +-msgstr "Athugið: Áframsendi beiðni í 'systemctl %s %s'." ++msgstr "Athugið: Áframsendi beiðni í 'systemctl %s %s'.\n" + + #: ../chkconfig.c:596 + #, c-format + msgid "Failed to forward service request to systemctl: %m\n" +-msgstr "Ekki tókst að áframsenda þjónustubeiðni í systemctl: %m" ++msgstr "Ekki tókst að áframsenda þjónustubeiðni í systemctl: %m\n" + + #: ../chkconfig.c:652 + #, c-format +diff --git a/po/it.po b/po/it.po +index 6a8b70e..e334865 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -111,9 +111,7 @@ msgstr "Nota: Inoltro richiesta a 'systemctl %s %s'.\n" + #: ../chkconfig.c:596 + #, c-format + msgid "Failed to forward service request to systemctl: %m\n" +-msgstr "" +-"Fallita la richiesta di inoltro del servizio a systemctl: %m\n" +-" " ++msgstr "Fallita la richiesta di inoltro del servizio a systemctl: %m\n" + + #: ../chkconfig.c:652 + #, c-format +diff --git a/po/nl.po b/po/nl.po +index f1361ee..a752e0f 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -109,7 +109,7 @@ msgstr "Opmerking: Verzoek doorsturen naar 'systemctl %s %s'.\n" + #: ../chkconfig.c:596 + #, c-format + msgid "Failed to forward service request to systemctl: %m\n" +-msgstr "Service aanvraag doorsturen naar systemctl mislukte: %m" ++msgstr "Service aanvraag doorsturen naar systemctl mislukte: %m\n" + + #: ../chkconfig.c:652 + #, c-format +diff --git a/po/zh_CN.po b/po/zh_CN.po +index c815e70..94c779f 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -132,7 +132,7 @@ msgid "" + "\n" + msgstr "" + "\n" +-"注意:该输出结果只显示 SysV 服务,并不包含原生 systemd 服务。SysV 配置数据可能被原生 systemd 配置覆盖。 " ++"注意:该输出结果只显示 SysV 服务,并不包含原生 systemd 服务。SysV 配置数据可能被原生 systemd 配置覆盖。 \n" + + #: ../chkconfig.c:759 + #, c-format +@@ -265,7 +265,7 @@ msgstr " alternatives --set <名称> <路径>\n" + #: ../alternatives.c:73 + #, c-format + msgid "\n" +-msgstr " \n" ++msgstr "\n" + + #: ../alternatives.c:74 + #, c-format diff --git a/chkconfig.spec b/chkconfig.spec index e485d25..353bc9c 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -5,6 +5,7 @@ Release: 1%{?dist} License: GPLv2 Group: System Environment/Base Source: http://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2 +Patch1: chkconfig-fix-tx.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: newt-devel gettext popt-devel Conflicts: initscripts <= 5.30-1 @@ -29,7 +30,7 @@ page), ntsysv configures the current runlevel (5 if you're using X). %prep %setup -q - +%patch1 -p1 %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}