SHA256
1
0
forked from pool/util-linux
OBS User unknown
2008-02-15 00:43:38 +00:00
committed by Git OBS Bridge
parent 60df3e7dd4
commit 8921a1b038
13 changed files with 783 additions and 270 deletions

View File

@@ -1,5 +1,5 @@
#
# spec file for package util-linux (Version 2.13.0.1+git20071121)
# spec file for package util-linux (Version 2.13.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,6 +10,7 @@
# norootforbuild
Name: util-linux
BuildRequires: audit-devel gettext-devel libuuid-devel libvolume_id-devel ncurses-devel pam-devel zlib-devel
Url: http://kernel.org/pub/linux/utils/util-linux
@@ -20,8 +21,8 @@ PreReq: %install_info_prereq permissions
License: BSD 3-Clause; GPL v2 or later
Group: System/Base
AutoReqProv: on
Version: 2.13.0.1+git20071121
Release: 22
Version: 2.13.1
Release: 3
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
Source1: util-linux-2.13-rpmlintrc
@@ -46,28 +47,30 @@ Source28: mkzimage_cmdline.8
Source29: mkzimage_cmdline.c
Source30: README.largedisk
##
## util-linux
## util-linux patches
##
#
# add hostid
Patch1: util-linux-2.12-misc_utils_hostid.patch
# 104405 - mount -a doesn't work with hotpluggable devices
Patch2: util-linux-mount_opt_nofail.patch
# 176582 - If the user doesn't specify -t <fstype> mount.fstype will never be called
#TODO: check alternative upstream fix
#Patch96: util-linux-2.12r-mount_external_prog_on_guess.patch
# 160822 - fix for 153657
Patch3: util-linux-2.12r-fdisk_cyl.patch
# 241372 - remove legacy warnings from fdisk
Patch5: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
# 254437 - swapon should automatically reset the suspend signature
# TODO: Needs to be ported to new version
Patch38: util-linux-2.12r-mount_swapon_swsuspend_resume.patch
Patch4: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
# 304861 - support password hashing and key length
Patch10: util-linux-mount_losetup_crypto.patch
Patch11: util-linux-2.13-mount_fd_leak.patch
Patch12: util-linux-2.13-fdisk_cfdisk_ncursesw.patch
Patch13: util-linux-2.13-hwclock_rtc_wait_busy_tempfix.patch
Patch6: util-linux-2.13-fdisk_cfdisk_ncursesw.patch
# 338419
Patch7: util-linux-2.13-hwclock_rtc_wait_busy_tempfix.patch
# in upstream git, but not yet released
Patch8: util-linux-2.13.1-canonicalize_loopfile_name.patch
Patch9: util-linux-2.13.1-prevent_loop_mounting_the_same_file_twice.patch
Patch10: util-linux-2.13.1-mkfs.minix_add_sectorsize_check.patch
Patch11: util-linux-2.13.1-mkfs.minix_device_size_cleanup.patch
#
Patch12: util-linux-2.13.1-getfs_fix.patch
# 254437 - swapon should automatically reset the suspend signature
Patch13: util-linux-ng-2.13-swapon-swsuspend.patch
Patch20: util-linux-mount_losetup_crypto.patch
##
##
## adjtimex
@@ -105,12 +108,17 @@ Authors:
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch5 -p1
#%patch38 -p1
%patch4 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch20 -p1
#%patch38 -p1
#
cd adjtimex-*
%patch50 -p1
@@ -283,6 +291,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/linux{32,64}.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ia64.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/s390{,x}.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ppc{,32,64}.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/parisc{,32,64}.8
# arch dependent
%ifarch s390 s390x
rm -f $RPM_BUILD_ROOT/etc/fdprm
@@ -558,6 +567,11 @@ fi
#%endif
%changelog
* Wed Feb 13 2008 bg@suse.de
- don't try to package parisc*.8 manual pages
* Mon Feb 11 2008 mkoenig@suse.de
- update to version 2.13.1 again
- fix broken util-linux-2.13.1-getfs_fix.patch
* Sun Feb 10 2008 lrupp@suse.de
- revert to 2.13.0.1+git20071121
breaks current 'mount' call in Buildservice