public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/git-annex] rawhide: https://hackage.haskell.org/package/git-annex-10.20260601/changelog
@ 2026-06-14 14:30 Jens Petersen
0 siblings, 0 replies; only message in thread
From: Jens Petersen @ 2026-06-14 14:30 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/git-annex
Branch : rawhide
Commit : fc2756f45317bafb76936ff966c428624bc414fd
Author : Jens Petersen <petersen@redhat.com>
Date : 2026-06-14T16:29:19+02:00
Stats : +28/-5 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/git-annex/c/fc2756f45317bafb76936ff966c428624bc414fd?branch=rawhide
Log:
https://hackage.haskell.org/package/git-annex-10.20260601/changelog
---
diff --git a/.gitignore b/.gitignore
index 92877bd..93ed798 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@
/git-annex-10.20250630.tar.gz
/git-annex-10.20250929.tar.gz
/git-annex-10.20260115.tar.gz
+/git-annex-10.20260601.tar.gz
diff --git a/git-annex.spec b/git-annex.spec
index 5716ab5..a2b66cc 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -2,18 +2,20 @@
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%if %{defined fedora}
-%bcond ikiwiki 1
+%bcond ikiwiki 0
%endif
Name: git-annex
-Version: 10.20260115
+Version: 10.20260601
Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: AGPL-3.0-or-later
URL: https://hackage.haskell.org/package/git-annex
# Begin cabal-rpm sources:
-Source0: https://git.joeyh.name/index.cgi/git-annex.git/snapshot/git-annex-%{version}.tar.gz
+# 403 Client Error: Forbidden for url: https://git.joeyh.name/index.cgi/git-annex.git/snapshot/git-annex-10.20260601.tar.gz
+# Source0: https://git.joeyh.name/index.cgi/git-annex.git/snapshot/git-annex-%%{version}.tar.gz
+Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
# End cabal-rpm sources
Patch0: %{name}-default-flags.patch
@@ -49,6 +51,8 @@ BuildRequires: ghc-containers-devel
BuildRequires: ghc-criterion-devel
BuildRequires: ghc-crypto-api-devel
BuildRequires: ghc-crypton-devel
+BuildRequires: ghc-crypton-connection-devel
+BuildRequires: ghc-crypton-x509-store-devel
BuildRequires: ghc-data-default-devel
BuildRequires: ghc-dbus-devel
BuildRequires: ghc-deepseq-devel
@@ -108,6 +112,7 @@ BuildRequires: ghc-tasty-rerun-devel
BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
+BuildRequires: ghc-tls-devel
BuildRequires: ghc-torrent-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unbounded-delays-devel
@@ -182,7 +187,9 @@ cabal-tweak-drop-dep yesod-default
# Begin cabal-rpm build:
%ghc_bin_build
# End cabal-rpm build
+%if %{with ikiwiki}
make docs
+%endif
%install
@@ -192,16 +199,26 @@ make docs
for i in git-annex-shell git-remote-tor-annex; do
ln -s git-annex %{buildroot}%{_bindir}/$i
done
+%if %{with ikiwiki}
make DESTDIR=%{buildroot} install-docs
+%endif
set noclobber
mkdir -p %{buildroot}%{bash_completions_dir}
-install -m 644 bash-completion.bash %{buildroot}%{bash_completions_dir}/git-annex
mkdir -p %{buildroot}%{fish_completions_dir}
mkdir -p %{buildroot}%{zsh_completions_dir}
+%if %{with ikiwiki}
+install -m 644 bash-completion.bash %{buildroot}%{bash_completions_dir}/%{name}
+%else
+%{buildroot}%{_bindir}/%{name} --bash-completion-script %{name} | sed s/filenames/default/ > %{buildroot}%{bash_completions_dir}/%{name}
+%endif
%{buildroot}%{_bindir}/%{name} --fish-completion-script %{name} > %{buildroot}%{fish_completions_dir}/%{name}
%{buildroot}%{_bindir}/%{name} --zsh-completion-script %{name} | sed s/filenames/default/ > %{buildroot}%{zsh_completions_dir}/_%{name}
+%if %{without ikiwiki}
+mkdir -p %{buildroot}%{_mandir}/man1/
+help2man --version-string %{version} --no-info %{buildroot}%{_bindir}/%{name} > %{buildroot}%{_mandir}/man1/%{name}.1
+%endif
%check
mkdir -p test
@@ -224,8 +241,10 @@ popd
# End cabal-rpm files
%{_bindir}/%{name}-shell
%{_bindir}/git-remote-tor-annex
+%if %{with ikiwiki}
%{_mandir}/man1/git-annex-*.1*
%{_mandir}/man1/git-remote-*annex.1*
+%endif
%if %{with ikiwiki}
%files docs
@@ -235,6 +254,9 @@ popd
%changelog
+* Sat Jun 13 2026 Jens Petersen <petersen@redhat.com> - 10.20260601-1
+- https://hackage.haskell.org/package/git-annex-10.20260601/changelog
+
* Mon Jan 26 2026 Jens Petersen <petersen@redhat.com> - 10.20260115-6
- https://hackage.haskell.org/package/git-annex-10.20260115/changelog
diff --git a/sources b/sources
index ec84ff7..547311f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-10.20260115.tar.gz) = 66c265e6441a5e4fa4df98001f72f0c6371c43eb4fac50d23730f8605ff8bae5b840d99bb89314e0e17b9a125223a6df9ec2e893dac252541c306657294b1d21
+SHA512 (git-annex-10.20260601.tar.gz) = b45f461de664457750aadddca3ef3f21eb8297a06b7c5e3baf4aa5305e022314926c0596417292c749fd9ede7929ec608ab23e80599256f28d8c96b31dc5238a
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-14 14:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-14 14:30 [rpms/git-annex] rawhide: https://hackage.haskell.org/package/git-annex-10.20260601/changelog Jens Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox