Author: sparky Date: Thu Feb 10 22:53:02 2011 GMT Module: packages Tag: HEAD ---- Log message: - util-linux name is back, no more -ng
---- Files affected: packages/util-linux: util-linux.spec (1.303 -> 1.304) ---- Diffs: ================================================================ Index: packages/util-linux/util-linux.spec diff -u packages/util-linux/util-linux.spec:1.303 packages/util-linux/util-linux.spec:1.304 --- packages/util-linux/util-linux.spec:1.303 Thu Feb 10 23:46:31 2011 +++ packages/util-linux/util-linux.spec Thu Feb 10 23:52:56 2011 @@ -27,28 +27,28 @@ Summary(ru.UTF-8): Набор базовых системных утилит для Linux Summary(tr.UTF-8): Temel sistem araçları Summary(uk.UTF-8): Набір базових системних утиліт для Linux -Name: util-linux-ng +Name: util-linux Version: 2.19 Release: 0.1 License: GPL Group: Applications/System -Source0: http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-%{version}.tar.bz2 +Source0: http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/%{name}-%{version}.tar.bz2 # Source0-md5: 590ca71aad0b254e2631d84401f28255 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/util-linux-non-english-man-pages.tar.bz2 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe Source2: login.pamd -Source3: util-linux-blockdev.init -Source4: util-linux-blockdev.sysconfig -Patch0: %{name}-ppc.patch -Patch1: %{name}-union-mount.patch -Patch2: util-linux-ctrlaltdel-man.patch -Patch3: util-linux-fdformat-ide.patch -Patch4: util-linux-fhs.patch -Patch5: util-linux-hotkeys.patch -Patch7: util-linux-login-lastlog.patch -Patch8: util-linux-procpartitions.patch -Patch9: util-linux-swaponsymlink.patch -Patch10: util-linux-diet.patch +Source3: %{name}-blockdev.init +Source4: %{name}-blockdev.sysconfig +Patch0: %{name}-ng-ppc.patch +Patch1: %{name}-ng-union-mount.patch +Patch2: %{name}-ctrlaltdel-man.patch +Patch3: %{name}-fdformat-ide.patch +Patch4: %{name}-fhs.patch +Patch5: %{name}-hotkeys.patch +Patch7: %{name}-login-lastlog.patch +Patch8: %{name}-procpartitions.patch +Patch9: %{name}-swaponsymlink.patch +Patch10: %{name}-diet.patch URL: http://userweb.kernel.org/~kzak/util-linux/ BuildRequires: audit-libs-devel >= 1.0.6 BuildRequires: autoconf @@ -82,7 +82,6 @@ Provides: fdisk Provides: linux32 Provides: sparc32 -Provides: util-linux = %{version}-%{release} Obsoletes: cramfs Obsoletes: ionice Obsoletes: linux32 @@ -90,7 +89,7 @@ Obsoletes: schedutils Obsoletes: setarch Obsoletes: sparc32 -Obsoletes: util-linux +Obsoletes: util-linux-ng <= %{version}-%{release} Obsoletes: util-linux-suids Conflicts: e2fsprogs < 1.41.8-5 Conflicts: shadow-extras < 1:4.0.3-6 @@ -316,8 +315,7 @@ Summary: chkdupexe - find duplicate executables Summary(pl.UTF-8): chkdupexe odszukuje powtarzające się pliki uruchamialne Group: Applications/System -Provides: util-linux-chkdupexe = %{version}-%{release} -Obsoletes: util-linux-chkdupexe +Obsoletes: util-linux-ng-chkdupexe %description chkdupexe chkdupexe will scan the union of $PATH and a hardcoded list of common @@ -601,6 +599,7 @@ Summary(pl.UTF-8): blkid - wersja dla initrd Group: Base Conflicts: geninitrd < 10000.10 +Obsoletes: util-linux-ng-initrd %description initrd This package includes a blkid utility to recognize partitions by label @@ -611,7 +610,7 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd. %prep -%setup -q -a1 -n util-linux-%{version} +%setup -q -a1 %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -760,7 +759,7 @@ %endif %endif -%find_lang util-linux +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT @@ -800,7 +799,7 @@ %post -n libmount -p /sbin/ldconfig %postun -n libmount -p /sbin/ldconfig -%files -f util-linux.lang +%files -f %{name}.lang %defattr(644,root,root,755) %doc */README.* text-utils/LICENSE.pg NEWS @@ -1406,6 +1405,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.304 2011/02/10 22:52:56 sparky +- util-linux name is back, no more -ng + Revision 1.303 2011/02/10 22:46:31 sparky - copied from util-linux-ng.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.303&r2=1.304&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
