--- rpms/anaconda/sme7/smeserver.patch 2007/06/12 14:39:15 1.1 +++ rpms/anaconda/sme7/smeserver.patch 2008/03/18 21:01:36 1.5 @@ -50,7 +50,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/instdata.py mezzanine_patched_anaconda-10.1.1.37/instdata.py --- anaconda-10.1.1.37/instdata.py 2004-08-25 23:12:10.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/instdata.py 2006-04-06 06:44:44.401953223 +1000 -@@ -114,10 +114,7 @@ +@@ -116,10 +116,7 @@ def write(self, instPath): self.langSupport.write (instPath) @@ -62,7 +62,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond self.timezone.write (instPath) self.auth.write (instPath) self.firewall.write (instPath) -@@ -170,8 +167,8 @@ +@@ -172,8 +169,8 @@ self.instLanguage.writeKS(f) self.langSupport.writeKS(f) @@ -93,10 +93,9 @@ diff -Nur -x '*.orig' -x '*.rej' anacond log("Running kickstart %%post script(s)") for script in self.postScripts: script.run(rootPath, serial) -diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/lang-table mezzanine_patched_anaconda-10.1.1.37/lang-table ---- anaconda-10.1.1.37/lang-table 2004-10-25 22:38:22.000000000 +1000 -+++ mezzanine_patched_anaconda-10.1.1.37/lang-table 2006-04-06 06:46:15.455133408 +1000 -@@ -1,41 +1,5 @@ +--- anaconda-10.1.1.81/lang-table.sme 2004-10-25 06:38:22.000000000 -0600 ++++ anaconda-10.1.1.81/lang-table 2008-03-07 13:34:48.000000000 -0700 +@@ -1,41 +1,11 @@ -Arabic ar none ar_SA.UTF-8 us Asia/Riyadh ar_SA.UTF-8 -Bengali bn none bn_BD.UTF-8 us Asia/Dhaka bn_BD.UTF-8 -Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta bn_IN.UTF-8 @@ -106,19 +105,18 @@ diff -Nur -x '*.orig' -x '*.rej' anacond -Chinese(Traditional) zh_TW bterm zh_TW.UTF-8 us Asia/Taipei zh_TW.UTF-8 -Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb hr_HR.UTF-8 -Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague cs_CZ.UTF-8 --Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 --Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 -+Deutsch de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 + Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 + Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York en_US.UTF-8 -Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn et_EE.UTF-8 -Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki fi_FI.UTF-8 --French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 --German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 + French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 + German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 -Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta gu_IN.UTF-8 -Hindi hi none hi_IN.UTF-8 us Asia/Calcutta hi_IN.UTF-8 --Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 + Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 -Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik is_IS.UTF-8 --Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 + Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 -Japanese ja bterm ja_JP.UTF-8 jp106 Asia/Tokyo ja_JP.UTF-8 -Korean ko bterm ko_KR.UTF-8 us Asia/Seoul ko_KR.UTF-8 -Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje mk_MK.UTF-8 @@ -127,21 +125,29 @@ diff -Nur -x '*.orig' -x '*.rej' anacond -Persian fa none fa_IR.UTF-8 us Asia/Tehran fa_IR.UTF-8 -Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl Europe/Warsaw pl_PL.UTF-8 -Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon pt_PT.UTF-8 --Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8 + Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8 -Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta pa_IN.UTF-8 -Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow ru_RU.UTF-8 --Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 --Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 --Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 + Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 + Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 + Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 -Tamil ta none ta_IN.UTF-8 us Asia/Calcutta ta_IN.UTF-8 -Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul tr_TR.UTF-8 -Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev uk_UA.UTF-8 -Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon vi_VN.UTF-8 -Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London cy_GB.UTF-8 -Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg zu_ZA.UTF-8 -+Español es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 -+Français fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 -+Italiano it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 +--- anaconda-10.1.1.81/packages.py.sme 2008-03-17 11:02:31.000000000 -0600 ++++ anaconda-10.1.1.81/packages.py 2008-03-17 11:07:55.000000000 -0600 +@@ -1610,7 +1610,7 @@ + "from testers, and it is not suitable " + "for day to day usage.\n\n" + "To report feedback, please visit:\n\n" +- " http://www.centos.orrg/bugs\n\n" ++ " http://bugs.contribs.org/\n\n" + "and file a report against '%s'.\n" + %(productName, fileagainst)), + type="custom", custom_icon="warning", diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/partedUtils.py mezzanine_patched_anaconda-10.1.1.37/partedUtils.py --- anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:59:28.175482025 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:47:31.309955789 +1000 @@ -358,7 +364,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond - else: - devname = drive - partList.append("%s (%s)" %(desc, drive)) -+ partList.append("Upgrade existing \"%s\" system" %(desc)) ++ partList.append(_("Upgrade existing \"%s\" system") %(desc)) (button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), - _("One or more existing Linux installations " @@ -380,9 +386,9 @@ diff -Nur -x '*.orig' -x '*.rej' anacond diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/upgrade.py mezzanine_patched_anaconda-10.1.1.37/upgrade.py --- anaconda-10.1.1.37/upgrade.py 2006-04-06 06:59:28.387445237 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/upgrade.py 2006-04-06 06:50:27.473356801 +1000 -@@ -38,6 +38,21 @@ - upgrade_remove_blacklist = () - +@@ -49,6 +49,21 @@ + upgrade_remove_blacklist = ( ("samba","ppc64"),) + def findRootParts(intf, id, dispatch, dir, chroot): +# w = intf.waitWindow(_("Converting to RAID"), +# _("Converting to RAID, this may take several minutes...")) @@ -402,7 +408,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond if dir == DISPATCH_BACK: return if id.rootParts is None: -@@ -49,7 +64,7 @@ +@@ -60,7 +75,7 @@ if id.rootParts is not None and len(id.rootParts) > 0: dispatch.skipStep("findinstall", skip = 0) @@ -411,7 +417,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond dispatch.skipStep("installtype", skip = 1) else: dispatch.skipStep("findinstall", skip = 1) -@@ -501,10 +516,10 @@ +@@ -513,10 +528,10 @@ pass sys.exit(0) @@ -424,7 +430,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond "that this is not a %s system. " "Continuing with the upgrade process may " "leave the system in an unusable state. Do " -@@ -521,7 +536,7 @@ +@@ -533,7 +548,7 @@ # Figure out current version for upgrade nag and for determining weird # upgrade cases supportedUpgradeVersion = -1 @@ -433,7 +439,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond for h in mi: if h[rpm.RPMTAG_EPOCH] is None: epoch = None -@@ -529,7 +544,7 @@ +@@ -541,7 +556,7 @@ epoch = str(h[rpm.RPMTAG_EPOCH]) if supportedUpgradeVersion <= 0: @@ -442,7 +448,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond (epoch, h[rpm.RPMTAG_VERSION], h[rpm.RPMTAG_RELEASE])) if val > 0: -@@ -538,9 +553,6 @@ +@@ -550,9 +565,6 @@ supportedUpgradeVersion = 1 break