forked from pool/unison
This commit is contained in:
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
.osc
|
3989
unison-2.17.1-manual.html
Normal file
3989
unison-2.17.1-manual.html
Normal file
File diff suppressed because it is too large
Load Diff
3
unison-2.17.1.tar.gz
Normal file
3
unison-2.17.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:7a1173921237dd3e0ca758f4ba902a3d54eb04385a4450459f349a8846b7052c
|
||||||
|
size 415057
|
57
unison-windowout.diff
Normal file
57
unison-windowout.diff
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
Index: uigtk2.ml
|
||||||
|
===================================================================
|
||||||
|
--- uigtk2.ml (revision 184)
|
||||||
|
+++ uigtk2.ml (revision 185)
|
||||||
|
@@ -1118,10 +1118,9 @@
|
||||||
|
|
||||||
|
(* ------ *)
|
||||||
|
|
||||||
|
-let messageBox ~title ~parent ?(action = fun t -> t#destroy)
|
||||||
|
- ?(modal = false) message =
|
||||||
|
+let messageBox ~title ?(action = fun t -> t#destroy) ?(modal = false) message =
|
||||||
|
let utitle = transcode title in
|
||||||
|
- let t = GWindow.dialog ~title:utitle ~parent ~modal ~position:`CENTER () in
|
||||||
|
+ let t = GWindow.dialog ~title:utitle ~modal ~position:`CENTER () in
|
||||||
|
let t_dismiss = GButton.button ~stock:`CLOSE ~packing:t#action_area#add () in
|
||||||
|
t_dismiss#grab_default ();
|
||||||
|
ignore (t_dismiss#connect#clicked ~callback:(action t));
|
||||||
|
@@ -1156,7 +1155,7 @@
|
||||||
|
~selectable:true ~yalign:0. ~packing:v1#add ());
|
||||||
|
t#add_button_stock `CANCEL `NO;
|
||||||
|
let cmd () =
|
||||||
|
- messageBox ~title:"Details" ~parent:t ~modal:false longtext
|
||||||
|
+ messageBox ~title:"Details" ~modal:false longtext
|
||||||
|
in
|
||||||
|
t#add_button advLabel `HELP;
|
||||||
|
t#add_button_stock `APPLY `YES;
|
||||||
|
@@ -1381,10 +1380,11 @@
|
||||||
|
GBin.frame ~packing:(toplevelVBox#pack ~expand:false)
|
||||||
|
~shadow_type:`IN (*~hpolicy:`AUTOMATIC ~vpolicy:`NEVER*) () in
|
||||||
|
let hb =GPack.hbox ~packing:sw#add () in
|
||||||
|
- (GButton.button ~label:"View details..." ~packing:hb#add (),
|
||||||
|
+ (GButton.button ~label:"View details..." ~packing:(hb#pack ~expand:false) (),
|
||||||
|
GText.view ~editable:false ~wrap_mode:`NONE ~packing:hb#add ())
|
||||||
|
|
||||||
|
in
|
||||||
|
+ showDetailsButton#misc#set_sensitive false;
|
||||||
|
detailsWindow#misc#modify_font (Lazy.force fontMonospaceMediumPango);
|
||||||
|
detailsWindow#misc#set_size_chars ~height:3 ~width:104 ();
|
||||||
|
detailsWindow#misc#set_can_focus false;
|
||||||
|
@@ -1396,7 +1396,7 @@
|
||||||
|
(match !theState.(row).whatHappened with
|
||||||
|
Some (Util.Failed _, Some det) -> det
|
||||||
|
| _ -> "[No details available]") in
|
||||||
|
- messageBox ~title:"Merge execution details" ~parent:(getMyWindow ()) details
|
||||||
|
+ messageBox ~title:"Merge execution details" details
|
||||||
|
in
|
||||||
|
ignore (showDetailsButton#connect#clicked ~callback:showDetCommand);
|
||||||
|
|
||||||
|
@@ -2075,7 +2075,7 @@
|
||||||
|
Some i ->
|
||||||
|
getLock (fun () ->
|
||||||
|
Uicommon.showDiffs !theState.(i).ri
|
||||||
|
- (fun title text -> messageBox ~title ~parent:(getMyWindow ()) (transcode text))
|
||||||
|
+ (fun title text -> messageBox ~title (transcode text))
|
||||||
|
Trace.status (Uutil.File.ofLine i);
|
||||||
|
displayGlobalProgress 0.)
|
||||||
|
| None ->
|
105
unison.changes
Normal file
105
unison.changes
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 13 16:01:52 CET 2006 - mhopf@suse.de
|
||||||
|
|
||||||
|
- added patch for no longer closing main window if subwindows open
|
||||||
|
- removed unison-gtk1 again
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 6 22:55:50 CET 2006 - seife@suse.de
|
||||||
|
|
||||||
|
- add unison-gtk1, a binary compiled against lablgtk
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 25 17:08:31 CEST 2006 - mhopf@suse.de
|
||||||
|
|
||||||
|
- Update to version 2.17.1
|
||||||
|
- Completely rewritten backup function (actually working now)
|
||||||
|
- Ip V6 support
|
||||||
|
- Several bug fixes
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 21 02:11:42 CEST 2006 - seife@suse.de
|
||||||
|
|
||||||
|
- switch to GTK2 / lablgtk2
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 25 21:42:26 CET 2006 - mls@suse.de
|
||||||
|
|
||||||
|
- converted neededforbuild to BuildRequires
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 10 16:05:21 CEST 2005 - rommel@suse.de
|
||||||
|
|
||||||
|
- update to version 2.13.16 (includes all of our recent fixes)
|
||||||
|
- updated spec file, manual is available in html now
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 15 15:22:02 CET 2005 - ro@suse.de
|
||||||
|
|
||||||
|
- enable optimized compile on x86_64
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 15 01:18:01 CEST 2004 - ro@suse.de
|
||||||
|
|
||||||
|
- fix build with ocaml-3.08 (from unison-hackers ml)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jan 10 21:42:14 CET 2004 - adrian@suse.de
|
||||||
|
|
||||||
|
- build as user
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 15 17:00:41 CEST 2003 - adrian@suse.de
|
||||||
|
|
||||||
|
- add desktop file
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 22 11:59:27 CEST 2003 - rommel@suse.de
|
||||||
|
|
||||||
|
- fixed "invalid escape sequence" error messages
|
||||||
|
- fixed %install (not using make install anymore)
|
||||||
|
- compiling with thread support
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 7 01:35:49 CEST 2003 - ro@suse.de
|
||||||
|
|
||||||
|
- fix tail calling syntax
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jan 27 12:27:41 CET 2003 - rommel@suse.de
|
||||||
|
|
||||||
|
- replaced pdf file (unreadable) with ps file
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de
|
||||||
|
|
||||||
|
- removed bogus self-provides
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 28 00:46:29 CEST 2002 - ro@suse.de
|
||||||
|
|
||||||
|
- update to 2.9.1 makes it build with current ocaml
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 14 12:48:12 CEST 2001 - grimmer@suse.de
|
||||||
|
|
||||||
|
- Update to 2.7.7, which fixes the following bugs (since
|
||||||
|
2.7.1):
|
||||||
|
|
||||||
|
* Fixed a silly bug that would reliably prevent the Unison
|
||||||
|
client from starting in 2.7.4.
|
||||||
|
* Bug fix (2.7.4): read the initial connection header one byte
|
||||||
|
at a time, so that we don't block if the header is shorter
|
||||||
|
than expected.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 29 21:07:36 CEST 2001 - grimmer@suse.de
|
||||||
|
|
||||||
|
- Update to 2.7.1 (see the NEWS file for changes)
|
||||||
|
- updated PDF manual to latest version
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 16 17:26:58 CEST 2001 - grimmer@suse.de
|
||||||
|
|
||||||
|
- Initial package for SuSE Linux (version 2.6.59)
|
||||||
|
|
5
unison.desktop
Normal file
5
unison.desktop
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Exec=unison
|
||||||
|
Name=unison
|
||||||
|
|
122
unison.spec
Normal file
122
unison.spec
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
#
|
||||||
|
# spec file for package unison (Version 2.17.1)
|
||||||
|
#
|
||||||
|
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
# This file and all modifications and additions to the pristine
|
||||||
|
# package are under the same license as the package itself.
|
||||||
|
#
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
Name: unison
|
||||||
|
BuildRequires: gtk2-devel lablgtk2 update-desktop-files
|
||||||
|
License: GNU General Public License (GPL)
|
||||||
|
Group: Productivity/Networking/Other
|
||||||
|
Autoreqprov: on
|
||||||
|
Version: 2.17.1
|
||||||
|
Release: 23
|
||||||
|
Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}.tar.gz
|
||||||
|
Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html
|
||||||
|
Source2: %name.desktop
|
||||||
|
Patch0: unison-windowout.diff
|
||||||
|
URL: http://www.cis.upenn.edu/~bcpierce/unison
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
Summary: A file synchronization tool
|
||||||
|
|
||||||
|
%description
|
||||||
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
--------
|
||||||
|
Benjamin Pierce <bcpierce@cis.upenn.edu>
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch0
|
||||||
|
|
||||||
|
%build
|
||||||
|
%ifarch s390 s390x
|
||||||
|
make UISTYLE=gtk2 NATIVE=false THREADS=false
|
||||||
|
%else
|
||||||
|
make UISTYLE=gtk2 NATIVE=true THREADS=true
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%install
|
||||||
|
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||||
|
install -m 755 %name $RPM_BUILD_ROOT%{_bindir}
|
||||||
|
install -m 644 %{SOURCE1} unison-manual.html
|
||||||
|
%suse_update_desktop_file -i %name Utility SyncUtility
|
||||||
|
%ifarch s390 s390x
|
||||||
|
# do not strip non-optimized builds
|
||||||
|
export NO_BRP_STRIP_DEBUG=true
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT;
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt TODO.txt unison-manual.html
|
||||||
|
/usr/share/applications/*
|
||||||
|
%{_bindir}/%{name}
|
||||||
|
|
||||||
|
%changelog -n unison
|
||||||
|
* Wed Dec 13 2006 - mhopf@suse.de
|
||||||
|
- added patch for no longer closing main window if subwindows open
|
||||||
|
- removed unison-gtk1 again
|
||||||
|
* Wed Dec 06 2006 - seife@suse.de
|
||||||
|
- add unison-gtk1, a binary compiled against lablgtk
|
||||||
|
* Mon Sep 25 2006 - mhopf@suse.de
|
||||||
|
- Update to version 2.17.1
|
||||||
|
- Completely rewritten backup function (actually working now)
|
||||||
|
- Ip V6 support
|
||||||
|
- Several bug fixes
|
||||||
|
* Thu Sep 21 2006 - seife@suse.de
|
||||||
|
- switch to GTK2 / lablgtk2
|
||||||
|
* Wed Jan 25 2006 - mls@suse.de
|
||||||
|
- converted neededforbuild to BuildRequires
|
||||||
|
* Mon Oct 10 2005 - rommel@suse.de
|
||||||
|
- update to version 2.13.16 (includes all of our recent fixes)
|
||||||
|
- updated spec file, manual is available in html now
|
||||||
|
* Tue Mar 15 2005 - ro@suse.de
|
||||||
|
- enable optimized compile on x86_64
|
||||||
|
* Wed Sep 15 2004 - ro@suse.de
|
||||||
|
- fix build with ocaml-3.08 (from unison-hackers ml)
|
||||||
|
* Sat Jan 10 2004 - adrian@suse.de
|
||||||
|
- build as user
|
||||||
|
* Fri Aug 15 2003 - adrian@suse.de
|
||||||
|
- add desktop file
|
||||||
|
* Tue Jul 22 2003 - rommel@suse.de
|
||||||
|
- fixed "invalid escape sequence" error messages
|
||||||
|
- fixed %%install (not using make install anymore)
|
||||||
|
- compiling with thread support
|
||||||
|
* Wed May 07 2003 - ro@suse.de
|
||||||
|
- fix tail calling syntax
|
||||||
|
* Mon Jan 27 2003 - rommel@suse.de
|
||||||
|
- replaced pdf file (unreadable) with ps file
|
||||||
|
* Tue Sep 17 2002 - ro@suse.de
|
||||||
|
- removed bogus self-provides
|
||||||
|
* Tue May 28 2002 - ro@suse.de
|
||||||
|
- update to 2.9.1 makes it build with current ocaml
|
||||||
|
* Fri Sep 14 2001 - grimmer@suse.de
|
||||||
|
- Update to 2.7.7, which fixes the following bugs (since
|
||||||
|
2.7.1):
|
||||||
|
* Fixed a silly bug that would reliably prevent the Unison
|
||||||
|
client from starting in 2.7.4.
|
||||||
|
* Bug fix (2.7.4): read the initial connection header one byte
|
||||||
|
at a time, so that we don't block if the header is shorter
|
||||||
|
than expected.
|
||||||
|
* Wed Aug 29 2001 - grimmer@suse.de
|
||||||
|
- Update to 2.7.1 (see the NEWS file for changes)
|
||||||
|
- updated PDF manual to latest version
|
||||||
|
* Thu Aug 16 2001 - grimmer@suse.de
|
||||||
|
- Initial package for SuSE Linux (version 2.6.59)
|
Reference in New Issue
Block a user