summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--anaconda.spec5
-rw-r--r--lang-table1
-rw-r--r--loader2/Makefile3
4 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 55f22a797..ebd588b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
* anaconda.spec: Bump version.
+ * lang-table: Remove sr@Latn until po files exist
+
+ * loader2/Makefile: Make msgmerge quiet. Fix noisiness from
+ charset in the generated loader.po
+
+2006-01-06 Jeremy Katz <katzj@redhat.com>
+
+ * anaconda.spec: Bump version.
+
* yuminstall.py (YumSorter.isPackageInstalled): Fix a latent bug I
noticed when working on s-c-packages. Won't really affect
anaconda, though.
diff --git a/anaconda.spec b/anaconda.spec
index 8d1880aa3..7bce9922b 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
Name: anaconda
-Version: 10.90.24
+Version: 10.90.25
Release: 1
License: GPL
Summary: Graphical system installer
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Fri Jan 6 2006 Jeremy Katz <katzj@redhat.com> - 10.90.25-1
+- no sr@Latn yet since the po files haven't been added
+
* Fri Jan 6 2006 Jeremy Katz <katzj@redhat.com> - 10.90.24-1
- move a11y stuff earlier
- fix the text mode progress bar (pnasrat, #176367)
diff --git a/lang-table b/lang-table
index 17a02740a..ce3928e6b 100644
--- a/lang-table
+++ b/lang-table
@@ -35,7 +35,6 @@ Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_P
Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta
Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow
Serbian sr latarcyrheb-sun16 sr_CS.UTF-8 sr-cy Europe/Berlin
-Serbian sr@Latn latarcyrheb-sun16 sr_CS.UTF-8@Latn sr-cy Europe/Berlin
Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qerty Europe/Bratislava
Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana
Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid
diff --git a/loader2/Makefile b/loader2/Makefile
index be1a359de..ce8249156 100644
--- a/loader2/Makefile
+++ b/loader2/Makefile
@@ -83,11 +83,12 @@ loader.tr: $(TR) ../lang-table
(cd tr; ls $(TRFILES) | cpio --quiet -Hcrc -o |gzip -9) > $@
tr/%.tr: ../po/%.po loader.po
- msgmerge $< loader.po | msgconv -t utf-8 | ./simplemot > $@
+ msgmerge -q $< loader.po | msgconv -t utf-8 | ./simplemot > $@
loader.po: $(wildcard *.c)
xgettext --default-domain=loader --add-comments \
--keyword=_ --keyword=N_ *.c
+ sed -i 's/charset=CHARSET/charset=UTF-8/' $@
linuxrc.s390:
@echo "Nothing to do for $@"