dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 14:43:25 +00:00 · 2009-11-26 01:14:50 +00:00 · 2006-10-23 19:22:34 +00:00
5 changed files with 59 additions and 348 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/unison-2.54.0.tar.gz
+unison-2.10.2.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (unison-2.54.0.tar.gz) = 7d1fea12b11e7a4bf2a5dbd9064d3c5104ca21df88fae0ead098f1ec8b7b935abcc7cdff74799fd2d9f5b23cc06eaa7f262bb71270511fb9c2ff4aac74c7ff11
+a79bf5f4ebf2a1eaf15b1ac97f827374  unison-2.13.16.tar.gz
--- a/unison-gui.metainfo.xml
+++ b/unison-gui.metainfo.xml
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>unison</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.1-only AND LGPL-2.1-or-later</project_license>
-  <name>Unison</name>
-  <summary>File Synchronizer</summary>
-  <description>
-    <p>
-      Unison is a file-synchronization tool for POSIX-compliant systems
-      (e.g. *BSD, GNU/Linux, macOS) 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, and then brought
-      up to date by propagating the changes in each replica to the other.
-    </p>
-  </description>
-  <url type="homepage">https://github.com/bcpierce00/unison</url>
-</component>
--- a/unison.png
+++ b/unison.png
--- a/unison.spec
+++ b/unison.spec
@ -1,344 +1,73 @@
-%bcond doc 1
-%bcond gtk 1
-
-%ifarch %{ocaml_native_compiler}
-%global native true
-%else
-%global native false
-%endif
-
-# OCaml i686 support was dropped in OCaml 5 / Fedora 39.
-ExcludeArch:    %{ix86}
-
 Name:           unison
-Version:        2.54.0
-Release:        3%{?dist}
-Summary:        File Synchronizer
+Version:        2.13.16
+Release:	3%{?dist}

-%global         forgeurl https://github.com/bcpierce00/%{name}/
-%global         tag v%{version}
-%forgemeta
+Summary:        File-synchronization tool

-# LGPL-2.0-only
-#   src/ubase/myMap.ml{,i}
-#   src/ubase/uarg.ml{,i}
-# LGPL-2.1-only
-#   src/fsmonitor/inotify/inotify.ml{,i}
-#   src/fsmonitor/inotify/inotify_stubs.c
-#   src/hash_compat.c
-# LGPL-2.1-or-later
-#   src/lwt
-License:        GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.1-only AND LGPL-2.1-or-later
-URL:            %{forgeurl}
-Source0:        %{forgesource}
-Source1:        %{name}-gui.metainfo.xml
-
-BuildRequires:  ocaml
-BuildRequires:  ocaml-findlib
-
-%if %{with gtk}
+Group:          Applications/File
+License:        GPL
+URL:            http://www.cis.upenn.edu/~bcpierce/unison
+Source:         http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz
+Source1:        unison.png
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  ocaml >= 3.09.1, lablgtk >= 2.6.0, tetex-latex
 BuildRequires:  desktop-file-utils
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  libappstream-glib
-BuildRequires:  ocaml-lablgtk3-devel
-BuildRequires:  ocaml-cairo-devel
-%endif
-%if %{with doc}
-BuildRequires:  hevea
-BuildRequires:  lynx
-BuildRequires:  texlive-ec
-BuildRequires:  tex-latex
-%endif
-
-Provides:       bundled(ocaml-inotify)
+# for lablgtk
+BuildRequires:  gtk2-devel

 %description
-Unison is a file-synchronization tool for POSIX-compliant systems (e.g. *BSD,
-GNU/Linux, macOS) 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, and then brought up to date by propagating the
-changes in each replica to the other.
-
-%if %{with gtk}
-%package        gtk
-Summary:        Unison File Synchronizer GTK interface
-Requires:       hicolor-icon-theme
-%description    gtk
-%{summary}.
-%endif
-
-%if %{with doc}
-%package        doc
-Summary:        Unison File Synchronizer documentation
-BuildArch:      noarch
-%description    doc
-%{summary}.
-%endif
+Unison is a file-synchronization tool. 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, and then
+brought up to date by propagating the changes in each replica to the
+other.

 %prep
-%forgeautosetup
+%setup -q

 %build
-%make_build        \
-  NATIVE=%{native} \
-  tui              \
-  fsmonitor        \
-  manpage
-
-%if %{with gtk}
-%make_build        \
-  NATIVE=%{native} \
-  gui
-%endif
-
-%if %{with doc}
-%make_build        \
-  NATIVE=%{native} \
-  docs
-%endif
+make NATIVE=true UISTYLE=gtk2

 %install
-%make_install       \
-  NATIVE=%{native}  \
-  PREFIX=%{_prefix}
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp -f unison $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps

-%if %{with gtk}
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop
-install -Dpm0644 -t %{buildroot}%{_metainfodir} %{SOURCE1}
-%endif
+cat > unison.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Exec=unison
+Name=Unison File Synchronizer
+GenericName=File Synchronizer
+Comment=Replicate files over different hosts or disks
+Terminal=false
+Icon=unison.png
+Encoding=UTF-8
+StartupNotify=true
+EOF

-%if %{with doc}
-install -Dpm0644 -t %{buildroot}%{_docdir}/%{name} doc/%{name}-manual.{html,pdf,txt}
-%endif
+desktop-file-install --vendor fedora \
+    --add-category X-Fedora-Extra \
+    --add-category Application \
+    --add-category Accessories \
+    --add-category Utility \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    unison.desktop

-%check
-make test          \
-  NATIVE=%{native}
-%if %{with gtk}
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-gui.metainfo.xml
-%endif
+%clean
+rm -rf $RPM_BUILD_ROOT

 %files
-%doc NEWS.md README.md
-%license LICENSE
-%{_bindir}/%{name}
-%{_bindir}/%{name}-fsmonitor
-%{_mandir}/man1/%{name}.1*
-
-%if %{with gtk}
-%files          gtk
-%license LICENSE
-%{_bindir}/%{name}-gui
-%{_datadir}/applications/%{name}-gui.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}-gui.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}-gui.svg
-%{_metainfodir}/%{name}-gui.metainfo.xml
-%endif
-
-%if %{with doc}
-%files          doc
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/%{name}-manual.{html,pdf,txt}
-%endif
+%defattr(-,root,root,-)
+%doc COPYING NEWS README
+#%doc doc/unison-manual.pdf
+%{_bindir}/*
+%{_datadir}/applications/*
+%{_datadir}/pixmaps/*

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.54.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Thu Jul 09 2026 Jerry James <loganjerry@gmail.com> - 2.54.0-2
- OCaml 5.5.0 rebuild
-
-* Sun May 24 2026 Matthew Krupcale  <mkrupcale@gmail.com> - 2.54.0-1
- Update to v2.54.0
-
-* Fri Feb 20 2026 Richard W.M. Jones <rjones@redhat.com> - 2.53.7-7
- Bump release and rebuild
-
-* Fri Feb 20 2026 Richard W.M. Jones <rjones@redhat.com> - 2.53.7-6
- OCaml 5.4.1 rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.53.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 2.53.7-4
- OCaml 5.4.0 rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.53.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sat Jul 12 2025 Jerry James <loganjerry@gmail.com> - 2.53.7-2
- Rebuild to fix OCaml dependencies
-
-* Sat Feb 22 2025 Matthew Krupcale <mkrupcale@gmail.com> - 2.53.7-1
- Update to v2.53.7
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.53.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jan  9 2025 Jerry James <loganjerry@gmail.com> - 2.53.5-4
- OCaml 5.3.0 rebuild for Fedora 42
-
-* Fri Sep 20 2024 Matthew Krupcale <mkrupcale@gmail.com> - 2.53.5-3
- Add package Requires for GDK Pixbuf XPM image loader module
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.53.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat May 18 2024 Matthew Krupcale <mkrupcale@gmail.com> - 2.53.5-1
- Re-package latest upstream v2.53.5
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-17
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu May 31 2018 Richard W.M. Jones <rjones@redhat.com> - 2.40.128-11
- Use unsafe-string with OCaml 4.06.
- Add small hack to keep it working with new lablgtk.
- Enable debugging.
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* 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.
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.128-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jan 05 2016 Richard Jones <rjones@redhat.com> - 2.40.128-3
- Use global instead of define.
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.40.128-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Jan 19 2015 Richard W.M. Jones <rjones@redhat.com> - 2.40.128-1
- New upstream version 2.40.128 (RHBZ#1178444).
- Remove missing documentation patch, now included upstream.
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.40.102-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.40.102-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Jan 01 2014 Rex Dieter <rdieter@fedoraproject.org> - 2.40.102-6
- own alternatives target
-
-* Mon Sep 09 2013 Gregor Tätzner <brummbq@fedoraproject.org> - 2.40.102-5
- ship 2 versions of unison: text only and gtk2 user interface
- move binaries into subpackages
- enable dependency generator
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.40.102-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.40.102-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Dec 14 2012 Richard W.M. Jones <rjones@redhat.com> - 2.40.102-2
- Rebuild for OCaml 4.00.1.
-
-* Thu Nov 15 2012 Gregor Tätzner <brummbq@fedoraproject.org> - 2.40.102-1
- 2.40.102
- fixes incompatibility between unison ocaml3 and ocaml4 builds
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.40.63-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jan 22 2012 Gregor Tätzner <brummbq@fedoraproject.com> - 2.40.63-6
- Patch built-in documentation.
-
-* Sat Jan 21 2012 Gregor Tätzner <brummbq@fedoraproject.org> - 2.40.63-5
- Add unison-manual.html.
-
-* Fri Jan 13 2012 Gregor Tätzner <brummbq@fedoraproject.org> - 2.40.63-4
- Remove ocaml minimum version.
- Add Requires and provides scripts.
-
-* Tue Sep 27 2011 Gregor Tätzner <brummbq@fedoraproject.org> - 2.40.63-3
- Remove vendor tag.
-
-* Sun Sep 04 2011 Gregor Tätzner <brummbq@fedoraproject.org> - 2.40.63-2
- Remove xorg-x11-font-utils Requirement.
- Enable THREADS=true.
-
-* Tue Aug 30 2011 Gregor Tätzner <brummbq@fedoraproject.org> - 2.40.63-1
- Version bump.
-
-* 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

@ -360,7 +89,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-gui.me
 * Mon May 16 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.10.2-5
 - Patch: http://groups.yahoo.com/group/unison-users/message/3200

-* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* 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
Author	SHA1	Message	Date
Fedora Release Engineering	a740a3e49d	dist-git conversion	2010-07-29 14:43:25 +00:00
Bill Nottingham	f25629a98a	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:14:50 +00:00
Jeremy Katz	4d4a5095a5	Initialize branch FC-6 for unison	2006-10-23 19:22:34 +00:00