View | Details | Raw Unified | Return to bug 6531
Collapse All | Expand All

(-)glibc.spec.orig (-3 / +12 lines)
Lines 47-53 Link Here
47
47
48
Name: glibc
48
Name: glibc
49
Version: %basever.%snapshot
49
Version: %basever.%snapshot
50
Release: alt2
50
Release: alt3
51
Serial: 6
51
Serial: 6
52
52
53
Summary: The GNU libc libraries
53
Summary: The GNU libc libraries
Lines 190-197 Link Here
190
PreReq: %name-core = %serial:%version-%release
190
PreReq: %name-core = %serial:%version-%release
191
Conflicts: %name < %serial:%version-%release
191
Conflicts: %name < %serial:%version-%release
192
# hack
192
# hack
193
%ifarch x86_64
194
Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "lib$n.so()(64bit) "; done)
195
Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "%_libdir/gconv/lib$n.so()(64bit) "; done)
196
%else
193
Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "lib$n.so "; done)
197
Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "lib$n.so "; done)
194
Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "%_libdir/gconv/lib$n.so "; done)
198
Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "%_libdir/gconv/lib$n.so "; done)
199
%endif
195
200
196
%package -n iconv
201
%package -n iconv
197
Summary: The GNU libc charset conversion modules
202
Summary: The GNU libc charset conversion modules
Lines 652-664 Link Here
652
	fgrep -v /%_lib/libnss1 |
657
	fgrep -v /%_lib/libnss1 |
653
	fgrep -v libNoVersion |
658
	fgrep -v libNoVersion |
654
	egrep -v '/%_lib/libnss_([^f]|files\.so\.1)' |
659
	egrep -v '/%_lib/libnss_([^f]|files\.so\.1)' |
655
	%__sed -e "s|$RPM_BUILD_ROOT/debug/lib|%_libdir/debug|g" >core-debug.files
660
	%__sed -e "s|$RPM_BUILD_ROOT/debug/%_lib|%_libdir/debug|g" >core-debug.files
656
661
657
/bin/ls -1 $RPM_BUILD_ROOT/debug/%_lib/*.so* |
662
/bin/ls -1 $RPM_BUILD_ROOT/debug/%_lib/*.so* |
658
	fgrep nss |
663
	fgrep nss |
659
	fgrep -v /%_lib/libnss_files-%basever.so |
664
	fgrep -v /%_lib/libnss_files-%basever.so |
660
	fgrep -v /%_lib/libnss_files.so.2 |
665
	fgrep -v /%_lib/libnss_files.so.2 |
661
	%__sed -e "s|$RPM_BUILD_ROOT/debug/lib|%_libdir/debug|g" >nss-debug.files
666
	%__sed -e "s|$RPM_BUILD_ROOT/debug/%_lib|%_libdir/debug|g" >nss-debug.files
662
667
663
/bin/ls -1 $RPM_BUILD_ROOT/debug%_libdir/lib*.so |
668
/bin/ls -1 $RPM_BUILD_ROOT/debug%_libdir/lib*.so |
664
	%__sed -e "s|$RPM_BUILD_ROOT/debug%_libdir|%_libdir/debug|g" >>devel-debug.files
669
	%__sed -e "s|$RPM_BUILD_ROOT/debug%_libdir|%_libdir/debug|g" >>devel-debug.files
Lines 983-988 Link Here
983
%endif #enabled archopt
988
%endif #enabled archopt
984
989
985
%changelog
990
%changelog
991
* Thu Apr 14 2005 Anton D. Kachalov <mouse@altlinux.org> 6:2.3.3.200406160000-alt3
992
- fix debug list
993
- fix hack for gconv-modules
994
986
* Tue Feb 08 2005 Dmitry V. Levin <ldv@altlinux.org> 6:2.3.3.200406160000-alt2
995
* Tue Feb 08 2005 Dmitry V. Levin <ldv@altlinux.org> 6:2.3.3.200406160000-alt2
987
- Backported upstream fixes:
996
- Backported upstream fixes:
988
  + i386/fpu/libm-test-ulps: Update for GCC 3.4.
997
  + i386/fpu/libm-test-ulps: Update for GCC 3.4.

Return to bug 6531