Compare commits

..

5 commits

Author SHA1 Message Date
Matthew Krupcale
8069581216 epel10: remove doc BuildRequires hevea and lynx
hevea is not available on epel10, so remove the doc BuildRequires for
hevea. lynx is only invoked when hevea is found, so remove the doc BuildRequires
for lynx as well. This means that the HTML and text manual will not be built.

 * unison.spec: remove doc BuildRequires hevea and lynx
2025-07-26 13:18:21 -04:00
Matthew Krupcale
f028bcc004 Add doc BuildRequires for European Computer Modern Fonts
The tex-ec package for European Computer Modern Fonts is required for building
the LaTeX documentation, so add it to the doc BuildRequires.

 * unison.spec: add doc BuildRequires for European Computer Modern Fonts
2025-07-26 13:14:36 -04:00
Matthew Krupcale
c05d644f8b Update to v2.53.7
Update to latest upstream version 2.53.7. Also remove the package Requires:
gdk-pixbuf2-modules-extra from the gtk package because upstream unison since
version 2.53.6 no longer uses the deprecated GdkPixbuf.from_xpm_data.

 * .gitignore: ignore v2.53.7 source archive
 * sources: add v2.53.7 source archive hash
 * unison.spec:
   - update to v2.53.7
   - gtk: remove package Requires: gdk-pixbuf2-modules-extra
2025-07-26 13:14:32 -04:00
Matthew Krupcale
9b00b0f7c3 epel9: disable GTK packages until build dependencies are also packaged
epel9 currently misses the ocaml-{cairo,lablgtk3}-devel packages, which
themselves have a few missing build dependencies as well. So disable the
gtk packages until these build dependencies are available in epel9.

 * unison.spec: disable gtk packages
2025-07-26 13:14:29 -04:00
Matthew Krupcale
0ba586d5fc Re-package latest upstream v2.53.5
This updates the previous (orphaned) unison v2.40 package [1] to the latest
upstream version v2.53.5. Since unison v2.52 (2022-03), unison has become
considerably more forward and backward version-compatible, not only between
clients and servers of different unison versions but also when compiled with
different OCaml compiler versions. Thus, there is no longer a need for different
packages for different unison versions, so we revive the primary unison package.

 * .cvsignore: remove
 * .gitignore: ignore v2.53.5 source archive
 * Makefile: remove
 * sources: add v2.53.5 source archive hash
 * unison.desktop: add XDG Desktop Entry file
 * unison.metainfo.xml: add AppData metainfo file
 * unison.spec: add updated spec file

[1] https://src.fedoraproject.org/rpms/unison240
2025-07-26 13:14:23 -04:00
5 changed files with 35 additions and 57 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
/unison-2.54.0.tar.gz
/unison-2.53.7.tar.gz

View file

@ -1 +1 @@
SHA512 (unison-2.54.0.tar.gz) = 7d1fea12b11e7a4bf2a5dbd9064d3c5104ca21df88fae0ead098f1ec8b7b935abcc7cdff74799fd2d9f5b23cc06eaa7f262bb71270511fb9c2ff4aac74c7ff11
SHA512 (unison-2.53.7.tar.gz) = 11bd1d2792fb84fa2b29426516d7b91a2295febcb84052118d492a29d9ddaa23265b66cc88113019ec6782f3edcf596f7a37c8637e673b2928188248b9d63d60

10
unison.desktop Normal file
View file

@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Exec=unison-gui
Name=Unison File Synchronizer
GenericName=File Synchronizer
Comment=Multi-master File synchronization tool
Terminal=false
Icon=unison
StartupNotify=true
Categories=Utility;

View file

@ -1,5 +1,5 @@
%bcond doc 1
%bcond gtk 1
%bcond gtk 0
%ifarch %{ocaml_native_compiler}
%global native true
@ -11,8 +11,8 @@
ExcludeArch: %{ix86}
Name: unison
Version: 2.54.0
Release: 3%{?dist}
Version: 2.53.7
Release: 1%{?dist}
Summary: File Synchronizer
%global forgeurl https://github.com/bcpierce00/%{name}/
@ -31,7 +31,8 @@ Summary: File Synchronizer
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
Source1: %{name}.desktop
Source2: %{name}.metainfo.xml
BuildRequires: ocaml
BuildRequires: ocaml-findlib
@ -44,9 +45,7 @@ BuildRequires: ocaml-lablgtk3-devel
BuildRequires: ocaml-cairo-devel
%endif
%if %{with doc}
BuildRequires: hevea
BuildRequires: lynx
BuildRequires: texlive-ec
BuildRequires: tex-ec
BuildRequires: tex-latex
%endif
@ -103,19 +102,27 @@ BuildArch: noarch
PREFIX=%{_prefix}
%if %{with gtk}
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop
install -Dpm0644 -t %{buildroot}%{_metainfodir} %{SOURCE1}
# Install the various icons according to the "Icon Theme Specification"
# https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
for size in 16 24 32 48 256; do
format="${size}x${size}"
install -Dpm0644 icons/U.${format}x16m.png \
%{buildroot}%{_datadir}/icons/hicolor/${format}/apps/%{name}.png
done
install -Dpm0644 icons/U.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
install -Dpm0644 -t %{buildroot}%{_metainfodir} %{SOURCE2}
%endif
%if %{with doc}
install -Dpm0644 -t %{buildroot}%{_docdir}/%{name} doc/%{name}-manual.{html,pdf,txt}
install -Dpm0644 -t %{buildroot}%{_docdir}/%{name} doc/%{name}-manual.pdf
%endif
%check
make test \
NATIVE=%{native}
%if %{with gtk}
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-gui.metainfo.xml
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metainfo.xml
%endif
%files
@ -129,61 +136,22 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-gui.me
%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
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_metainfodir}/%{name}.metainfo.xml
%endif
%if %{with doc}
%files doc
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/%{name}-manual.{html,pdf,txt}
%{_docdir}/%{name}/%{name}-manual.pdf
%endif
%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