[packages/yum] avoid $releasever present in output paths

[glen]

commit 9ba1598b03aff0e1136b6012a4a1a2f4ad1ab03d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 3 18:57:36 2013 +0200

    avoid $releasever present in output paths
    
    we really need one "release" package instead of dozen of issue* alternatives

 pld-release.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 yum.spec          |  2 ++
 2 files changed, 42 insertions(+)
---
diff --git a/yum.spec b/yum.spec
index f6d244c..ed3adf5 100644
--- a/yum.spec
+++ b/yum.spec
@@ -24,6 +24,7 @@ Patch5:		%{name}-config.patch
 Patch6:		nosetests.patch
 Patch7:		rpm5.patch
 Patch8:		tests.patch
+Patch9:		pld-release.patch
 # fc
 Patch10:	installonlyn-enable.patch
 Patch11:	%{name}-mirror-priority.patch
@@ -85,6 +86,7 @@ zapytaniu użytkownika w razie potrzeby.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %{__make}
diff --git a/pld-release.patch b/pld-release.patch
new file mode 100644
index 0000000..85adc62
--- /dev/null
+++ b/pld-release.patch
@@ -0,0 +1,40 @@
+--- yum-3.4.3/yum/config.py~	2013-03-02 21:24:45.000000000 +0200
++++ yum-3.4.3/yum/config.py	2013-03-03 18:30:14.106276193 +0200
+@@ -612,7 +612,7 @@
+     debuglevel = IntOption(2, 0, 10)
+     errorlevel = IntOption(2, 0, 10)
+ 
+-    distroverpkg = Option('redhat-release')
++    distroverpkg = Option('pld-release')
+     installroot = Option('/')
+     config_file_path = Option('/etc/yum/yum.conf')
+     plugins = BoolOption(False)
+@@ -1023,7 +1023,7 @@
+     # we're going to take the first one - if there is more than one of these
+     # then the user needs a beating
+     if idx.count() == 0:
+-        releasever = '$releasever'
++        releasever = None
+     else:
+         hdr = idx.next()
+         releasever = hdr['version']
+--- yum-3.4.3/./yum/__init__.py~	2013-03-02 21:24:45.000000000 +0200
++++ yum-3.4.3/./yum/__init__.py	2013-03-03 18:55:57.354165543 +0200
+@@ -120,7 +120,7 @@
+         self.syslog_facility = None
+         self.syslog_device = None
+         self.arch = None
+-        self.releasever = None
++        self.releasever = 'th'
+         self.uuid = None
+ 
+ 
+@@ -357,7 +357,7 @@
+         # repos are ver/arch specific so add $basearch/$releasever
+         self.conf._repos_persistdir = os.path.normpath('%s/repos/%s/%s/'
+                % (self.conf.persistdir,  self.yumvar.get('basearch', '$basearch'),
+-                  self.yumvar.get('releasever', '$releasever')))        
++                  self.yumvar.get('releasever', None)))
+         self.doFileLogSetup(self.conf.uid, self.conf.logfile)
+         self.verbose_logger.debug('Config time: %0.3f' % (time.time() - conf_st))
+         self.plugins.run('init')
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/9ba1598b03aff0e1136b6012a4a1a2f4ad1ab03d