SPECS: glibc.spec - package gconv-modules.cache - fix build with config.cache

glen glen at pld-linux.org
Mon Jan 5 17:15:40 CET 2009 

Author: glen                         Date: Mon Jan  5 16:15:40 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package gconv-modules.cache
- fix build with config.cache

---- Files affected:
SPECS:
   glibc.spec (1.800 -> 1.801) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.800 SPECS/glibc.spec:1.801
--- SPECS/glibc.spec:1.800	Fri Nov 28 18:09:41 2008
+++ SPECS/glibc.spec	Mon Jan  5 17:15:35 2009
@@ -34,7 +34,7 @@
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	2.9
-Release:	1
+Release:	2
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -76,6 +76,7 @@
 Patch22:	%{name}-with-stroke.patch
 Patch23:	%{name}-pt_pax.patch
 Patch24:	%{name}-fixes.patch
+Patch25:	%{name}-cv_gnu89_inline.patch
 URL:		http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
@@ -904,6 +905,7 @@
 %patch22 -p1
 %patch23 -p0
 %patch24 -p1
+%patch25 -p1
 
 # these would be copied to localedb-src
 rm -f localedata/locales/*{.orig,~}
@@ -1000,6 +1002,9 @@
 install $PICFILES				$RPM_BUILD_ROOT%{_libdir}
 install elf/soinit.os				$RPM_BUILD_ROOT%{_libdir}/soinit.o
 install elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
+
+# Include %{_libdir}/gconv/gconv-modules.cache
+./iconv/iconvconfig --nostdlib $RPM_BUILD_ROOT%{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
 cd ..
 
 %if %{without cross}
@@ -1016,7 +1021,7 @@
 ln -sf libbsd-compat.a		$RPM_BUILD_ROOT%{_libdir}/libbsd.a
 
 # make symlinks across top-level directories absolute
-for l in BrokenLocale anl cidn crypt dl m nsl resolv rt thread_db util ; do
+for l in BrokenLocale anl cidn crypt dl m nsl resolv rt thread_db util; do
 	test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
 	rm -f $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
 	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
@@ -1054,7 +1059,7 @@
 # Collect locale files and mark them with %%lang()
 rm -f glibc.lang
 echo '%defattr(644,root,root,755)' > glibc.lang
-for i in $RPM_BUILD_ROOT%{_datadir}/locale/* ; do
+for i in $RPM_BUILD_ROOT%{_datadir}/locale/*; do
 	if [ -d $i ]; then
 		lang=$(basename $i)
 		dir="${i#$RPM_BUILD_ROOT}"
@@ -1095,14 +1100,14 @@
 #   sv tr zh_CN zh_TW
 #
 for i in aa aa at saaho af am an ang ar ar_TN as ast az be at alternative be at latin \
-    bg bn bn_IN br bs byn crh csb cy de_AT de_CH dz en en at boldquot en at quot \
-    en_AU en_CA en_NZ en_US eo es_AR es_CL es_CO es_CR es_DO es_EC es_GT \
-    es_HN es_MX es_NI es_PA es_PE es_PR es_SV es_UY es_VE et eu fa fil fo \
-    fr_BE fr_CA fr_CH fur fy ga gd gez gu gv he hi hsb hy ia id ik is it_CH \
-    iu ka kk kl km kn ks ku kw ky lg li lo lt lv mai mg mi mk ml mn mr ms mt \
-    nds ne nl_BE nn nr nso oc om or pa pap ps pt rm ro sa sc se si sid sl so \
-    sq sr sr at Latn sr at ije sr at latin ss st sw ta te tg th ti tig tk tl tlh tn \
-    ts tt ug uk ur uz uz at cyrillic ve vi wa wal wo xh yi yo zh_HK zu ; do
+	bg bn bn_IN br bs byn crh csb cy de_AT de_CH dz en en at boldquot en at quot \
+	en_AU en_CA en_NZ en_US eo es_AR es_CL es_CO es_CR es_DO es_EC es_GT \
+	es_HN es_MX es_NI es_PA es_PE es_PR es_SV es_UY es_VE et eu fa fil fo \
+	fr_BE fr_CA fr_CH fur fy ga gd gez gu gv he hi hsb hy ia id ik is it_CH \
+	iu ka kk kl km kn ks ku kw ky lg li lo lt lv mai mg mi mk ml mn mr ms mt \
+	nds ne nl_BE nn nr nso oc om or pa pap ps pt rm ro sa sc se si sid sl so \
+	sq sr sr at Latn sr at ije sr at latin ss st sw ta te tg th ti tig tk tl tlh tn \
+	ts tt ug uk ur uz uz at cyrillic ve vi wa wal wo xh yi yo zh_HK zu; do
 	if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then
 		install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
 		# use lang() tags with ll_CC at variant (stripping charset and @quot|@boldquot)
@@ -1113,7 +1118,7 @@
 
 # LC_TIME category, used for localized date formats (at least by coreutils)
 for i in af be bg ca cs da de el es et eu fi fr ga gl hu it ja ko lt ms nb nl pl \
-    pt pt_BR ru rw sk sl sv tr uk vi zh_CN zh_TW ; do
+	pt pt_BR ru rw sk sl sv tr uk vi zh_CN zh_TW; do
 	if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i ]; then
 		echo "%lang($lang) %{_datadir}/locale/$i" >> glibc.lang
 	fi
@@ -1139,9 +1144,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
-# when %%postun is run
-
 %if %{without cross}
 %post	-p /sbin/postshell
 /sbin/glibc-postinst /%{_lib}/%{_host_cpu} /%{_lib}/tls
@@ -1608,6 +1610,7 @@
 %attr(755,root,root) %{_sbindir}/iconvconfig
 %dir %{_libdir}/gconv
 %{_libdir}/gconv/gconv-modules
+%verify(not md5 mtime size) %{_libdir}/gconv/gconv-modules.cache
 %attr(755,root,root) %{_libdir}/gconv/*.so
 
 %files static
@@ -1642,6 +1645,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.801  2009/01/05 16:15:35  glen
+- package gconv-modules.cache
+- fix build with config.cache
+
 Revision 1.800  2008/11/28 17:09:41  arekm
 - upstream fixes
 
@@ -2284,10 +2291,10 @@
 - tab.
 
 Revision 1.590.2.14  2005/07/10 18:38:03  pluto
-- %% files cleaned up, release .1.
+- % files cleaned up, release .1.
 
 Revision 1.590.2.13  2005/07/10 18:09:43  pluto
-- %%install updated.
+- %install updated.
 
 Revision 1.590.2.12  2005/07/10 17:13:00  pluto
 - BR autoconf.
@@ -2303,7 +2310,7 @@
 - nfy, dnt.
 
 Revision 1.590.2.10  2005/05/09 13:01:12  pluto
-- use %%{x8664} macro.
+- use %{x8664} macro.
 
 Revision 1.590.2.9  2005/05/09 12:53:19  pluto
 - release 0.2 for rebuild with new bugfixed gcc-4.0.1snap.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glibc.spec?r1=1.800&r2=1.801&f=u

More information about the pld-cvs-commit mailing list