From a40988e0fa8c6204837cb5968df2c7ca8dc6c2ec Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 19 Jul 2011 17:20:23 -0400
Subject: [PATCH] 1.3.54

---
 .gitignore             |  2 +-
 chkconfig-fix-tx.patch | 69 ------------------------------------------
 chkconfig.spec         |  9 ++++--
 sources                |  2 +-
 4 files changed, 8 insertions(+), 74 deletions(-)
 delete mode 100644 chkconfig-fix-tx.patch

diff --git a/.gitignore b/.gitignore
index d36b1e6..9d18d4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/chkconfig-1.3.53.tar.bz2
+/chkconfig-1.3.54.tar.bz2
diff --git a/chkconfig-fix-tx.patch b/chkconfig-fix-tx.patch
deleted file mode 100644
index 5cc982d..0000000
--- a/chkconfig-fix-tx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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 353bc9c..d09714f 100644
--- a/chkconfig.spec
+++ b/chkconfig.spec
@@ -1,11 +1,10 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.53
+Version: 1.3.54
 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
@@ -30,7 +29,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}
@@ -75,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Tue Jul 19 2011 Bill Nottingham <notting@redhat.com> 1.3.54-1
+- alternatives: fix --initscript systemd support (#714830)
+- revert forwarding of 'chkconfig --del' to 'systemctl disable'
+
 * Fri Jul 15 2011 Bill Nottingham <notting@redhat.com> 1.3.53-1
 - ntsysv: change the default to configure runlevels 2/3/4/5 (#709254)
 - alternatives: check whether the --initscript param is a systemd service, act appropriately (#714830)
diff --git a/sources b/sources
index 4c832f8..0e1d6ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99ad5f70853a2801bf1ac08fbc36a1b4  chkconfig-1.3.53.tar.bz2
+e1df1a98bd5356628b1eaddfbbcc364f  chkconfig-1.3.54.tar.bz2