Author: qboosh Date: Fri Oct 7 13:29:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged dl-execstack changes from AC-branch - merged devel split (-headers,-devel-utils,-devel-doc) from AC-branch - pl for new subpackages
---- Files affected: SPECS: glibc.spec (1.605 -> 1.606) ---- Diffs: ================================================================ Index: SPECS/glibc.spec diff -u SPECS/glibc.spec:1.605 SPECS/glibc.spec:1.606 --- SPECS/glibc.spec:1.605 Sun Oct 2 22:46:40 2005 +++ SPECS/glibc.spec Fri Oct 7 15:28:51 2005 @@ -17,6 +17,7 @@ %bcond_with tests_nptl # perform NPTL tests on dual build (requires 2.6.x kernel) %bcond_without localedb # don't build localedb-all (is time consuming) %bcond_with cross # build using crossgcc (without libgcc_eh) +%bcond_with pax # apply PaX hack # # TODO: # - look at locale fixes/updates in bugzilla @@ -103,6 +104,7 @@ Patch4: %{name}-linuxthreads-lock.patch Patch5: %{name}-pthread_create-manpage.patch Patch6: %{name}-paths.patch +Patch7: %{name}-dl-execstack.patch Patch8: %{name}-missing-nls.patch Patch9: %{name}-java-libc-wait.patch Patch10: %{name}-lthrds_noomit.patch @@ -125,11 +127,11 @@ Patch27: %{name}-execvp.patch Patch28: %{name}-sys-kd.patch Patch29: %{name}-cross-gcc_eh.patch -Patch30: %{name}-gcc4.patch -Patch31: %{name}-no_uint128_t.patch -# PaX hack (dropped) -#PatchX: %{name}-pax_dl-execstack.patch +Patch30: %{name}-pax_dl-execstack.patch +Patch31: %{name}-gcc4.patch +Patch32: %{name}-no_uint128_t.patch URL: http://www.gnu.org/software/libc/ +BuildRequires: autoconf BuildRequires: automake BuildRequires: binutils >= 2:2.15.90.0.3 BuildRequires: gcc >= 5:3.2 @@ -164,9 +166,9 @@ Conflicts: kernel < %{min_kernel} Conflicts: ld.so < 1.9.9-10 Conflicts: man-pages < 1.43 +Conflicts: poldek < 0.18.8-5 Conflicts: rc-scripts < 0.3.1-13 Conflicts: rpm < 4.1 -Conflicts: poldek < 0.18.8-4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define debugcflags -O1 -g @@ -324,9 +326,11 @@ Summary(uk): äĎÄÁÔËĎ׌ ÂŚÂĚŚĎÔĹËÉ, ĐĎÔŇŚÂÎŚ ÄĚŃ ËĎÍĐŚĚŃĂŚ§ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -%{!?with_kernelheaders:Requires: linux-libc-headers >= %{llh_version}} +Requires: %{name}-headers = %{epoch}:%{version}-%{release} +Requires: %{name}-devel-utils = %{epoch}:%{version}-%{release} +Requires: %{name}-devel-doc = %{epoch}:%{version}-%{release} +Provides: %{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release} Obsoletes: libiconv-devel -Obsoletes: glibc-headers %description devel To develop programs which use the standard C libraries (which nearly @@ -380,6 +384,115 @@ ÔÁ ĎÂ'¤ËÔÎŚ ĆÁĘĚÉ, ÝĎ ÍŚÓÔŃÔŘÓŃ × ĂŘĎÍŐ ĐÁËĹÔŚ, ĂĎ ÓÔ×ĎŇŔ×ÁÔÉ ×ÉËĎÎŐ×ÁÎŚ ĆÁĘĚÉ. +%package headers +Summary: Header files for development using standard C libraries +Summary(pl): Pliki nagłówkowe do tworzenia programów przy użyciu standardowych bibliotek C +Group: Development/Libraries +Provides: %{name}-headers(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{x8664} +# If both -m32 and -m64 is to be supported on AMD64, x86_64 package +# have to be installed, not ix86 one. +Obsoletes: %{name}-headers(i386) +Obsoletes: %{name}-headers(i486) +Obsoletes: %{name}-headers(i586) +Obsoletes: %{name}-headers(i686) +Obsoletes: %{name}-headers(athlon) +Obsoletes: %{name}-headers(pentium3) +Obsoletes: %{name}-headers(pentium4) +%endif +%{!?with_kernelheaders:Requires: linux-libc-headers >= %{llh_version}} + +%description headers +The glibc-headers package contains the header files necessary for +developing programs which use the standard C libraries (which are used +by nearly all programs). If you are developing programs which will use +the standard C libraries, your system needs to have these standard +header files available in order to create the executables. + +Install glibc-headers if you are going to develop programs which will +use the standard C libraries. + +%description headers -l pl +Pakiet glibc-headers zawiera pliki nagłówkowe niezbędne do rozwijania +programów używających standardowych bibliotek C (używanych przez +prawie wszystkie programy). Jeśli tworzymy programy korzystające ze +standardowych bibliotek C, system wymaga dostępności tych +standardowych plików nagłówkowych do tworzenia programów +wykonywalnych. + +Ten pakiet należy zainstalować jeśli zamierzamy tworzyć programy +korzystające ze standardowych bibliotek C. + +%package devel-utils +Summary: Utilities needed for development using standard C libraries +Summary(pl): Narzędzia do tworzenia programów przy użyciu standardowych bibliotek C +Group: Development/Libraries +Provides: %{name}-devel-utils(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{x8664} +# If both -m32 and -m64 is to be supported on AMD64, x86_64 package +# have to be installed, not ix86 one. +Obsoletes: %{name}-devel-utils(i386) +Obsoletes: %{name}-devel-utils(i486) +Obsoletes: %{name}-devel-utils(i586) +Obsoletes: %{name}-devel-utils(i686) +Obsoletes: %{name}-devel-utils(athlon) +Obsoletes: %{name}-devel-utils(pentium3) +Obsoletes: %{name}-devel-utils(pentium4) +%endif + +%description devel-utils +The glibc-devel-utils package contains utilities necessary for +developing programs which use the standard C libraries (which are used +by nearly all programs). If you are developing programs which will use +the standard C libraries, your system needs to have these utilities +available. + +Install glibc-devel-utils if you are going to develop programs which +will use the standard C libraries. + +%description devel-utils -l pl +Pakiet glibc-devel-utils zawiera narzędzia niezbędne do rozwijania +programów używających standardowych bibliotek C (używanych przez +prawie wszystkie programy). Jeśli tworzymy programy korzystające ze +standardowych bibliotek C, system wymaga dostępności tych +narzędzi do tworzenia programów wykonywalnych. + +Ten pakiet należy zainstalować jeśli zamierzamy tworzyć programy +korzystające ze standardowych bibliotek C. + +%package devel-doc +Summary: Documentation needed for development using standard C libraries +Summary(pl): Dokumentacja do tworzenia programów przy użyciu standardowych bibliotek C +Group: Documentation +Provides: %{name}-devel-doc(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{x8664} +# If both -m32 and -m64 is to be supported on AMD64, x86_64 package +# have to be installed, not ix86 one. +Obsoletes: %{name}-devel-doc(i386) +Obsoletes: %{name}-devel-doc(i486) +Obsoletes: %{name}-devel-doc(i586) +Obsoletes: %{name}-devel-doc(i686) +Obsoletes: %{name}-devel-doc(athlon) +Obsoletes: %{name}-devel-doc(pentium3) +Obsoletes: %{name}-devel-doc(pentium4) +%endif + +%description devel-doc +The glibc-devel-doc package contains info and manual pages necessary +for developing programs which use the standard C libraries (which are +used by nearly all programs). + +Install glibc-devel-doc if you are going to develop programs which +will use the standard C libraries. + +%description devel-doc -l pl +Pakiet glibc-devel-doc zawiera strony info i manuala przydatne do +rozwijania programów używających standardowych bibliotek C (używanych +przez prawie wszystkie programy). + +Ten pakiet należy zainstalować jeśli zamierzamy tworzyć programy +korzystające ze standardowych bibliotek C. + %package -n nscd Summary: Name Service Caching Daemon Summary(es): Demonio de caché del servicio de nombres @@ -781,6 +894,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -804,8 +918,9 @@ %patch27 -p1 %patch28 -p1 %{?with_cross:%patch29 -p1} -#%patch30 -p1 +%{?with_pax:%patch30 -p1} #%patch31 -p1 +#%patch32 -p1 chmod +x scripts/cpp @@ -962,6 +1077,32 @@ #done #cd - +# Where should s390 go? +%ifarch %{ix86} ppc s390 sparc sparcv9 +mv $RPM_BUILD_ROOT%{_includedir}/gnu/stubs.h $RPM_BUILD_ROOT%{_includedir}/gnu/stubs-32.h +%endif + +%ifarch %{x8664} ppc64 s390x sparc64 +mv $RPM_BUILD_ROOT%{_includedir}/gnu/stubs.h $RPM_BUILD_ROOT%{_includedir}/gnu/stubs-64.h +%endif + +%ifarch %{ix86} %{x8664} ppc ppc64 s390 s390x sparc sparcv9 sparc64 +cat <<EOF >$RPM_BUILD_ROOT%{_includedir}/gnu/stubs.h +/* This file selects the right generated file of '__stub_FUNCTION' macros + based on the architecture being compiled for. */ + +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +# include <gnu/stubs-32.h> +#elif __WORDSIZE == 64 +# include <gnu/stubs-64.h> +#else +# error "unexpected value for __WORDSIZE macro" +#endif +EOF +%endif + ln -sf %{_sysconfdir}/localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/localtime ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules @@ -1051,9 +1192,10 @@ # omitted here - already existing (with libc.mo): # be,ca,cs,da,de,el,en_GB,es,fi,fr,gl,hr,hu,it,ja,ko,nb,nl,pl,pt_BR,sk,sv,tr,zh_CN,zh_TW for i in af am ang ar az bg bn br bs cy de_AT en [EMAIL PROTECTED] [EMAIL PROTECTED] en_AU \ - en_CA en_US eo es_AR es_MX et eu fa fo ga gu he hi hsb ia id is it_CH ka kn ku \ - leet lg li lo lt lv mi mk ml mn mr ms mt nds ne nn nso or pa pt ro ru rw \ - se sl sq sr [EMAIL PROTECTED] [EMAIL PROTECTED] ss ta tg th tl tlh uk uz ve vi wa xh yi zu ; do + en_CA en_US eo es_AR es_MX et eu fa fo ga gu he hi hsb ia id is it_CH ka \ + kn ku leet lg li lo lt lv mi mk ml mn mr ms mt nds ne nn nso or pa pt ro \ + ru rw se sl sq sr [EMAIL PROTECTED] [EMAIL PROTECTED] ss ta tg th tl tlh uk uz ve vi wa xh yi \ + zu ; do if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES lang=`echo $i | sed -e 's/_.*//'` @@ -1339,11 +1481,6 @@ %files devel %defattr(644,root,root,755) -%doc documentation/* NOTES PROJECTS -%attr(755,root,root) %{_bindir}/gencat -%attr(755,root,root) %{_bindir}/*prof* -%attr(755,root,root) %{_bindir}/*trace - %attr(755,root,root) %{_libdir}/lib[!cmp]*.so %attr(755,root,root) %{_libdir}/libcrypt.so %attr(755,root,root) %{_libdir}/libm.so @@ -1367,16 +1504,21 @@ %{_libdir}/nptl/libc.so %{_libdir}/nptl/libpthread.so %{_libdir}/nptl/libpthread_nonshared.a -%{_includedir}/nptl %endif +%{_includedir}/gnu/stubs-*.h + +%files headers +%defattr(644,root,root,755) %{_includedir}/*.h %ifarch alpha %{_includedir}/alpha %endif %{_includedir}/arpa %{_includedir}/bits -%{_includedir}/gnu +%dir %{_includedir}/gnu +%{_includedir}/gnu/lib*.h +%{_includedir}/gnu/stubs.h %{_includedir}/net %{_includedir}/netash %{_includedir}/netatalk @@ -1394,6 +1536,20 @@ %{_includedir}/scsi %{_includedir}/sys +%if %{with dual} +%{_includedir}/nptl +%endif + +%files devel-utils +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gencat +%attr(755,root,root) %{_bindir}/*prof* +%attr(755,root,root) %{_bindir}/*trace + +%files devel-doc +%defattr(644,root,root,755) +%doc documentation/* NOTES PROJECTS + %{_infodir}/libc.info* %{_mandir}/man1/sprof.1* @@ -1493,6 +1649,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.606 2005/10/07 13:28:51 qboosh +- merged dl-execstack changes from AC-branch +- merged devel split (-headers,-devel-utils,-devel-doc) from AC-branch +- pl for new subpackages + Revision 1.605 2005/10/02 20:46:40 blues - reverted - tnx glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.605&r2=1.606&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit