#
# Conditional build:
# _without_crypto - without kerneli cryptography
-# _with_pivot_root
-# _without_dist_kernel
+# _with_pivot_root - build pivot_root utility (auto-selected if 2.4 kernel)
+# _without_dist_kernel - do nothing for now
# _with_uClibc - don't build few utilities
#
# TODO:
%define _kernel24 %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
%if %{_kernel24}
%define _kernel_series 2.4
+%define _with_pivot_root 1
%else
%define _kernel_series 2.2
%endif
-%define _release 1
Summary: Collection of basic system utilities for Linux
Summary(de): Sammlung von grundlegenden Systemdienstprogrammen für Linux
Summary(tr): Temel sistem araçlarý
Summary(uk): îÁÂ¦Ò ÂÁÚÏ×ÉÈ ÓÉÓÔÅÍÎÉÈ ÕÔÉÌ¦Ô ÄÌÑ Linux
Name: util-linux
-Version: 2.11r
-Release: %{_release}
+Version: 2.11z
+%define _rel 1
+Release: %{_rel}
License: distributable
Group: Applications/System
Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/%{name}-%{version}.tar.gz
-Source1: %{name}-non-english-man-pages.tar.bz2
+# Source0-md5: c669467901c77a9a0e84f37cee477bbe
+Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
Source3: rawdevices.init
Source4: rawdevices.sysconfig
#based on: http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/%{name}-2.11n.patch.bz2
Patch12: %{name}-cryptoapi.patch
Patch13: %{name}-losetup-getpass.patch
-Patch14: %{name}-login-problems.patch
-Patch15: %{name}-posixsh.patch
-Patch16: %{name}-ppc-hwclock.patch
+Patch14: %{name}-posixsh.patch
+Patch15: %{name}-ppc-hwclock.patch
+Patch16: %{name}-sparctoo.patch
BuildRequires: gettext-devel
BuildRequires: grep
%{!?_with_uClibc:BuildRequires: ncurses-devel >= 5.0}
%{!?_with_uClibc:BuildRequires: pam-devel >= 0.66}
BuildRequires: texinfo
BuildRequires: textutils
+%{!?_with_uClibc:BuildRequires: zlib-devel}
%{!?_with_uClibc:Requires: pam >= 0.66}
Provides: fdisk
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: util-linux-suids
+Obsoletes: cramfs
%define debugcflags -O1 -g
Summary(ru): ðÒÏÇÒÁÍÍÙ ÄÌÑ ÎÁÓÔÒÏÊËÉ loopback-ÕÓÔÒÏÊÓÔ×
Summary(uk): ðÒÏÇÒÁÍÉ ÄÌÑ ËÏÎƦÇÕÒÁæ§ loopback-ÐÒÉÓÔÒϧ×
Group: Applications/System
-Release: %{_release}@%{_kernel_series}
+Release: %{_rel}@%{_kernel_series}
#%if %{_kernel24}
-#%{!?_without_dist_kernel:Requires: kernel >= 2.3.0}
+#%%{!?_without_dist_kernel:Requires: kernel >= 2.3.0}
#%else
-#%{!?_without_dist_kernel:Requires: kernel < 2.3.0}
+#%%{!?_without_dist_kernel:Requires: kernel < 2.3.0}
#%endif
%description -n losetup
%package -n mount
Summary: Programs for mounting and unmounting filesystems
Summary(de): Programme zum montieren und abmontieren von Dateisystemen
-Summary(fr): Programme pour monter et démonter des systèmes de fichiers.
+Summary(fr): Programme pour monter et démonter des systèmes de fichiers
Summary(pl): Programy do montowania i odmontowywania systemów plików
Summary(tr): Dosya sistemlerini baðlamak ve çözmek için programlar
Summary(uk): ðÒÏÇÒÁÍÉ ÄÌÑ ÍÏÎÔÕ×ÁÎÎÑ ÔÁ ÒÏÚÍÏÎÔÕ×ÁÎÎÑ ÆÁÊÌÏ×ÉÈ ÓÉÓÔÅÍ
Summary(ru): ðÒÏÇÒÁÍÍÙ ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ É ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ
Group: Applications/System
-Release: %{_release}@%{_kernel_series}
+Release: %{_rel}@%{_kernel_series}
#%if %{_kernel24}
-#%{!?_without_dist_kernel:Requires: kernel >= 2.3.0}
+#%%{!?_without_dist_kernel:Requires: kernel >= 2.3.0}
#%else
-#%{!?_without_dist_kernel:Requires: kernel < 2.3.0}
+#%%{!?_without_dist_kernel:Requires: kernel < 2.3.0}
#%endif
%description -n mount
%description -n rawdevices -l pl
Obs³uga raw-device'ów.
-%package BOOT
-Summary: util-linux for bootdisk
-Summary(pl): util-linux dla bootkietki
-Group: Applications/System
-
-%description BOOT
-util-linux for bootdisk.
-
-%description BOOT -l pl
-util-linux dla bootkietki.
-
%prep
%setup -q -a1
%patch0 -p1
%patch3 -p1
%patch4 -p1
%if %{_kernel24}
-%{!?_without_crypto:%patch12 -p0}
+%{!?_without_crypto:%patch12 -p1}
%else
%{!?_without_crypto:%patch5 -p1}
%endif
%if !%{_kernel24}
%{!?_without_crypto:%patch13 -p1}
%endif
-#%patch14 -p1
+%patch14 -p1
%patch15 -p1
%patch16 -p1
%build
-export CC="%{__cc}"
-export LDFLAGS="%{rpmldflags}"
-export CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+CC="%{__cc}"
+LDFLAGS="%{rpmldflags}"
+CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+export CC CFLAGS LDFLAGS
# using %%configure2_13 isn't very wise here, it is not autoconf generated
# configure and it doesn't take any parameters
./configure
-%if %{?BOOT:1}%{!?BOOT:0}
-%{__make} -C fdisk fdisk OPT="%{rpmcflags}" LDFLAGS="-static"
-mv -f fdisk/fdisk fdisk-BOOT
-%{__make} -C fdisk clean
-%endif
-
%{?_with_uClibc:echo 'char *nl_langinfo (nl_item x){return "";}' >> misc-utils/cal.c}
%{__make} OPT="%{rpmcflags}" \
MOREHELPDIR=%{_datadir}/misc \
%{!?_with_uClibc:ADD_RAW="yes"} \
- %{?_with_uClibc:ADD_RAW="no" HAVE_PAM="no"}
+ %{?_with_uClibc:HAVE_RAW_H="no" HAVE_PAM="no"}
%ifarch ppc
%{__cc} %{rpmcflags} %{rpmldflags} clock-ppc.c -o clock-ppc
%endif
-(cd sys-utils; makeinfo ipc.texi)
+cd sys-utils
+makeinfo ipc.texi
%install
rm -rf $RPM_BUILD_ROOT
-%if %{?BOOT:1}%{!?BOOT:0}
-install -d $RPM_BUILD_ROOT%{_libdir}/bootdisk/sbin
-install fdisk-BOOT $RPM_BUILD_ROOT%{_libdir}/bootdisk/sbin/fdisk
-%endif
-
install -d $RPM_BUILD_ROOT/{bin,sbin,etc/{pam.d,logrotate,rc.d/init.d,sysconfig}} \
$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_infodir},%{_datadir}/misc} \
$RPM_BUILD_ROOT{%{_examplesdir},%{_mandir}/man{1,5,6,8}}
USRGAMESDIR=$RPM_BUILD_ROOT%{_bindir} \
USE_TTY_GROUP=no \
%{!?_with_uClibc:ADD_RAW="yes"} \
- %{?_with_uClibc:ADD_RAW="no" HAVE_PAM="no"}
+ %{?_with_uClibc:HAVE_RAW_H="no" HAVE_PAM="no"}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/rawdevices
%ifarch ppc
mv -f $RPM_BUILD_ROOT/sbin/hwclock $RPM_BUILD_ROOT/sbin/hwclock.rtc
-install clock-ppc $RPM_BUILD_ROOT/sbin/hwclock
+install clock-ppc $RPM_BUILD_ROOT/sbin/hwclock.adb
+#yneed fix:
+# hwclock.adb is for PowerMac (default)
+# hwclock.rtc is for RS/6000 (PreP,CHRP)
+ln -sf hwclock.adb $RPM_BUILD_ROOT/sbin/hwclock
%endif
ln -sf hwclock $RPM_BUILD_ROOT/sbin/clock
done
done
-gzip -9nf */README.*
+# cleanup, remove files not included in package
+rm -f $RPM_BUILD_ROOT/%{_bindir}/{chfn,chsh,newgrp}
+rm -f $RPM_BUILD_ROOT/%{_sbindir}/vipw
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/chsh.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/newgrp.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/sln.8*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.8*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vipw.8*
+
%{!?_with_uClibc:%find_lang %{name}}
%files %{!?_with_uClibc:-f %{name}.lang}
%defattr(644,root,root,755)
-%doc */README.*
+%doc */README.* text-utils/LICENSE.pg
%attr(755,root,root) /sbin/clock
+%ifarch ppc
+%attr(755,root,root) %config(noreplace) /sbin/hwclock
+%attr(755,root,root) /sbin/hwclock.adb
+%attr(755,root,root) /sbin/hwclock.rtc
+%else
%attr(755,root,root) /sbin/hwclock*
+%endif
%{_mandir}/man8/clock.8*
%{_mandir}/man8/hwclock.8*
%attr(0755,root,root) %{_bindir}/script
%attr(0755,root,root) %{_bindir}/setsid
%attr(0755,root,root) %{_bindir}/setfdprm
+%{!?_with_uClibc:%attr(0755,root,root) %{_bindir}/pg}
+%attr(0755,root,root) %{_bindir}/line
+%attr(0755,root,root) %{_bindir}/rename
%{!?_with_uClibc:%attr(0755,root,root) %{_bindir}/setterm}
%{!?_with_uClibc:%attr(0755,root,root) %{_bindir}/ul}
%attr(0755,root,root) %{_bindir}/whereis
%{_mandir}/man1/getopt.1*
%{_mandir}/man1/hexdump.1*
%{_mandir}/man1/kill.1*
+%{_mandir}/man1/line.1*
%{_mandir}/man1/logger.1*
%{_mandir}/man1/look.1*
%{_mandir}/man1/mcookie.1*
%{!?_with_uClibc:%{_mandir}/man1/more.1*}
%{_mandir}/man1/namei.1*
+%{!?_with_uClibc:%{_mandir}/man1/pg.1*}
%{_mandir}/man1/readprofile.1*
%{_mandir}/man1/rev.1*
+%{_mandir}/man1/rename.1*
%{_mandir}/man1/script.1*
%{!?_with_uClibc:%{_mandir}/man1/setterm.1*}
%{!?_with_uClibc:%{_mandir}/man1/ul.1*}
%lang(ja) %{_mandir}/ja/man1/getopt.1*
%lang(ja) %{_mandir}/ja/man1/hexdump.1*
%lang(ja) %{_mandir}/ja/man1/kill.1*
+%lang(ja) %{_mandir}/ja/man1/line.1*
%lang(ja) %{_mandir}/ja/man1/logger.1*
%lang(ja) %{_mandir}/ja/man1/look.1*
%lang(ja) %{_mandir}/ja/man1/mcookie.1*
%lang(ja) %{_mandir}/ja/man1/more.1*
%lang(ja) %{_mandir}/ja/man1/namei.1*
%lang(ja) %{_mandir}/ja/man1/readprofile.1*
+%lang(ja) %{_mandir}/ja/man1/rename.1*
%lang(ja) %{_mandir}/ja/man1/rev.1*
%lang(ja) %{_mandir}/ja/man1/script.1*
%lang(ja) %{_mandir}/ja/man1/setterm.1*
%lang(pl) %{_mandir}/pl/man1/hexdump.1*
%lang(pl) %{_mandir}/pl/man1/kill.1*
%lang(pl) %{_mandir}/pl/man1/look.1*
+%lang(pl) %{_mandir}/pl/man1/logger.1*
%lang(pl) %{_mandir}/pl/man1/more.1*
%lang(pl) %{_mandir}/pl/man1/rev.1*
%lang(pl) %{_mandir}/pl/man1/script.1*
%dir %{_examplesdir}/getopt
%attr(755,root,root) %{_examplesdir}/getopt/*
-%{_datadir}/misc/more.help
%{!?_with_uClibc:%attr(755,root,root) /sbin/cfdisk}
%attr(755,root,root) /sbin/fdisk
%{_mandir}/man8/fdisk.8*
%{_mandir}/man8/sfdisk.8*
%{_mandir}/man8/fsck.minix.8*
+%{_mandir}/man8/mkfs.bfs.8*
%{_mandir}/man8/mkfs.minix.8*
%{_mandir}/man8/mkfs.8*
%lang(ja) %{_mandir}/ja/man8/fdisk.8*
%lang(ja) %{_mandir}/ja/man8/sfdisk.8*
%lang(ja) %{_mandir}/ja/man8/fsck.minix.8*
+%lang(ja) %{_mandir}/ja/man8/mkfs.bfs.8*
%lang(ja) %{_mandir}/ja/man8/mkfs.minix.8*
%lang(ja) %{_mandir}/ja/man8/mkfs.8*
%lang(pl) %{_mandir}/pl/man8/mkfs.minix.8*
%lang(pl) %{_mandir}/pl/man8/mkfs.8*
+%{!?_with_uClibc:%attr(755,root,root) /sbin/fsck.cramfs}
+%{!?_with_uClibc:%attr(755,root,root) /sbin/mkfs.cramfs}
+%attr(755,root,root) /sbin/mkfs.bfs
+
%attr(755,root,root) %{_bindir}/cytune
%ifarch %{ix86}
projects / packages / util-linux.git / blobdiff