From aa4bd3401e31ca7dcc11d2aa6107738cbbae7310 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:18:22 +0000 Subject: [PATCH 1/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- unison213.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unison213.spec b/unison213.spec index 24a509b..fb92028 100644 --- a/unison213.spec +++ b/unison213.spec @@ -23,7 +23,7 @@ Name: unison%{ver_compat_name} Version: %{ver_compat}%{ver_noncompat} -Release: 39%{?dist} +Release: 40%{?dist} Summary: Multi-master File synchronization tool @@ -134,6 +134,9 @@ exit 0 %{_datadir}/pixmaps/unison-%{ver_compat}.png %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.13.16-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 2.13.16-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e44b01db0d276141450b5fa23b20d93155436cc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:32:55 +0000 Subject: [PATCH 2/3] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- unison213.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/unison213.spec b/unison213.spec index fb92028..c97a89b 100644 --- a/unison213.spec +++ b/unison213.spec @@ -23,7 +23,7 @@ Name: unison%{ver_compat_name} Version: %{ver_compat}%{ver_noncompat} -Release: 40%{?dist} +Release: 41%{?dist} Summary: Multi-master File synchronization tool @@ -134,6 +134,10 @@ exit 0 %{_datadir}/pixmaps/unison-%{ver_compat}.png %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.13.16-41 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.13.16-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e30d9429ce282b4bdca6ea70ace89e7a4bba90b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 11 Sep 2020 00:16:23 +0200 Subject: [PATCH 3/3] Orphaned for 6+ weeks --- .gitignore | 1 - dead.package | 1 + sources | 1 - unison.png | Bin 976 -> 0 bytes unison213-gtk.patch | 12 -- unison213-ocaml312.patch | 11 -- unison213-ocaml408.patch | 86 ----------- unison213.spec | 306 --------------------------------------- 8 files changed, 1 insertion(+), 417 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 unison.png delete mode 100644 unison213-gtk.patch delete mode 100644 unison213-ocaml312.patch delete mode 100644 unison213-ocaml408.patch delete mode 100644 unison213.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b049034..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -unison-2.13.16.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index bef788b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz diff --git a/unison.png b/unison.png deleted file mode 100644 index 22c623930119be892817fa99535048a7f586af22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 976 zcmW-fU1-j66vw~Mylpcq^VYPQD6P&iDKI{!cY#R!t}_F9tB7zOFV4 zAkD9E6o8xE`9YxIWaHZAmBI1|i_i#(08j4W7OvqE4mQohEKI{B47{rzYM~k`q2N>T z5DU=|2|*wN90%pSO3NT~xTC zf7{Hemo=~J@-1>^N^ea|M{8gC>@klIZ|V5Z6g_qM)xB$r$1VD|ZZNg9ecX-drC;-9 z4^sE%KPzfZU%J+ss;GXtdR-dVE1wl*CY_vh`AFG})IiewQ&iH~S~&ON=5)`O-0p&k z^KDZzFUNM|Dl13IJG - Unix.closedir dirh - end; -- Sort.list (<) !files -+ List.sort compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff -ur unison-2.13.16.old/Makefile.OCaml unison-2.13.16/Makefile.OCaml ---- unison-2.13.16.old/Makefile.OCaml 2005-06-27 18:38:25.000000000 +0100 -+++ unison-2.13.16/Makefile.OCaml 2019-07-28 10:40:10.726521640 +0100 -@@ -106,11 +106,7 @@ - else - EXEC_EXT= - # openpty is in the libutil library -- ifneq ($(OSARCH),solaris) -- ifneq ($(OSARCH),osx) -- CLIBS+=-cclib -lutil -- endif -- endif -+ CLIBS+=-cclib -lutil - buildexecutable:: - @echo Building for Unix - endif -@@ -330,7 +326,7 @@ - - $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS) - @echo Linking $@ -- $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^ -+ $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS) - - # Unfortunately -output-obj does not put .o files into the output, only .cmx - # files, so we have to use $(LD) to take care of COBJS. -diff -ur unison-2.13.16.old/pty.c unison-2.13.16/pty.c ---- unison-2.13.16.old/pty.c 2005-05-30 13:15:43.000000000 +0100 -+++ unison-2.13.16/pty.c 2019-07-28 10:33:49.185238442 +0100 -@@ -27,6 +27,7 @@ - - #ifdef HAS_OPENPTY - -+#include - #include - #include - -diff -ur unison-2.13.16.old/recon.ml unison-2.13.16/recon.ml ---- unison-2.13.16.old/recon.ml 2005-06-28 16:20:02.000000000 +0100 -+++ unison-2.13.16/recon.ml 2019-07-28 10:31:47.725676372 +0100 -@@ -388,8 +388,8 @@ - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ (fun (p1, _) (p2, _) -> Path.compare p1 p2) - pathUpdatesList - - let rec enterPath p t = -diff -ur unison-2.13.16.old/uicommon.ml unison-2.13.16/uicommon.ml ---- unison-2.13.16.old/uicommon.ml 2005-06-02 16:59:21.000000000 +0100 -+++ unison-2.13.16/uicommon.ml 2019-07-28 10:32:41.735926297 +0100 -@@ -292,7 +292,7 @@ - | c -> - buf.[!pos] <- c; pos := !pos + 1 - done; -- "{" ^ String.sub buf 0 !pos ^ "}" -+ "{" ^ Bytes.to_string (Bytes.sub buf 0 !pos) ^ "}" - - let ignorePath path = "Path " ^ quote (Path.toString path) - -diff -ur unison-2.13.16.old/uigtk2.ml unison-2.13.16/uigtk2.ml ---- unison-2.13.16.old/uigtk2.ml 2019-07-28 10:27:04.295009100 +0100 -+++ unison-2.13.16/uigtk2.ml 2019-07-28 10:33:09.816056231 +0100 -@@ -82,7 +82,7 @@ - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes (Bytes.of_string Pixmaps.icon_data)) (GdkPixbuf.get_pixels p); - p - - (********************************************************************* diff --git a/unison213.spec b/unison213.spec deleted file mode 100644 index c97a89b..0000000 --- a/unison213.spec +++ /dev/null @@ -1,306 +0,0 @@ -# These is the exact upstream version we are packaging -%global ver_maj 2 -%global ver_min 13 -%global ver_patch 16 - -# All Unison versions sharing ver_compat are compatible -# Examples are 2.13.15 and 2.13.16 -> ver_compat == 2.13 -# In older versions, even patch levels were not compatible -# Examples are ver_compat==2.9.0 and ver_compat==2.9.1 -%global ver_compat %{ver_maj}.%{ver_min} -%global ver_compat_name %{ver_maj}%{ver_min} -%global ver_noncompat .%{ver_patch} - -# ver_priority is the first component of ver_compat, catenated with the second -# component of ver_compat zero-filled to 3 digits, catenated with a final -# zero-filled 3-digit field. The final field contains the 3rd component of -# ver_compat (if there is one), otherwise 0. -%global ver_priority %(printf %%d%%03d%%03d `echo %{ver_compat}|sed 's/\\./ /g'`) - -# Is this package the unisonNNN package with the highest ${ver_compat} -# available in this Fedora branch/release? If so, we provide unison. -%global provide_unison 0 - -Name: unison%{ver_compat_name} -Version: %{ver_compat}%{ver_noncompat} -Release: 41%{?dist} - -Summary: Multi-master File synchronization tool - -License: GPL+ -URL: http://www.cis.upenn.edu/~bcpierce/unison -Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{version}/unison-%{version}.tar.gz -Source1: unison.png - -# Fix for OCaml 3.12. -Patch1: unison213-ocaml312.patch -# Small hack to get it working with newer lablgtk. -Patch2: unison213-gtk.patch -# Various changes for OCaml 4.08. -Patch3: unison213-ocaml408.patch - -BuildRequires: ocaml >= 3.10.2-2 -BuildRequires: ocaml-lablgtk-devel >= 2.6.0 -BuildRequires: tetex-latex -BuildRequires: desktop-file-utils -# for lablgtk -BuildRequires: gtk2-devel - -Requires: xorg-x11-fonts-misc -Requires(posttrans): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives - -# Enforce the switch from unison to unisonN.NN -Obsoletes: unison < 2.27.57-3 -# Let users just install "unison" if they want -%if 0%{?provide_unison} -Provides: unison = %{version}-%{release} -%endif - -%description -Unison is a multi-master file-synchronization tool. It allows two -replicas of a collection of files and directories to be stored on -different hosts (or different locations on the same host), modified -separately, and then brought up to date by propagating the changes -in each replica to the other. - -Note that this package contains Unison version %{ver_compat}, and -will never be upgraded to a different major version. Other packages -exist if you require a different major version. - -%prep -%setup -q -n unison-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -%build -make NATIVE=true UISTYLE=gtk2 OCAMLOPT="ocamlopt -unsafe-string -g" - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{_bindir} -cp -f unison %{buildroot}%{_bindir}/unison-%{ver_compat} -mkdir -p %{buildroot}%{_datadir}/pixmaps -cp -f %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/unison-%{ver_compat}.png - -cat > unison-%{ver_compat}.desktop < - 2.13.16-41 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.13.16-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.13.16-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.13.16-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.13.16-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.13.16-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu May 31 2018 Richard W.M. Jones - 2.13.16-35 -- Use unsafe-strings with OCaml 4.06. -- Small hack to keep it working with new lablgtk. -- Fix date in changelog. -- Enable debugging. - -* Fri Feb 09 2018 Fedora Release Engineering - 2.13.16-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.13.16-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.13.16-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.13.16-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Nov 09 2016 Dan Horák - 2.13.16-30 -- remove ExcludeArch - -* Sat Nov 05 2016 Richard W.M. Jones - 2.13.16-29 -- Rebuild for OCaml 4.04.0. - -* Fri Feb 05 2016 Fedora Release Engineering - 2.13.16-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 05 2016 Richard Jones - 2.13.16-27 -- Use global instead of define. - -* Fri Jun 19 2015 Fedora Release Engineering - 2.13.16-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 2.13.16-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.13.16-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.13.16-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Feb 23 2013 Toshio Kuratomi - 2.13.16-22 -- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077 - -* Fri Feb 15 2013 Fedora Release Engineering - 2.13.16-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Dec 14 2012 Richard W.M. Jones - 2.13.16-20 -- Rebuild for OCaml 4.00.1. - -* Sun Jul 22 2012 Fedora Release Engineering - 2.13.16-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jan 16 2012 Richard W.M. Jones - 2.13.16-18 -- Include fix for OCaml 3.12. - -* Sat Jan 14 2012 Fedora Release Engineering - 2.13.16-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 2.13.16-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jul 26 2009 Fedora Release Engineering - 2.13.16-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Apr 16 2009 S390x secondary arch maintainer -- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs - (added sparc64 per request from the sparc maintainer) - -* Wed Feb 25 2009 Fedora Release Engineering - 2.13.16-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 8 2009 Stephen Warren - 2.13.16-13 -- Add Requires: xorg-x11-fonts-misc - -* Wed Nov 26 2008 Richard W.M. Jones - 2.13.16-12 -- Rebuild for OCaml 3.11.0+rc1. - -* Mon May 26 2008 Stephen Warren - 2.13.16-11 -- Rebuild with OCaml 3.10.2-2 (fixes bz 441685, 445545). - -* Sun Mar 30 2008 Stephen Warren - 2.13.16-10 -- Don't use alternatives for desktop and icon files, to avoid duplicate - menu entries. - -* Wed Mar 19 2008 Stephen Warren - 2.13.16-9 -- Fix license to match correct interpretation of source & GPL -- Remove Excludes for ppc64, since ocaml is available there now, in devel - -* Sat Mar 15 2008 Stephen Warren - 2.13.16-8 -- Rename package unison2.13 -> unison213 to match Fedora naming rules -- Automatically calculate ver_priority using the shell; easier maintenance - -* Sat Mar 1 2008 Stephen Warren - 2.13.16-7 -- Use Provides/Obsoletes to provide upgrade path, per: - http://fedoraproject.org/wiki/Packaging/NamingGuidelines - -* Thu Feb 28 2008 Stephen Warren - 2.13.16-6 -- Explicitly conflict with existing unison package - -* Fri Feb 22 2008 Stephen Warren - 2.13.16-5 -- Use alternatives to provide /usr/bin/unison, and other cleanups - -* Thu Feb 21 2008 Stephen Warren - 2.13.16-4 -- Create 2.13 compatibility package - -* Tue Aug 29 2006 Gerard Milmeister - 2.13.16-3 -- Rebuild for FE6 - -* Tue Feb 28 2006 Gerard Milmeister - 2.13.16-2 -- Rebuild for Fedora Extras 5 - -* Thu Sep 1 2005 Gerard Milmeister - 2.13.16-1 -- New Version 2.13.16 - -* Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 -- New Version 2.12.0 - -* Fri May 27 2005 Toshio Kuratomi - 2.10.2-7 -- Bump and rebuild with new ocaml and new lablgtk - -* Sun May 22 2005 Jeremy Katz - 2.10.2-6 -- rebuild on all arches - -* Mon May 16 2005 Gerard Milmeister - 2.10.2-5 -- Patch: http://groups.yahoo.com/group/unison-users/message/3200 - -* Fri Apr 8 2005 Michael Schwendt -- rebuilt - -* Thu Feb 24 2005 Michael Schwendt - 0:2.10.2-2 -- BR gtk2-devel -- Added NEWS and README docs - -* Sat Feb 12 2005 Gerard Milmeister - 0:2.10.2-1 -- New Version 2.10.2 - -* Wed Apr 28 2004 Gerard Milmeister - 0:2.9.74-0.fdr.1 -- New Version 2.9.74 -- Added icon - -* Tue Jan 13 2004 Gerard Milmeister - 0:2.9.72-0.fdr.1 -- New Version 2.9.72 - -* Tue Dec 9 2003 Gerard Milmeister - 0:2.9.70-0.fdr.2 -- Changed Summary -- Added .desktop file - -* Fri Oct 31 2003 Gerard Milmeister - 0:2.9.70-0.fdr.1 -- First Fedora release