noarch -devel-doc

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 277a8cb873699c2bcbe09c42a722d1db5779eba3..dd2c4f4704d49755c68bd287def5520233bbb33f 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -41,7 +41,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       0.1
+Release:       3
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -58,7 +58,7 @@ Source7:      %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:                glibc-git.patch
-# Patch0-md5:  224851258daed34503d26c3273211624
+# Patch0-md5:  db84fc2f3b428f64896dde0c7b0d8856
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -93,7 +93,7 @@ Patch30:      glibc-rh1124987.patch
 Patch38:       1055_all_glibc-resolv-dynamic.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 %ifarch alpha
 BuildRequires: binutils >= 2:2.17.50.0.7
@@ -385,6 +385,14 @@ El antiguo módulo NYS NSS de glibc
 %description -n nss_compat -l pl.UTF-8
 Stary moduł NYS NSS glibc.
 
+%package -n nss_db
+Summary:       Berkeley DB NSS glibc module
+Group:         Base
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description -n nss_db
+Berkeley DB NSS glibc module.
+
 %package -n nss_dns
 Summary:       BIND NSS glibc module
 Summary(es.UTF-8):     Módulo BIND NSS de glibc
@@ -671,35 +679,10 @@ korzystające ze standardowych bibliotek C.
 Summary:       Documentation needed for development using standard C libraries
 Summary(pl.UTF-8):     Dokumentacja do tworzenia programów przy użyciu standardowych bibliotek C
 Group:         Documentation
-Provides:      %{name}-devel-doc(%{_target_cpu}) = %{epoch}:%{version}-%{release}
-%ifarch %{ix86}
-Provides:      %{name}-devel-doc(ix86) = %{epoch}:%{version}-%{release}
-%endif
-%ifarch %{x8664}
-# If both -m32 and -m64 is to be supported on x86_64, x86_64 package
-# have to be installed, not ix86 one.
-Obsoletes:     glibc-devel-doc(athlon)
-Obsoletes:     glibc-devel-doc(i386)
-Obsoletes:     glibc-devel-doc(i486)
-Obsoletes:     glibc-devel-doc(i586)
-Obsoletes:     glibc-devel-doc(i686)
-Obsoletes:     glibc-devel-doc(ix86)
-Obsoletes:     glibc-devel-doc(pentium3)
-Obsoletes:     glibc-devel-doc(pentium4)
-%endif
-%ifarch x32
-Obsoletes:     glibc-devel-doc(x86_64)
-%endif
-%ifarch ppc64
-Obsoletes:     glibc-devel-doc(ppc)
-%endif
-%ifarch s390x
-Obsoletes:     glibc-devel-doc(s390)
-%endif
-%ifarch sparc64
-Obsoletes:     glibc-devel-doc(sparc)
-%endif
 Conflicts:     man-pages < 4.00
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description devel-doc
 The glibc-devel-doc package contains info and manual pages necessary
@@ -1054,7 +1037,9 @@ env LANGUAGE=C LC_ALL=C \
 
 %if %{without cross}
 CC="%{__cc}"
-diet ${CC#*ccache } %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
+CC=${CC#*ccache }
+CC=${CC#%{_libdir}/ccache/}
+diet ${CC} %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
 %endif
 
 %install
@@ -1168,7 +1153,6 @@ done
 #
 # To be added when they become supported by glibc:
 #   ach    (vlc, libreport)
-#   ak     (gtkspell3)
 #   aln    (vlc, libreport)
 #   bal    (libosinfo, libreport, newt, pessulus)
 #   cgg    (vlc)
@@ -1190,6 +1174,7 @@ done
 #   pms    (deluge, mate-tweak)
 #   sco    (gnomad2, picard, stellarium, mate)
 #   son    (gtkspell3)
+#   su     (terminator)
 #   swg    (sim)
 #   syr    (iso-codes)
 #   tet    (vlc)
@@ -1204,6 +1189,7 @@ done
 #
 # Short forms (omitted country code, used instead of long form) for ambiguous or unclear cases:
 # aa=aa_ER
+# ak=ak_GH
 # anp=anp_IN
 # ar=common? (AE, BH, DZ, EG, IQ, JO, KW, LB, LY, MA, OM, QA, SA, SD, SY, TN, YE)
 # az=az_AZ
@@ -1253,7 +1239,7 @@ done
 #   be ca cs da de el en_GB es fi fr gl hr hu it ja ko nb nl pl pt_BR ru rw sk
 #   sv tr zh_CN zh_TW
 #
-for i in aa aa@saaho af am an ang anp ar ar_TN as ast az az_IR be@latin be@tarask bem \
+for i in aa aa@saaho af ak am an ang anp ar ar_TN as ast az az_IR be@latin be@tarask bem \
        bg bho bn bn_IN bo br brx bs byn ca@valencia ckb cmn crh csb cv cy de_AT de_CH doi dv dz en \
        en@boldquot en@quot en@shaw 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 \
@@ -1468,13 +1454,6 @@ fi
 %endif
 %dir %{_prefix}/lib/locale
 
-#%files -n nss_db
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/makedb
-%attr(755,root,root) /%{_lib}/libnss_db-%{core_version}.so
-%attr(755,root,root) /%{_lib}/libnss_db.so.2
-%{_var}/db/Makefile
-
 #%files -n nss_dns
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libnss_dns-%{core_version}.so
@@ -1791,6 +1770,13 @@ fi
 %attr(755,root,root) /%{_lib}/libnss_compat-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libnss_compat.so.2
 
+%files -n nss_db
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/makedb
+%attr(755,root,root) /%{_lib}/libnss_db-%{core_version}.so
+%attr(755,root,root) /%{_lib}/libnss_db.so.2
+%{_var}/db/Makefile
+
 %files -n nss_hesiod
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libnss_hesiod-%{core_version}.so