Accepting request 238783 from Base:System

- added fsck.{v,}fat and mkfs.{v,}fat compat symlinks in /sbin
  [bnc#884516]
- call spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/238783
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dosfstools?expand=0&rev=44
This commit is contained in:
Stephan Kulow 2014-07-01 05:05:14 +00:00 committed by Git OBS Bridge
commit 9127da0838
2 changed files with 21 additions and 15 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 26 12:11:27 UTC 2014 - pgajdos@suse.com
- added fsck.{v,}fat and mkfs.{v,}fat compat symlinks in /sbin
[bnc#884516]
- call spec-cleaner
-------------------------------------------------------------------
Mon Mar 17 08:21:51 UTC 2014 - pgajdos@suse.com

View File

@ -17,26 +17,25 @@
Name: dosfstools
Version: 3.0.26
Release: 0
Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux
License: GPL-3.0+
Group: System/Filesystems
Version: 3.0.26
Release: 0
Url: http://daniel-baumann.ch/software/dosfstools/
#Freecode-URL: http://freecode.com/projects/dosfstools
#Git-Clone: git://daniel-baumann.ch/git/software/dosfstools
Source: http://daniel-baumann.ch/files/software/dosfstools/%name-%version.tar.xz
Source2: http://daniel-baumann.ch/files/software/dosfstools/%name-%version.tar.xz.sig
Source3: %name.keyring
Source: http://daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.xz
Source2: http://daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.xz.sig
Source3: %{name}.keyring
Patch0: %{name}-suse-dirs.patch
Supplements: filesystem(vfat)
Provides: dosfsck
Provides: mkdosfs
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1230
BuildRequires: gpg-offline
%endif
Provides: dosfsck
Provides: mkdosfs
Supplements: filesystem(vfat)
%description
The dosfstools package includes the mkdosfs and dosfsck utilities,
@ -44,18 +43,18 @@ which respectively make and check MS-DOS FAT file systems on hard
drives or on floppies.
%prep
%{?gpg_verify: %gpg_verify %{S:2}}
%setup
%{?gpg_verify: %gpg_verify %{SOURCE2}}
%setup -q
%patch0 -p1
%build
make CC="%__cc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" %{?_smp_mflags}
make CC="gcc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE %{optflags}" %{?_smp_mflags}
%install
make install DESTDIR="%buildroot" SBINDIR=%{_sbindir}
make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir}
#UsrMerge
mkdir $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos} $RPM_BUILD_ROOT/sbin
mkdir %{buildroot}/sbin
ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fsck.vfat,mkfs.fat,mkfs.vfat} %{buildroot}/sbin
#EndUsrMerge
%files