New upstream release 2.48.4

.gitignore

@@ -1,3 +1,4 @@
 /unison-2.40.63.tar.gz
 /unison-2.40.102.tar.gz
 /unison-2.40.128.tar.gz
+/unison-2.48.4.tar.gz

unison248.spec

@@ -1,8 +1,8 @@
 
 # These is the exact upstream version we are packaging
 %global ver_maj 2
-%global ver_min 40
-%global ver_patch 128
+%global ver_min 48
+%global ver_patch 4
 
 # All Unison versions sharing ver_compat are compatible
 # Examples are 2.13.15 and 2.13.16 -> ver_compat == 2.13
@@ -24,7 +24,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   9%{?dist}
+Release:   1%{?dist}
 
 Summary:   Multi-master File synchronization tool
 
@@ -35,9 +35,6 @@ Source0:   http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{
 Source1:   unison.png
 Source2:   http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{ver_compat}%{ver_noncompat}/unison-%{ver_compat}%{ver_noncompat}-manual.html
 
-# Minor fix for compiling against OCaml 4.04.
-Patch1:    unison-2.40.128-ocaml-4.04.patch
-
 # can't make this noarch (rpmbuild fails about unpackaged debug files)
 # BuildArch:     noarch
 ExcludeArch:   sparc64 s390 s390x
@@ -74,7 +71,7 @@ Requires: %name = %{version}-%{release}
 Provides:   %{name}-ui = %{version}-%{release}
 
 # Enforce the switch from unison to unisonN.NN
-Obsoletes: unison < 2.27.57-3
+Obsoletes: unison < 2.40.128-4
 # Let users just install "unison" if they want
 %if 0%{?provide_unison}
 Provides: unison = %{version}-%{release}
@@ -97,9 +94,7 @@ This package provides the textual version of unison without graphical interface.
 
 
 %prep
-%setup -q -n unison-%{version}
-
-%patch1 -p1
+%setup -q -n src
 
 cat > %{name}.desktop <<EOF
 [Desktop Entry]
@@ -198,20 +193,8 @@ fi
 
 
 %changelog
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Feb 14 2017 Richard W.M. Jones <rjones@redhat.com> - 2.40.128-7
-- Small fix for compiling against OCaml 4.04 (RHBZ#1392152).
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 2.40.128-5
-- Rebuild for OCaml 4.04.0.
+* Mon Nov 28 2016 David Personette <dperson@gmail.com> - 2.48.4-1
+- New upstream version 2.48.4
 
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild