From 6311eef54789715bbb0334d8611ed65256f66cbaa163e637bb55433b0fdd8e53 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 4 Apr 2022 16:40:05 +0000 Subject: [PATCH 1/3] remove braces from rpmspec macros OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/unison?expand=0&rev=23 --- unison.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/unison.spec b/unison.spec index b02a509..747711e 100644 --- a/unison.spec +++ b/unison.spec @@ -25,11 +25,11 @@ License: GPL-3.0+ Group: Productivity/Networking/Other BuildRoot: %_tmppath/%name-%version-build URL: https://github.com/bcpierce00/unison -Source0: %{name}-%{version}.tar.xz +Source0: %name-%version.tar.xz #https://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html Source1: unison-2.48.4-manual.html -Source2: %{name}.desktop -Source3: %{name}.png +Source2: %name.desktop +Source3: %name.png BuildRequires: ocaml-lablgtk2-devel > 2.18.5 BuildRequires: ocaml-rpm-macros >= 20210409 BuildRequires: ocamlfind(findlib) @@ -54,22 +54,22 @@ replica to the other. make UISTYLE=gtk2 NATIVE=true %install -install -m 755 -D %{name} %{buildroot}%{_bindir}/%{name} -install -m 755 -D %{name}-fsmonitor %{buildroot}%{_bindir}/%{name}-fsmonitor -install -m 644 -D %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -m 755 -D %name %buildroot%_bindir/%name +install -m 755 -D %name-fsmonitor %buildroot%_bindir/%name-fsmonitor +install -m 644 -D %{SOURCE3} %buildroot%_datadir/pixmaps/%name.png install -m 644 %{SOURCE1} unison-manual.html %if %{defined suse_update_desktop_file} %suse_update_desktop_file -i %name Utility SyncUtility %else -install -m 644 -D %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.desktop +install -m 644 -D %{SOURCE2} %buildroot/%_datadir/applications/%name.desktop %endif %files %defattr(-,root,root,-) %doc COPYING NEWS README unison-manual.html -%{_datadir}/applications/* -%{_datadir}/pixmaps/* -%{_bindir}/%{name} -%{_bindir}/%{name}-fsmonitor +%_datadir/applications/* +%_datadir/pixmaps/* +%_bindir/%name +%_bindir/%name-fsmonitor %changelog From 50a9fa7905121959ef280cb6317741f8a83ea06b4e0c7cf58c1bf6c5d0a90070 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 4 Apr 2022 16:44:02 +0000 Subject: [PATCH 2/3] - Update to version 2.52.0 * wireprotocol is now independent from OCaml version * see included changelog for details - Build with dune - Provide unison-text binary OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/unison?expand=0&rev=24 --- _service | 61 ++++++++++++++++++++++++++++++++++++++++++-- unison-2.51.4.tar.xz | 3 --- unison-2.52.0.tar.xz | 3 +++ unison.changes | 9 +++++++ unison.png | 3 --- unison.spec | 30 +++++++++++++--------- 6 files changed, 89 insertions(+), 20 deletions(-) delete mode 100644 unison-2.51.4.tar.xz create mode 100644 unison-2.52.0.tar.xz delete mode 100644 unison.png diff --git a/_service b/_service index 0dc4f70..17b9e02 100644 --- a/_service +++ b/_service @@ -1,9 +1,66 @@ + .depend + .github + .gitignore + .travis.yml + Dockerfile + LICENSE + Makefile + README.md + doc + icons/.xvpics + icons/U.16x16x16m.png + icons/U.24x24x16m.png + icons/U.256x256x16m.png + icons/U.32x32x16.bmp + icons/U.32x32x16m.png + icons/U.32x32x256.bmp + icons/U.32x32x256.xpm + icons/U.48x48x16m.png + icons/U.ico + icons/Unison.gif + icons/Unison.xpm + icons/success.gif + icons/svg_to_data.ml + icons/unison-icon.ai + icons/unison-logo.gif + icons/unison.haruo.jpg + setup + src/.depend + src/CONTRIB + src/INSTALL.gtk2 + src/INSTALL.win32-cygwin-gnuc + src/INSTALL.win32-msvc + src/INSTALL.win32 + src/INSTALL + src/Makefile.OCaml + src/Makefile + src/README + src/ROADMAP.txt + src/TODO.txt + src/fsmonitor.py + src/fsmonitor/linux/Makefile + src/fsmonitor/solaris + src/fsmonitor/windows + src/lwt/META + src/lwt/Makefile + src/lwt/depend + src/lwt/example + src/lwt/win + src/system/system_win_stubs.c + src/system/win + src/ubase/META + src/ubase/Makefile + src/uimac + src/unison.hgr + src/win32rc + src/winmain.c + tests + unicode_utils unison - f29b364cad83c71f5620c0df3b9b0049b62d2d60 + 4ad8511150dee24e924f25247342b370e8b8b651 git - src disable https://github.com/bcpierce00/unison.git @PARENT_TAG@ diff --git a/unison-2.51.4.tar.xz b/unison-2.51.4.tar.xz deleted file mode 100644 index 82334b9..0000000 --- a/unison-2.51.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4e3f75471425b75d951a12f277be38d05ec10b75e3cbe9a7bc54785162a7d40 -size 486696 diff --git a/unison-2.52.0.tar.xz b/unison-2.52.0.tar.xz new file mode 100644 index 0000000..bc71994 --- /dev/null +++ b/unison-2.52.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3a71e6f2213be6c2e2afbb91c027f94a1dd6c49719a581fe356fa8d559d899b +size 349556 diff --git a/unison.changes b/unison.changes index 7d13a74..73391e2 100644 --- a/unison.changes +++ b/unison.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Apr 4 04:04:04 UTC 2022 - olaf@aepfle.de + +- Update to version 2.52.0 + * wireprotocol is now independent from OCaml version + * see included changelog for details +- Build with dune +- Provide unison-text binary + ------------------------------------------------------------------- Thu Jun 24 15:15:15 UTC 2021 - olaf@aepfle.de diff --git a/unison.png b/unison.png deleted file mode 100644 index daf0dc0..0000000 --- a/unison.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87234ff28f298784cdf2dbe7e7887806ff348d30e1a8e8db92849c7fbb7b8c7f -size 2586 diff --git a/unison.spec b/unison.spec index 747711e..cab9f6e 100644 --- a/unison.spec +++ b/unison.spec @@ -1,7 +1,7 @@ # # spec file for package unison # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: unison -Version: 2.51.4 +Version: 2.52.0 Release: 0 %{?ocaml_preserve_bytecode} Summary: File synchronization tool @@ -29,12 +29,11 @@ Source0: %name-%version.tar.xz #https://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html Source1: unison-2.48.4-manual.html Source2: %name.desktop -Source3: %name.png -BuildRequires: ocaml-lablgtk2-devel > 2.18.5 -BuildRequires: ocaml-rpm-macros >= 20210409 +BuildRequires: ocaml(ocaml_base_version) >= 4.08 +BuildRequires: ocaml-dune >= 2.3 +BuildRequires: ocaml-rpm-macros >= 20220222 BuildRequires: ocamlfind(findlib) -BuildRequires: ocamlfind(ppx_bin_prot) -BuildRequires: pkgconfig(gdk-2.0) +BuildRequires: ocamlfind(lablgtk2) BuildRequires: pkgconfig(ncursesw) %if 0%{?suse_version} > 0 BuildRequires: update-desktop-files @@ -51,12 +50,18 @@ replica to the other. %setup -q %build -make UISTYLE=gtk2 NATIVE=true +dune_release_pkgs='unison,unison-gui,unison-fsmonitor' +%ocaml_dune_setup +%ocaml_dune_build %install -install -m 755 -D %name %buildroot%_bindir/%name -install -m 755 -D %name-fsmonitor %buildroot%_bindir/%name-fsmonitor -install -m 644 -D %{SOURCE3} %buildroot%_datadir/pixmaps/%name.png +%ocaml_dune_install +%ocaml_create_file_list +rm -rfv %buildroot%ocaml_standard_library + +mv %buildroot%_bindir/%name %buildroot%_bindir/%name-text +mv %buildroot%_bindir/%name-gui %buildroot%_bindir/%name +install -m 644 -D icons/U.svg %buildroot%_datadir/pixmaps/%name.svg install -m 644 %{SOURCE1} unison-manual.html %if %{defined suse_update_desktop_file} %suse_update_desktop_file -i %name Utility SyncUtility @@ -66,10 +71,11 @@ install -m 644 -D %{SOURCE2} %buildroot/%_datadir/applications/%name.desktop %files %defattr(-,root,root,-) -%doc COPYING NEWS README unison-manual.html +%doc src/COPYING unison-manual.html %_datadir/applications/* %_datadir/pixmaps/* %_bindir/%name +%_bindir/%name-text %_bindir/%name-fsmonitor %changelog From 1e0a2e9b901debd5099b3d73e12c3c51f96b2d89b37de2cac09eda8338687156 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 5 Apr 2022 07:17:49 +0000 Subject: [PATCH 3/3] - Provide unison-text package OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/unison?expand=0&rev=25 --- unison.changes | 2 +- unison.spec | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/unison.changes b/unison.changes index 73391e2..dc06073 100644 --- a/unison.changes +++ b/unison.changes @@ -5,7 +5,7 @@ Mon Apr 4 04:04:04 UTC 2022 - olaf@aepfle.de * wireprotocol is now independent from OCaml version * see included changelog for details - Build with dune -- Provide unison-text binary +- Provide unison-text package ------------------------------------------------------------------- Thu Jun 24 15:15:15 UTC 2021 - olaf@aepfle.de diff --git a/unison.spec b/unison.spec index cab9f6e..fe2664f 100644 --- a/unison.spec +++ b/unison.spec @@ -40,6 +40,21 @@ BuildRequires: update-desktop-files %endif %description +Graphical userinterface for Unison. + +Unison is a file synchronization tool for Unix and Windows. It allows +two replicas of a collection of files and directories to be stored on +different hosts (or different disks on the same host), modified +separately, then brought up to date by propagating the changes in each +replica to the other. + +%package text +Summary: File synchronization tool +License: GPL-3.0+ +Group: Productivity/Networking/Other +%description text +Text based userinterface for Unison. + Unison is a file synchronization tool for Unix and Windows. It allows two replicas of a collection of files and directories to be stored on different hosts (or different disks on the same host), modified @@ -75,7 +90,11 @@ install -m 644 -D %{SOURCE2} %buildroot/%_datadir/applications/%name.desktop %_datadir/applications/* %_datadir/pixmaps/* %_bindir/%name -%_bindir/%name-text %_bindir/%name-fsmonitor +%files text +%defattr(-,root,root,-) +%doc src/COPYING +%_bindir/%name-text + %changelog