wok rev 670
Removed misc files + replace iso8859-15 by koi8 for Russian support
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed Apr 23 23:06:22 2008 +0200 (2008-04-23) |
| parents | 3f64a45a68c2 |
| children | c2f0c4bc32ae |
| files | geany/receipt glibc-base/stuff/locale-archive glibc-base/stuff/wanted-files.list glibc-locale/receipt libxml2-dev/receipt libxml2/receipt locale-cs/receipt locale-es/receipt locale-ru/receipt xorg-libX11/receipt |
line diff
1.1 --- a/geany/receipt Wed Apr 23 21:37:27 2008 +0200 1.2 +++ b/geany/receipt Wed Apr 23 23:06:22 2008 +0200 1.3 @@ -32,4 +32,5 @@ 1.4 cp -a $_pkg/usr/bin $fs/usr 1.5 cp -a $_pkg/usr/share/geany $fs/usr/share 1.6 cp -a stuff/filetype_extensions.conf $fs/usr/share/geany 1.7 + rm $fs/usr/share/geany/GPL-2 1.8 }
2.1 Binary file glibc-base/stuff/locale-archive has changed
3.1 --- a/glibc-base/stuff/wanted-files.list Wed Apr 23 21:37:27 2008 +0200 3.2 +++ b/glibc-base/stuff/wanted-files.list Wed Apr 23 23:06:22 2008 +0200 3.3 @@ -15,12 +15,13 @@ 3.4 3.5 /usr/lib/gconv/UNICODE.so 3.6 /usr/lib/gconv/gconv-modules 3.7 -/usr/lib/gconv/ISO8859-15.so 3.8 +/usr/lib/gconv/ANSI_X3.110.so 3.9 /usr/lib/gconv/ISO8859-1.so 3.10 -/usr/lib/gconv/ANSI_X3.110.so 3.11 /usr/lib/gconv/ISO8859-2.so 3.12 +/usr/lib/gconv/KOI8-RU.so 3.13 3.14 /usr/share/zoneinfo/Europe/Madrid 3.15 +/usr/share/zoneinfo/Europe/Moscow 3.16 /usr/share/zoneinfo/Europe/London 3.17 /usr/share/zoneinfo/Europe/Zurich 3.18 /usr/share/zoneinfo/Europe/Paris
4.1 --- a/glibc-locale/receipt Wed Apr 23 21:37:27 2008 +0200 4.2 +++ b/glibc-locale/receipt Wed Apr 23 23:06:22 2008 +0200 4.3 @@ -39,8 +39,8 @@ 4.4 # Rm files provided by locale-pack. 4.5 for i in cs es fr ru 4.6 do 4.7 + echo -n "* Removing locale: $i" 4.8 rm -rf $fs/usr/share/locale/$i 4.9 + status 4.10 done 4.11 - # Gconv files 4.12 - rm -f $fs/usr/lib/gconv/KOI8-RU.so 4.13 }
5.1 --- a/libxml2-dev/receipt Wed Apr 23 21:37:27 2008 +0200 5.2 +++ b/libxml2-dev/receipt Wed Apr 23 23:06:22 2008 +0200 5.3 @@ -11,9 +11,13 @@ 5.4 # Rules to gen a SliTaz package suitable for Tazpkg. 5.5 genpkg_rules() 5.6 { 5.7 - mkdir -p $fs/usr/lib $fs/usr/share 5.8 + mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/share 5.9 + 5.10 + cp -a $_pkg/usr/bin/xml2-config $fs/usr/bin 5.11 + cp -a $_pkg/usr/lib/*.sh $fs/usr/bin 5.12 + chmod +x $fs/usr/bin/*.sh 5.13 + 5.14 cp -a $_pkg/usr/lib/*.*a $fs/usr/lib 5.15 - cp -a $_pkg/usr/lib/*.sh $fs/usr/lib 5.16 cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib 5.17 cp -a $_pkg/usr/include $fs/usr 5.18 cp -a $_pkg/usr/share/aclocal $fs/usr/share
6.1 --- a/libxml2/receipt Wed Apr 23 21:37:27 2008 +0200 6.2 +++ b/libxml2/receipt Wed Apr 23 23:06:22 2008 +0200 6.3 @@ -17,8 +17,10 @@ 6.4 { 6.5 cd $src 6.6 ./configure \ 6.7 - --prefix=/usr --infodir=/usr/share/info \ 6.8 - --mandir=/usr/share/man --with-html-dir=/usr/share/doc 6.9 + --prefix=/usr \ 6.10 + --infodir=/usr/share/info \ 6.11 + --mandir=/usr/share/man \ 6.12 + --with-html-dir=/usr/share/doc 6.13 $CONFIGURE_ARGS 6.14 make 6.15 make DESTDIR=$PWD/_pkg install 6.16 @@ -30,6 +32,5 @@ 6.17 mkdir -p $fs/usr/lib 6.18 cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 6.19 cp -a $_pkg/usr/bin $fs/usr 6.20 - strip -s $fs/usr/lib/* 6.21 - strip -s $fs/usr/bin/* 2>/dev/null 6.22 + rm $fs/usr/bin/xml2-config 6.23 }
7.1 --- a/locale-cs/receipt Wed Apr 23 21:37:27 2008 +0200 7.2 +++ b/locale-cs/receipt Wed Apr 23 23:06:22 2008 +0200 7.3 @@ -10,18 +10,18 @@ 7.4 WEB_SITE="http://www.slitaz.org/" 7.5 SOURCES="glibc" 7.6 7.7 +CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" 7.8 + 7.9 LOCALE="cs" 7.10 LOCALEDEF="cs_CZ" 7.11 CHARMAP="ISO-8859-2" 7.12 -CORE_PKGS="geany gparted leafpad" 7.13 7.14 GLIBC_FILES=$WOK/glibc/glibc-2.7/_pkg 7.15 PKG_NAME="$PACKAGE" 7.16 PKG_VERS="$VERSION" 7.17 7.18 # Rules to gen a SliTaz package suitable for Tazpkg. 7.19 -# Install files in /usr/lib/locale. UTF-8: 7.20 -# localedef -i $LOCALEDEF -f UTF-8 $root/usr/lib/locale/$LOCALEDEF.utf8 7.21 +# Install files in /usr/lib/locale. 7.22 # 7.23 genpkg_rules() 7.24 { 7.25 @@ -38,7 +38,7 @@ 7.26 done 7.27 7.28 # Glibc locale. 7.29 - cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale 7.30 + #cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale 7.31 7.32 PACKAGE="$PKG_NAME" 7.33 VERSION="$PKG_VERS"
8.1 --- a/locale-es/receipt Wed Apr 23 21:37:27 2008 +0200 8.2 +++ b/locale-es/receipt Wed Apr 23 23:06:22 2008 +0200 8.3 @@ -9,18 +9,18 @@ 8.4 BUILD_DEPENDS="glibc glibc-locale" 8.5 WEB_SITE="http://www.slitaz.org/" 8.6 8.7 +CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" 8.8 + 8.9 LOCALE="es" 8.10 LOCALEDEF="es_ES" 8.11 CHARMAP="ISO-8859-1" 8.12 -CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" 8.13 8.14 GLIBC_FILES=$WOK/glibc/glibc-2.7/_pkg 8.15 PKG_NAME="$PACKAGE" 8.16 PKG_VERS="$VERSION" 8.17 8.18 # Rules to gen a SliTaz package suitable for Tazpkg. 8.19 -# Install files in /usr/lib/locale. UTF-8: 8.20 -# localedef -i $LOCALEDEF -f UTF-8 $root/usr/lib/locale/$LOCALEDEF.utf8 8.21 +# Install files in /usr/lib/locale. 8.22 # 8.23 genpkg_rules() 8.24 { 8.25 @@ -37,7 +37,7 @@ 8.26 done 8.27 8.28 # Glibc locale. 8.29 - cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale 8.30 + #cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale 8.31 8.32 PACKAGE="$PKG_NAME" 8.33 VERSION="$PKG_VERS"
9.1 --- a/locale-ru/receipt Wed Apr 23 21:37:27 2008 +0200 9.2 +++ b/locale-ru/receipt Wed Apr 23 23:06:22 2008 +0200 9.3 @@ -9,19 +9,18 @@ 9.4 BUILD_DEPENDS="glibc glibc-locale xorg-libX11" 9.5 WEB_SITE="http://www.slitaz.org/" 9.6 9.7 +CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" 9.8 + 9.9 LOCALE="ru" 9.10 LOCALEDEF="ru_RU" 9.11 CHARMAP="KOI8-RU" 9.12 -CORE_PKGS="asunder emelfm2 epdfview geany gparted leafpad xpad" 9.13 9.14 -LIBX11_VERSION="1.1.3" 9.15 GLIBC_FILES=$WOK/glibc/glibc-2.7/_pkg 9.16 PKG_NAME="$PACKAGE" 9.17 PKG_VERS="$VERSION" 9.18 9.19 # Rules to gen a SliTaz package suitable for Tazpkg. 9.20 -# Install files in /usr/lib/locale. UTF-8: 9.21 -# localedef -i $LOCALEDEF -f UTF-8 $root/usr/lib/locale/$LOCALEDEF.utf8 9.22 +# Install files in /usr/lib/locale. 9.23 # 9.24 genpkg_rules() 9.25 { 9.26 @@ -37,17 +36,8 @@ 9.27 fi 9.28 done 9.29 9.30 - # X11 locale. 9.31 - #mkdir -p $fs/usr/share/X11/locale 9.32 - #cp -a $WOK/xorg-libX11/libX11-$LIBX11_VERSION/_pkg/usr/share/X11/locale/iso8859-5 \ 9.33 - # $fs/usr/share/X11/locale 9.34 - 9.35 - # KOI8-RU gconv lib. 9.36 - mkdir -p $fs/usr/lib/gconv 9.37 - cp -a $GLIBC_FILES/usr/lib/gconv/$CHARMAP.so $fs/usr/lib/gconv 9.38 - 9.39 # Glibc locale. 9.40 - cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale 9.41 + #cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale 9.42 9.43 PACKAGE="$PKG_NAME" 9.44 VERSION="$PKG_VERS"
10.1 --- a/xorg-libX11/receipt Wed Apr 23 21:37:27 2008 +0200 10.2 +++ b/xorg-libX11/receipt Wed Apr 23 23:06:22 2008 +0200 10.3 @@ -6,7 +6,7 @@ 10.4 SHORT_DESC="X11 main client interface to X window system." 10.5 MAINTAINER="pankso@slitaz.org" 10.6 DEPENDS="xorg" 10.7 -BUILD_DEPENDS="xorg-dev-proto xorg-libXau" 10.8 +BUILD_DEPENDS="xorg-dev-proto xorg-libXau xtrans" 10.9 SOURCE="libX11" 10.10 TARBALL="$SOURCE-$VERSION.tar.gz" 10.11 WEB_SITE="http://www.x.org/" 10.12 @@ -31,15 +31,16 @@ 10.13 genpkg_rules() 10.14 { 10.15 mkdir -p $fs/usr/lib $fs/usr/share/X11/locale 10.16 + 10.17 cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 10.18 cp -a $_pkg/usr/lib/X11 $fs/usr/lib 10.19 cp -a $_pkg/usr/share/X11/*DB $fs/usr/share/X11 10.20 10.21 # X11 locale. 10.22 - cp -a $_pkg/usr/share/X11/locale/C $fs/usr/share/X11/locale 10.23 - cp -a $_pkg/usr/share/X11/locale/iso8859-1 $fs/usr/share/X11/locale 10.24 - cp -a $_pkg/usr/share/X11/locale/iso8859-2 $fs/usr/share/X11/locale 10.25 - cp -a $_pkg/usr/share/X11/locale/iso8859-15 $fs/usr/share/X11/locale 10.26 + for i in C iso8859-1 iso8859-2 koi8-r 10.27 + do 10.28 + cp -a $_pkg/usr/share/X11/locale/$i $fs/usr/share/X11/locale 10.29 + done 10.30 cp -a $_pkg/usr/share/X11/locale/*.dir $fs/usr/share/X11/locale 10.31 cp -a $_pkg/usr/share/X11/locale/*.alias $fs/usr/share/X11/locale 10.32 }