Compare commits

..

2 commits

Author SHA1 Message Date
Gregor Tätzner
5aff86f32d - Fix RBZ #813156 2012-06-07 08:18:10 +02:00
Richard W.M. Jones
fd714f80e7 Include fix for OCaml 3.12. 2012-06-07 08:06:05 +02:00
7 changed files with 269 additions and 1 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
unison-2.27.57.tar.gz

View file

@ -1 +0,0 @@
Orphaned for 6+ weeks

1
sources Normal file
View file

@ -0,0 +1 @@
4ba0a3e4bf4b4ad0c063f86391371f78 unison-2.27.57.tar.gz

BIN
unison.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 976 B

View file

@ -0,0 +1,23 @@
From: Stephane Glondu <steph@glondu.net>
Date: Sun, 3 Apr 2011 11:44:19 +0200
Subject: Fix bad interaction with OpenSSH 5.6
Origin: https://bugs.archlinux.org/task/20877
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620031
---
terminal.ml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/terminal.ml b/terminal.ml
index 657f3d2..aafa425 100644
--- a/terminal.ml
+++ b/terminal.ml
@@ -191,7 +191,6 @@ let create_session cmd args new_stdin new_stdout new_stderr =
exit 127
end
| childPid ->
- Unix.close slaveFd;
(Some masterFd, childPid)
end
--

11
unison227-ocaml312.patch Normal file
View file

@ -0,0 +1,11 @@
--- unison-2.27.57/update.mli.old 2012-01-16 14:08:18.784651309 +0000
+++ unison-2.27.57/update.mli 2012-01-16 14:08:35.414983940 +0000
@@ -1,7 +1,7 @@
(* Unison file synchronizer: src/update.mli *)
(* Copyright 1999-2007 (see COPYING for details) *)
-module NameMap : Map.S with type key = Name.t
+module NameMap : MyMap.S with type key = Name.t
type archive =
ArchiveDir of Props.t * archive NameMap.t

233
unison227.spec Normal file
View file

@ -0,0 +1,233 @@
# These is the exact upstream version we are packaging
%define ver_maj 2
%define ver_min 27
%define ver_patch 57
# 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
%define ver_compat %{ver_maj}.%{ver_min}
%define ver_compat_name %{ver_maj}%{ver_min}
%define 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.
%define 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.
%define provide_unison 1
Name: unison%{ver_compat_name}
Version: %{ver_compat}%{ver_noncompat}
Release: 16%{?dist}
Summary: Multi-master File synchronization tool
Group: Applications/File
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
ExcludeArch: sparc64 s390 s390x
# Fix for OCaml 3.12.
Patch0: %{name}-ocaml312.patch
# RBZ #813156
Patch1: %{name}-Fix-bad-interaction-with-OpenSSH-5.6.patch
BuildRequires: ocaml
BuildRequires: ocaml-lablgtk-devel
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}
%patch0 -p1
%patch1 -p1
%build
make NATIVE=true UISTYLE=gtk2
%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 <<EOF
[Desktop Entry]
Type=Application
Exec=unison-%{ver_compat}
Name=Unison File Synchronizer (version %{ver_compat})
GenericName=File Synchronizer
Comment=Multi-master File synchronization tool
Terminal=false
Icon=unison-%{ver_compat}
Encoding=UTF-8
StartupNotify=true
Categories=Utility;
EOF
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
unison-%{ver_compat}.desktop
%posttrans
alternatives \
--install \
%{_bindir}/unison \
unison \
%{_bindir}/unison-%{ver_compat} \
%{ver_priority}
# Clean up after previous package version's incorrect alternatives usage.
alternatives --remove unison-icon \
%{_datadir}/pixmaps/unison-%{ver_compat}.png || :
alternatives --remove unison-desktop \
%{_datadir}/applications/fedora-unison-%{ver_compat}.desktop || :
%postun
if [ $1 -eq 0 ]; then
alternatives --remove unison \
%{_bindir}/unison-%{ver_compat}
fi
exit 0
%files
%doc COPYING NEWS README
%attr(0755, root, root) %{_bindir}/unison-%{ver_compat}
%{_datadir}/applications/unison-%{ver_compat}.desktop
%{_datadir}/pixmaps/unison-%{ver_compat}.png
%changelog
* Wed Jun 06 2012 Gregor Tätzner <brummbq@fedoraproject.org> - 2.27.57-16
- Include fix for RBZ 813156
- Spec file cleanup
* Mon Jan 16 2012 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-15
- Include fix for OCaml 3.12.
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
- 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 <rel-eng@lists.fedoraproject.org> - 2.27.57-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Jan 8 2009 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-11
- Add Requires: xorg-x11-fonts-misc
* Wed Nov 26 2008 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-10
- Rebuild for OCaml 3.11.0+rc1.
* Sat May 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-9
- Rebuild with OCaml 3.10.2-2 (fixes bz 441685, 445545).
* Sun Mar 30 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-8
- Don't use alternatives for desktop and icon files, to avoid duplicate
menu entries.
* Wed Mar 19 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-7
- 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 <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-6
- Rename package unison2.27 -> unison227 to match Fedora naming rules
- Automatically calculate ver_priority using the shell; easier maintenance
* Sat Mar 1 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-5
- Use Provides/Obsoletes to provide upgrade path, per:
http://fedoraproject.org/wiki/Packaging/NamingGuidelines
* Thu Feb 28 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-4
- Explicitly conflict with existing unison package
* Fri Feb 22 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-3
- Derived unison2.27 package from unison2.13 package
* Mon Feb 4 2008 Gerard Milmeister <gemi@bluewin.ch> - 2.27.57-2
- exclude arch ppc64
* Mon Feb 4 2008 Gerard Milmeister <gemi@bluewin.ch> - 2.27.57-1
- new release 2.27.57
* Tue Aug 29 2006 Gerard Milmeister <gemi@bluewin.ch> - 2.13.16-3
- Rebuild for FE6
* Tue Feb 28 2006 Gerard Milmeister <gemi@bluewin.ch> - 2.13.16-2
- Rebuild for Fedora Extras 5
* Thu Sep 1 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.13.16-1
- New Version 2.13.16
* Sun Jul 31 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.12.0-0
- New Version 2.12.0
* Fri May 27 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.10.2-7
- Bump and rebuild with new ocaml and new lablgtk
* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 2.10.2-6
- rebuild on all arches
* Mon May 16 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.10.2-5
- Patch: http://groups.yahoo.com/group/unison-users/message/3200
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
* Thu Feb 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.10.2-2
- BR gtk2-devel
- Added NEWS and README docs
* Sat Feb 12 2005 Gerard Milmeister <gemi@bluewin.ch> - 0:2.10.2-1
- New Version 2.10.2
* Wed Apr 28 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.74-0.fdr.1
- New Version 2.9.74
- Added icon
* Tue Jan 13 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.72-0.fdr.1
- New Version 2.9.72
* Tue Dec 9 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.70-0.fdr.2
- Changed Summary
- Added .desktop file
* Fri Oct 31 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.70-0.fdr.1
- First Fedora release