[arch-commits] CVS update of core/base/glibc (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Oct 24 21:50:59 UTC 2007
Date: Wednesday, October 24, 2007 @ 17:50:59
Author: andyrtr
Path: /home/cvs-core/core/base/glibc
Modified: PKGBUILD (1.71 -> 1.72) first_weekday.diff (1.2 -> 1.3)
locale.gen (1.3 -> 1.4) locales-fr.diff (1.1 -> 1.2)
upgpkg: glibc 2.7-1
splitted out tzdata
--------------------+
PKGBUILD | 43 +++++------
first_weekday.diff | 187 ---------------------------------------------------
locale.gen | 20 +++++
locales-fr.diff | 25 ------
4 files changed, 40 insertions(+), 235 deletions(-)
Index: core/base/glibc/PKGBUILD
diff -u core/base/glibc/PKGBUILD:1.71 core/base/glibc/PKGBUILD:1.72
--- core/base/glibc/PKGBUILD:1.71 Thu Oct 4 22:45:15 2007
+++ core/base/glibc/PKGBUILD Wed Oct 24 17:50:59 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.71 2007/10/05 02:45:15 dan Exp $
+# $Id: PKGBUILD,v 1.72 2007/10/24 21:50:59 andyrtr Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=glibc
-pkgver=2.6.1
-pkgrel=2
-_tzdata=2007g
+pkgver=2.7
+pkgrel=1
+_tzdata=2007h
install=glibc.install
backup=(etc/locale.gen)
pkgdesc="GNU C Library"
@@ -11,8 +11,8 @@
license=('GPL' 'LGPL')
url="http://www.gnu.org/software/libc"
groups=('base')
-depends=('bash' 'kernel-headers>=2.6.22.1')
-makedepends=('gcc>=4.2.1-2')
+depends=('bash' 'kernel-headers>=2.6.23.1' 'tzdata')
+makedepends=('gcc>=4.2.2-2')
replaces=('glibc-xen')
source=(http://ftp.gnu.org/gnu/glibc/glibc-${pkgver}.tar.bz2
http://ftp.gnu.org/gnu/glibc/glibc-libidn-${pkgver}.tar.bz2
@@ -20,38 +20,29 @@
glibc-2.5-localedef_segfault-1.patch
locales-fr.diff
locales_GB.diff
- fix-C-first_weekday.diff
first_weekday.diff
- pl_PL-miesiace.patch
nscd
locale.gen
locale-gen)
-md5sums=('11cf6d3fc86dbe0890b8d00372eb6286'
- '503f1315afd808728ebaa75b3d87a7d9'
- '04152531a69c07b6cb08bacfd425aae1'
+md5sums=('065c5952b439deba40083ccd67bcc8f7'
+ '226809992fb1f3dc6ea23e0f26952ea4'
+ 'da8b4fb3abd4f1403b0bd2a4675a91ab'
'879fcc4d60526a4796e5d99d5839de38'
- '78ee499ba48ceeff0b4bbbb953682517'
+ '821bcaebeefc2c597d78913d29c54386'
'159b30fffda57b38c825bac36d6a9818'
- '8810a53b0b1ebb0480dbe6d7604a11d1'
- '16145f6005953c3baa627aa44010bbc1'
- 'd92356fc452202ab19c1a14f74a0290a'
+ 'd0caf05c6dad32599f12585d6528abe0'
'b587ee3a70c9b3713099295609afde49'
- 'de51529a06d0d39b4e1cd23b5edec554'
+ '62dfa0808ebfa9e2f8e929c565f368ba'
'476e9113489f93b348b21e144b6a8fcf')
build() {
cd ${startdir}/src/glibc-${pkgver}
mv ../glibc-libidn-${pkgver} ./libidn
- pushd timezone || return 1
- tar zxf ${startdir}/src/tzdata${_tzdata}.tar.gz || return 1
- popd
patch -Np1 -i ${startdir}/src/glibc-2.5-localedef_segfault-1.patch || return 1
patch -Np0 -i ${startdir}/src/locales_GB.diff || return 1
patch -Np1 -i ${startdir}/src/locales-fr.diff || return 1
patch -Np0 -i ${startdir}/src/first_weekday.diff || return 1
- patch -Np0 -i ${startdir}/src/fix-C-first_weekday.diff || return 1
- patch -Np0 -i ${startdir}/src/pl_PL-miesiace.patch || return 1
mkdir -p ${startdir}/pkg/etc
touch ${startdir}/pkg/etc/ld.so.conf
@@ -68,14 +59,14 @@
../configure --prefix=/usr \
--enable-add-ons=nptl,libidn --without-cvs \
- --enable-kernel=2.6.13 --disable-profile \
+ --enable-kernel=2.6.16 --disable-profile \
--with-headers=/usr/include --libexecdir=/usr/lib \
--enable-bind-now --with-tls --with-__thread \
--libdir=/usr/lib --without-gd
make || return 1
make install_root=${startdir}/pkg install || return 1
-
+
rm -f ${startdir}/pkg/etc/ld.so.cache ${startdir}/pkg/etc/ld.so.conf ${startdir}/pkg/etc/localtime
rm -rf ${startdir}/pkg/usr/include/scsi
mkdir -p ${startdir}/pkg/etc/rc.d
@@ -88,6 +79,12 @@
sed -i -e 's/^\tserver-user/#\tserver-user/' ${startdir}/pkg/etc/nscd.conf || return 1
+ # remove timezones data files - provided now in a seperate pkg
+ rm -fv ${startdir}/pkg/usr/bin/tzselect
+ rm -fv ${startdir}/pkg/usr/man
+ rm -fv ${startdir}/pkg/usr/sbin/{zdump,zic}
+ rm -rfv ${startdir}/pkg/usr/share/zoneinfo
+
if [ "${CARCH}" = "x86_64" ]; then
# fix for the linker
sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${startdir}/pkg/usr/bin/ldd
Index: core/base/glibc/first_weekday.diff
diff -u core/base/glibc/first_weekday.diff:1.2 core/base/glibc/first_weekday.diff:1.3
--- core/base/glibc/first_weekday.diff:1.2 Sun May 20 09:01:55 2007
+++ core/base/glibc/first_weekday.diff Wed Oct 24 17:50:59 2007
@@ -423,28 +423,6 @@
END LC_TIME
LC_PAPER
-Index: localedata/locales/cs_CZ
-===================================================================
---- localedata/locales/cs_CZ.orig
-+++ localedata/locales/cs_CZ
-@@ -361,7 +361,7 @@
- % "<U004E><U006F><U0076>";/
- % "<U0044><U0065><U0063>"
-
--week 7;19971201;4
-+% week 7;19971201;4
-
- d_t_fmt "<U0025><U0061><U00A0><U0025><U0065><U002E><U00A0><U0025><U0042><U00A0><U0025><U0059><U002C><U00A0><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U00A0><U0025><U005A>"
-
-@@ -376,6 +376,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 2
-
- END LC_TIME
-
Index: localedata/locales/csb_PL
===================================================================
--- localedata/locales/csb_PL.orig
@@ -471,19 +449,6 @@
END LC_TIME
LC_MESSAGES
-Index: localedata/locales/da_DK
-===================================================================
---- localedata/locales/da_DK.orig
-+++ localedata/locales/da_DK
-@@ -214,6 +214,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
-
- LC_MESSAGES
Index: localedata/locales/de_AT
===================================================================
--- localedata/locales/de_AT.orig
@@ -523,28 +488,6 @@
END LC_TIME
LC_PAPER
-Index: localedata/locales/de_DE
-===================================================================
---- localedata/locales/de_DE.orig
-+++ localedata/locales/de_DE
-@@ -118,7 +118,7 @@
- "<U0044><U006F><U006E><U006E><U0065><U0072><U0073><U0074><U0061><U0067>";/
- "<U0046><U0072><U0065><U0069><U0074><U0061><U0067>";/
- "<U0053><U0061><U006D><U0073><U0074><U0061><U0067>"
--week 7;19971201;4
-+% week 7;19971201;4
- abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
- "<U004D><U00E4><U0072>";"<U0041><U0070><U0072>";/
- "<U004D><U0061><U0069>";"<U004A><U0075><U006E>";/
-@@ -153,6 +153,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0020>/
- <U0025><U0062><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>/
- <U0020><U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
-
- LC_MESSAGES
Index: localedata/locales/de_LU
===================================================================
--- localedata/locales/de_LU.orig
@@ -624,19 +567,6 @@
END LC_TIME
LC_MESSAGES
-Index: localedata/locales/en_GB
-===================================================================
---- localedata/locales/en_GB.orig
-+++ localedata/locales/en_GB
-@@ -121,6 +121,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
-
- LC_MESSAGES
Index: localedata/locales/en_HK
===================================================================
--- localedata/locales/en_HK.orig
@@ -715,28 +645,6 @@
END LC_TIME
-Index: localedata/locales/en_US
-===================================================================
---- localedata/locales/en_US.orig
-+++ localedata/locales/en_US
-@@ -81,7 +81,7 @@
- "<U0046><U0072><U0069><U0064><U0061><U0079>";/
- "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
-
--week 7;19971130;7
-+% week 7;19971130;7
- abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
- "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
- "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/
-@@ -125,6 +125,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 1
- END LC_TIME
-
- LC_MESSAGES
Index: localedata/locales/en_ZA
===================================================================
--- localedata/locales/en_ZA.orig
@@ -997,19 +905,6 @@
END LC_TIME
LC_PAPER
-Index: localedata/locales/et_EE
-===================================================================
---- localedata/locales/et_EE.orig
-+++ localedata/locales/et_EE
-@@ -177,6 +177,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
-
- LC_MESSAGES
Index: localedata/locales/eu_ES
===================================================================
--- localedata/locales/eu_ES.orig
@@ -1058,18 +953,6 @@
END LC_TIME
LC_PAPER
-Index: localedata/locales/fr_FR
-===================================================================
---- localedata/locales/fr_FR.orig
-+++ localedata/locales/fr_FR
-@@ -131,6 +131,7 @@
- <U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
- <U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
-+first_weekday 2
- END LC_TIME
-
- LC_PAPER
Index: localedata/locales/fr_LU
===================================================================
--- localedata/locales/fr_LU.orig
@@ -1223,21 +1106,6 @@
END LC_TIME
LC_PAPER
-Index: localedata/locales/hu_HU
-===================================================================
---- localedata/locales/hu_HU.orig
-+++ localedata/locales/hu_HU
-@@ -553,7 +553,9 @@
- t_fmt_ampm "<U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
- date_fmt "<U0025><U0059><U002E><U0020><U0025><U0062><U002E><U0020><U0025><U0065><U002E><U002C>/
- <U0020><U0025><U0041><U002C><U0020><U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U005A>"
--week 7;19971201;4
-+% week 7;19971201;4
-+% FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
-
- LC_PAPER
Index: localedata/locales/hy_AM
===================================================================
--- localedata/locales/hy_AM.orig
@@ -1502,19 +1370,6 @@
END LC_TIME
-Index: localedata/locales/nb_NO
-===================================================================
---- localedata/locales/nb_NO.orig
-+++ localedata/locales/nb_NO
-@@ -195,6 +195,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
-
- LC_MESSAGES
Index: localedata/locales/ne_NP
===================================================================
--- localedata/locales/ne_NP.orig
@@ -1554,19 +1409,6 @@
END LC_TIME
LC_PAPER
-Index: localedata/locales/nn_NO
-===================================================================
---- localedata/locales/nn_NO.orig
-+++ localedata/locales/nn_NO
-@@ -136,6 +136,8 @@
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+% FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
-
-
Index: localedata/locales/nr_ZA
===================================================================
--- localedata/locales/nr_ZA.orig
@@ -1694,22 +1536,6 @@
+first_weekday 7
END LC_TIME
%
-Index: localedata/locales/sk_SK
-===================================================================
---- localedata/locales/sk_SK.orig
-+++ localedata/locales/sk_SK
-@@ -183,7 +183,10 @@
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-
--week 7;19971201;4
-+% week 7;19971201;4
-+
-+% FIXME: found in CLDR
-+first_weekday 2
-
- END LC_TIME
-
Index: localedata/locales/sl_SI
===================================================================
--- localedata/locales/sl_SI.orig
@@ -1784,19 +1610,6 @@
END LC_TIME
-Index: localedata/locales/sr_CS
-===================================================================
---- localedata/locales/sr_CS.orig
-+++ localedata/locales/sr_CS
-@@ -304,7 +304,7 @@
- date_fmt "<U0025><U0061><U002C><U0020><U0025><U0065><U002E><U0020>/
- <U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
- <U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
--week 7;19971201;4
-+% week 7;19971201;4
- first_weekday 2
- first_workday 2
- END LC_TIME
Index: localedata/locales/ss_ZA
===================================================================
--- localedata/locales/ss_ZA.orig
Index: core/base/glibc/locale.gen
diff -u core/base/glibc/locale.gen:1.3 core/base/glibc/locale.gen:1.4
--- core/base/glibc/locale.gen:1.3 Fri Oct 27 16:22:22 2006
+++ core/base/glibc/locale.gen Wed Oct 24 17:50:59 2007
@@ -71,6 +71,8 @@
#be_BY.UTF-8 UTF-8
#be_BY CP1251
#be_BY at latin UTF-8
+#ber_DZ.UTF-8 UTF-8
+#ber_MA.UTF-8 UTF-8
#bg_BG.UTF-8 UTF-8
#bg_BG CP1251
#bn_BD UTF-8
@@ -132,6 +134,7 @@
#en_IE ISO-8859-1
#en_IE at euro ISO-8859-15
#en_IN UTF-8
+#en_NG UTF-8
#en_NZ.UTF-8 UTF-8
#en_NZ ISO-8859-1
#en_PH.UTF-8 UTF-8
@@ -195,6 +198,7 @@
#fi_FI.UTF-8 UTF-8
#fi_FI ISO-8859-1
#fi_FI at euro ISO-8859-15
+#fil_PH.UTF-8 UTF-8
#fo_FO.UTF-8 UTF-8
#fo_FO ISO-8859-1
#fr_BE.UTF-8 UTF-8
@@ -210,6 +214,8 @@
#fr_LU.UTF-8 UTF-8
#fr_LU ISO-8859-1
#fr_LU at euro ISO-8859-15
+#fur_IT.UTF-8 UTF-8
+#fy_DE UTF-8
#fy_NL UTF-8
#ga_IE.UTF-8 UTF-8
#ga_IE ISO-8859-1
@@ -226,6 +232,7 @@
#gu_IN UTF-8
#gv_GB.UTF-8 UTF-8
#gv_GB ISO-8859-1
+#ha_NG.UTF-8 UTF-8
#he_IL.UTF-8 UTF-8
#he_IL ISO-8859-8
#hi_IN UTF-8
@@ -239,6 +246,8 @@
#hy_AM.ARMSCII-8 ARMSCII-8
#id_ID.UTF-8 UTF-8
#id_ID ISO-8859-1
+#ig_NG.UTF-8 UTF-8
+#ik_CA.UTF-8 UTF-8
#is_IS.UTF-8 UTF-8
#is_IS ISO-8859-1
#it_CH.UTF-8 UTF-8
@@ -246,6 +255,7 @@
#it_IT.UTF-8 UTF-8
#it_IT ISO-8859-1
#it_IT at euro ISO-8859-15
+#iu_CA.UTF-8 UTF-8
#iw_IL.UTF-8 UTF-8
#iw_IL ISO-8859-8
#ja_JP.EUC-JP EUC-JP
@@ -267,6 +277,8 @@
#ky_KG UTF-8
#lg_UG.UTF-8 UTF-8
#lg_UG ISO-8859-10
+#li_BE.UTF-8 UTF-8
+#li_NL.UTF-8 UTF-8
#lo_LA UTF-8
#lt_LT.UTF-8 UTF-8
#lt_LT ISO-8859-13
@@ -287,6 +299,8 @@
#mt_MT ISO-8859-3
#nb_NO.UTF-8 UTF-8
#nb_NO ISO-8859-1
+#nds_DE UTF-8
+#nds_NL UTF-8
#ne_NP UTF-8
#nl_BE.UTF-8 UTF-8
#nl_BE ISO-8859-1
@@ -306,6 +320,7 @@
#or_IN UTF-8
#pa_IN UTF-8
#pa_PK UTF-8
+#pap_AN UTF-8
#pl_PL.UTF-8 UTF-8
#pl_PL ISO-8859-2
#pt_BR.UTF-8 UTF-8
@@ -321,6 +336,8 @@
#ru_UA.UTF-8 UTF-8
#ru_UA KOI8-U
#rw_RW UTF-8
+#sa_IN UTF-8
+#sc_IT UTF-8
#se_NO UTF-8
#si_LK UTF-8
#sid_ET UTF-8
@@ -357,6 +374,7 @@
#ti_ER UTF-8
#ti_ET UTF-8
#tig_ER UTF-8
+#tk_TM UTF-8
#tl_PH.UTF-8 UTF-8
#tl_PH ISO-8859-1
#tn_ZA UTF-8
@@ -366,6 +384,7 @@
#tr_TR ISO-8859-9
#ts_ZA UTF-8
#tt_RU.UTF-8 UTF-8
+#ug_CN UTF-8
#uk_UA.UTF-8 UTF-8
#uk_UA KOI8-U
#ur_PK UTF-8
@@ -381,6 +400,7 @@
#xh_ZA ISO-8859-1
#yi_US.UTF-8 UTF-8
#yi_US CP1255
+#yo_NG.UTF-8 UTF-8
#zh_CN.GB18030 GB18030
#zh_CN.GBK GBK
#zh_CN.UTF-8 UTF-8
Index: core/base/glibc/locales-fr.diff
diff -u core/base/glibc/locales-fr.diff:1.1 core/base/glibc/locales-fr.diff:1.2
--- core/base/glibc/locales-fr.diff:1.1 Sun Apr 8 08:36:33 2007
+++ core/base/glibc/locales-fr.diff Wed Oct 24 17:50:59 2007
@@ -195,31 +195,6 @@
END LC_IDENTIFICATION
-@@ -87,8 +88,8 @@
-
- LC_NUMERIC
- decimal_point "<U002C>"
--thousands_sep ""
--grouping 0;0
-+thousands_sep "<U0020>"
-+grouping 3;3
- END LC_NUMERIC
-
- LC_TIME
-@@ -126,9 +127,10 @@
- t_fmt "<U0025><U0054>"
- am_pm "";""
- t_fmt_ampm ""
--date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
--<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
--<U0025><U005A><U0020><U0025><U0059>"
-+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
-+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
-+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
- END LC_TIME
-
- LC_PAPER
@@ -151,6 +153,11 @@
LC_NAME
name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
More information about the arch-commits
mailing list