Djam/glibc
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/glibc.git synced 2025-02-23 15:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop no longer needed Obsoletes

Browse source 
Minor spec cleanups
This commit is contained in:
Andrey Bondrov 2016-09-01 17:59:13 +10:00
parent 26d67b8fe1
commit a36bb6f4d6
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
glibc.spec
View file

@ -228,7 +228,7 @@ BuildRequires: gd-devel
BuildRequires: systemtap-devel
%endif
%if %{with nsscrypt}
BuildRequires: nss-devel >= 3.15.1-2
BuildRequires: pkgconfig(nss)
%endif
# we'll be the only package requiring this, avoiding any other package
# dependencies on '/bin/sh' or 'bash'
@ -242,9 +242,6 @@ Provides: rtld(GNU_HASH)
Provides: glibc-crypt_blowfish = %{crypt_bf_ver}
Provides: eglibc-crypt_blowfish = %{crypt_bf_ver}
Provides: should-restart = system
Obsoletes: glibc-profile
# Old prelink versions breaks the system with glibc 2.11
Conflicts: prelink < 1:0.4.2-1.20091104.1mdv2010.1
# Determine minimum kernel versions (rhbz#619538)
%define enablekernel 2.6.32
Conflicts: kernel < %{enablekernel}
@ -254,12 +251,10 @@ Conflicts: locales > %{EVRD}
# Don't try to explicitly provide GLIBC_PRIVATE versioned libraries
%define _filter_GLIBC_PRIVATE 1
Obsoletes: ld.so
Provides: ld.so
%rename ldconfig
Provides: /sbin/ldconfig
Obsoletes: nss_db
%description
The glibc package contains standard libraries which are used by
@ -566,16 +561,16 @@ If unsure if you need this, don't install this package.
########################################################################
%if %{with i18ndata}
#-----------------------------------------------------------------------
%package i18ndata
%package i18ndata
Summary: Database sources for 'locale'
Group: System/Libraries
%rename glibc-localedata
%description i18ndata
%description i18ndata
This package contains the data needed to build the locale data files
to use the internationalization features of the GNU libc.
%files i18ndata
%files i18ndata
%dir %{_datadir}/i18n
%dir %{_datadir}/i18n/charmaps
%{_datadir}/i18n/charmaps/*
@ -589,15 +584,14 @@ to use the internationalization features of the GNU libc.
########################################################################
%if %{with timezone}
#-----------------------------------------------------------------------
%package -n timezone
%package -n timezone
Summary: Time zone descriptions
Group: System/Base
Obsoletes: zoneinfo
%description -n timezone
%description -n timezone
These are configuration files that describe possible time zones.
%files -n timezone
%files -n timezone
%{_sbindir}/zdump
%{_sbindir}/zic
%{_mandir}/man1/zdump.1*