diff --git a/_service b/_service
deleted file mode 100644
index da870dd..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.1+git
- https://github.com/dosfstools/dosfstools.git
- git
- .git*
- enable
- mcepl@cepl.eu
-
-
- *.tar
- gz
-
-
-
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index d9bb8e6..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- https://github.com/dosfstools/dosfstools.git
- 94437324edff576019a18748e35a6fbb8edec403
\ No newline at end of file
diff --git a/dosfstools-4.1+git.1610658652.9443732.tar.gz b/dosfstools-4.1+git.1610658652.9443732.tar.gz
deleted file mode 100644
index 0faee28..0000000
--- a/dosfstools-4.1+git.1610658652.9443732.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39bb38cb2ee6c05fcdf2be7ae57dde1e0fbca97fbef5412c3e38f8572f65ebfb
-size 155781
diff --git a/dosfstools-4.2.tar.gz b/dosfstools-4.2.tar.gz
new file mode 100644
index 0000000..a049728
--- /dev/null
+++ b/dosfstools-4.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527
+size 320917
diff --git a/dosfstools.changes b/dosfstools.changes
index 0831f4b..416999b 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 2 00:55:39 UTC 2021 - Dirk Müller
+
+- update to 4.2:
+ * mkfs.fat: Allow to specify disk geometry via new -g option
+ * fsck.fat: Add code for fixing first FAT cluster
+ * fatlabel: Do not call parts of fsck repair procedure
+ * Update warning message about lowercase labels
+ * mkfs.fat: Read geom_start from sysfs
+ * Add missing files into distribution tarball
+
-------------------------------------------------------------------
Fri Jan 15 06:13:07 UTC 2021 - mcepl@cepl.eu
diff --git a/dosfstools.spec b/dosfstools.spec
index 2fb21b4..8a64e14 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -17,26 +17,22 @@
Name: dosfstools
-Version: 4.1+git.1610658652.9443732
+Version: 4.2
Release: 0
Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux
License: GPL-3.0-or-later
Group: System/Filesystems
URL: https://github.com/dosfstools/dosfstools
-Source: dosfstools-%{version}.tar.gz
-# Source: https://github.com/dosfstools/dosfstools/releases/download/v%%{version}/dosfstools-%%{version}.tar.gz
+Source: https://github.com/dosfstools/dosfstools/releases/download/v%{version}/dosfstools-%{version}.tar.gz
# Source2: https://github.com/dosfstools/dosfstools/releases/download/v%%{version}/dosfstools-%%{version}.tar.gz.sig
# Source3: %%{name}.keyring
BuildRequires: pkgconfig
# xxd from vim is required for testsuite
BuildRequires: vim
BuildRequires: pkgconfig(libudev)
-# for ./autogen.sh
-BuildRequires: libtool
Supplements: filesystem(vfat)
Provides: dosfsck
Provides: mkdosfs
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The dosfstools package includes the mkdosfs and dosfsck utilities, which
@@ -45,13 +41,12 @@ floppies.
%prep
%setup -q
-./autogen.sh
%build
%configure \
--docdir=%{_docdir}/dosfstools \
--enable-compat-symlinks
-make %{?_smp_mflags} CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+%make_build CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
%install
%make_install
@@ -61,10 +56,9 @@ ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fs
%endif
%check
-make check
+%make_build check
%files
-%defattr(-,root,root)
%doc %{_docdir}/dosfstools
%if !0%{?usrmerged}
/sbin/*
@@ -79,15 +73,15 @@ make check
%{_sbindir}/mkfs.fat
%{_sbindir}/mkfs.msdos
%{_sbindir}/mkfs.vfat
-%{_mandir}/man8/dosfsck.8%{ext_man}
-%{_mandir}/man8/dosfslabel.8%{ext_man}
-%{_mandir}/man8/fatlabel.8%{ext_man}
-%{_mandir}/man8/fsck.fat.8%{ext_man}
-%{_mandir}/man8/fsck.msdos.8%{ext_man}
-%{_mandir}/man8/fsck.vfat.8%{ext_man}
-%{_mandir}/man8/mkdosfs.8%{ext_man}
-%{_mandir}/man8/mkfs.fat.8%{ext_man}
-%{_mandir}/man8/mkfs.msdos.8%{ext_man}
-%{_mandir}/man8/mkfs.vfat.8%{ext_man}
+%{_mandir}/man8/dosfsck.8%{?ext_man}
+%{_mandir}/man8/dosfslabel.8%{?ext_man}
+%{_mandir}/man8/fatlabel.8%{?ext_man}
+%{_mandir}/man8/fsck.fat.8%{?ext_man}
+%{_mandir}/man8/fsck.msdos.8%{?ext_man}
+%{_mandir}/man8/fsck.vfat.8%{?ext_man}
+%{_mandir}/man8/mkdosfs.8%{?ext_man}
+%{_mandir}/man8/mkfs.fat.8%{?ext_man}
+%{_mandir}/man8/mkfs.msdos.8%{?ext_man}
+%{_mandir}/man8/mkfs.vfat.8%{?ext_man}
%changelog