[yum-rhn-plugin] Rebase to yum-rhn-plugin-1.7.2-1.fc16 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Wed Mar 7 11:04:11 UTC 2012


commit 4a7949fac187e1966069ffc5f0a58f2193caea33
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Wed Mar 7 12:03:03 2012 +0100

    Rebase to yum-rhn-plugin-1.7.2-1.fc16 in rawhide.

 .gitignore          |    1 +
 sources             |    2 +-
 yum-rhn-plugin.spec |   16 ++++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52f66c2..8d8adc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ yum-rhn-plugin-1.1.3.tar.gz
 /yum-rhn-plugin-1.3.6.tar.gz
 /yum-rhn-plugin-1.4.15.tar.gz
 /yum-rhn-plugin-1.6.16.tar.gz
+/yum-rhn-plugin-1.7.2.tar.gz
diff --git a/sources b/sources
index d497fc6..fb1d175 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec94523a6c233f1e83baf267bc2cd8de  yum-rhn-plugin-1.6.16.tar.gz
+c15e006d21266e89cfc3943fee962413  yum-rhn-plugin-1.7.2.tar.gz
diff --git a/yum-rhn-plugin.spec b/yum-rhn-plugin.spec
index 2ccf67c..433449d 100644
--- a/yum-rhn-plugin.spec
+++ b/yum-rhn-plugin.spec
@@ -1,7 +1,7 @@
 Summary: RHN support for yum
 Name: yum-rhn-plugin
-Version: 1.6.16
-Release: 2%{?dist}
+Version: 1.7.2
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -57,8 +57,7 @@ fi
 # 682820 - re-enable yum-rhn-plugin after package upgrade if the system is already registered
 export pluginconf='/etc/yum/pluginconf.d/rhnplugin.conf'
 if [ $1 -gt 1 ] && [ -f "$pluginconf" ] && [ -f "/var/tmp/enable-yum-rhn-plugin" ]; then
-    sed -i 's/^\([[:space:]]*enabled[[:space:]]*=[[:space:]]*\)0\([[:space:]]*\)$/\11\2/'  \
-        "$pluginconf"
+    sed -i '/\[main]/,/^$/{/enabled/s/0/1/}' "$pluginconf"
     rm -f /var/tmp/enable-yum-rhn-plugin
 fi
 
@@ -72,8 +71,13 @@ fi
 %doc LICENSE
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Tue Feb 28 2012 Jan Pazdziora 1.7.2-1
+- Update .po and .pot files for yum-rhn-plugin.
+- Download translations from Transifex for yum-rhn-plugin.
+
+* Tue Feb 14 2012 Miroslav Suchý 1.7.1-1
+- 788903 - do not change "enable" outside of [main]
+- Bumping package versions for 1.7.
 
 * Wed Dec 21 2011 Miroslav Suchý 1.6.16-1
 - 759786 - wrap SSL.SysCallError in yum error


More information about the scm-commits mailing list