diff --git a/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch b/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch index 696d087..e9c296f 100644 --- a/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch +++ b/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch @@ -1,157 +1,14 @@ -From 58b3b46b517358295c7041a92ce135e7c8013eec Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Thu, 10 Aug 2023 15:39:56 +0200 -Subject: [PATCH] persistent >= 2.12.0.1 includes the code from - persistent-template - -persistent-template has been deprecated. ---- - Database/ContentIdentifier.hs | 2 -- - Database/Export.hs | 3 --- - Database/Fsck.hs | 3 --- - Database/ImportFeed.hs | 3 --- - Database/Keys/SQL.hs | 3 --- - git-annex.cabal | 3 +-- - 6 files changed, 1 insertion(+), 16 deletions(-) - -Index: git-annex-10.20240927/Database/ContentIdentifier.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/ContentIdentifier.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/ContentIdentifier.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -12,10 +12,8 @@ - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.ContentIdentifier ( - ContentIdentifierHandle, -Index: git-annex-10.20240927/Database/Export.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/Export.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/Export.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -5,17 +5,14 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.Export ( - ExportHandle, -Index: git-annex-10.20240927/Database/Fsck.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/Fsck.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/Fsck.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -5,7 +5,6 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} -@@ -13,10 +12,8 @@ - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE UndecidableInstances #-} - {-# LANGUAGE TypeOperators #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.Fsck ( - FsckHandle, -Index: git-annex-10.20240927/Database/ImportFeed.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/ImportFeed.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/ImportFeed.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -6,17 +6,14 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.ImportFeed ( - ImportFeedDbHandle, -Index: git-annex-10.20240927/Database/Keys/SQL.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/Keys/SQL.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/Keys/SQL.hs 2024-10-26 13:36:42.453641181 +0000 -@@ -5,17 +5,14 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} - {-# LANGUAGE RankNTypes, ScopedTypeVariables #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.Keys.SQL where - -Index: git-annex-10.20240927/git-annex.cabal -=================================================================== ---- git-annex-10.20240927.orig/git-annex.cabal 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/git-annex.cabal 2024-10-26 13:36:42.453641181 +0000 +diff --git a/git-annex.cabal b/git-annex.cabal +index 864efa527e..68b5552b37 100644 +--- a/git-annex.cabal ++++ b/git-annex.cabal @@ -249,8 +249,7 @@ Executable git-annex - time (>= 1.5.0), + time (>= 1.9.1), old-locale, persistent-sqlite (>= 2.8.1), - persistent (>= 2.8.1), -- persistent-template, +- persistent-template (>= 2.8.0), + persistent (>= 2.12.0.2), unliftio-core, microlens, - aeson, -Index: git-annex-10.20240927/Database/RepoSize.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/RepoSize.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/RepoSize.hs 2024-10-26 13:37:26.311088729 +0000 -@@ -5,7 +5,6 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} -@@ -13,10 +12,8 @@ - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE UndecidableInstances #-} - {-# LANGUAGE TypeOperators #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.RepoSize ( - RepoSizeHandle, + aeson (>= 2.0.0), diff --git a/git-annex-10.20240927.tar.gz b/git-annex-10.20240927.tar.gz deleted file mode 100644 index 6f338a5..0000000 --- a/git-annex-10.20240927.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71f5615411c9695953b9b1129e84dffee1e81e32ea6b8a8d9d383bd08c67a22f -size 9491594 diff --git a/git-annex-10.20250828.tar.gz b/git-annex-10.20250828.tar.gz new file mode 100644 index 0000000..cad598a --- /dev/null +++ b/git-annex-10.20250828.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab6f135f74e3aea6d75e57f1218036e9b582112b532ec46a4b604491d9d2fe57 +size 9411626 diff --git a/git-annex.changes b/git-annex.changes index 15ebeda..02c8cb6 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,312 @@ +------------------------------------------------------------------- +Fri Aug 29 15:44:09 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250828. + git-annex (10.20250828) upstream; urgency=medium + + * p2p: Added --enable option, which can be used to enable P2P networks + provided by external commands git-annex-p2p- + * Added git-remote-p2p-annex, which allows git pull and push to + P2P networks provided by commands git-annex-p2p- + * S3: Default to signature=v4 when using an AWS endpoint, since some + AWS regions need v4 and all support it. When host= is used to specify + a different S3 host, the default remains signature=v2. + * webapp: Support setting up S3 buckets in regions that need v4 + signatures. + * S3: When initremote is given the name of a bucket that already exists, + automatically set datacenter to the right value, rather than needing it + to be explicitly set. + * info: Added --show option to pick which parts of the info to calculate + and display. + * Improve behavior when there are special remotes configured with + autoenable=yes with names that conflict with other remotes. + * adjust: When another branch has been manually merged into the adjusted + branch, re-adjusting errors out, rather than losing that merge commit. + * sync: When another branch has been manually merged into an adjusted + branch, error out rather than only displaying a warning. + * initremote: New onlyencryptcreds=yes which can be used along with + embedcreds=yes, to only encrypt the embedded creds, without encrypting + the content of the special remote. Useful for exporttree/importtree + remotes. + * Don't allow the type of encryption of an existing special remote to be + changed. Fixes reversion introduced in version 7.20191230. + * tahoe: Support tahoe-lafs command versions newer than 1.16. + * tahoe: Fix bug that made initremote require an encryption= parameter, + despite git-annex encryption not being used with this special remote. + Fixes reversion introduced in version 7.20191230. + * Improved error message when yt-dlp is not installed and is needed to + get a file from the web. + * The annex.youtube-dl-command git config is no longer used, git-annex + always runs the yt-dlp command, rather than the old youtube-dl command. + * Removed support for git versions older than 2.22. + * Bump aws build dependency to 0.24.1. + * stack.yaml: Update to lts-24.2. + + -- Joey Hess Fri, 29 Aug 2025 11:42:37 -0400 + +------------------------------------------------------------------- +Tue Jul 22 18:12:16 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250721. + git-annex (10.20250721) upstream; urgency=medium + + * Improved workaround for git 2.50 bug, avoding an occasional test suite + failure, as well as some situations where an unlocked file did not get + populated when adding another file to the repository with the same + content. + * Add --url option and url= preferred content expression, to match + content that is recorded as present in an url. + * p2phttp: Scan multilevel directories with --directory. + * p2phttp: Added --socket option. + * Fix bug in handling of linked worktrees on filesystems not supporting + symlinks, that caused annexed file content to be stored in the wrong + location inside the git directory, and also caused pointer files to not + get populated. + * fsck: Fix location of annexed files when run in linked worktrees + that have experienced the above bug. + * Fix symlinks generated to annexed content when in adjusted unlocked + branch in a linked worktree on a filesystem not supporting symlinks. + + -- Joey Hess Tue, 22 Jul 2025 14:11:26 -0400 + +------------------------------------------------------------------- +Mon Jun 30 14:06:16 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250630. + * Work around git 2.50 bug that caused it to crash when there is + a merge conflict with an unlocked annexed file. [bsc#1245270] + * Skip and warn when a tree import includes empty filenames, + which can happen with eg a S3 bucket. + * Avoid a problem with temp file names ending in whitespace on + filesystems like VFAT that don't support such filenames. + * webapp: Rename "Upgrade Repository" to "Convert Repository" + to avoid confusion with git-annex upgrade. + +------------------------------------------------------------------- +Thu Jun 5 18:13:58 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250605. + git-annex (10.20250605) upstream; urgency=medium + + * sync: Push the current branch first, rather than a synced branch, + to better support git forges (gitlab, gitea, forgejo, etc.) which + use push-to-create with the first pushed branch becoming the default + branch. + * Added annex.fastcopy and remote.name.annex-fastcopy config setting. + When set, this allows the copy_file_range syscall to be used, which + can eg allow for server-side copies on NFS. (For fastest copying, + also disable annex.verify or remote.name.annex-verify.) + * map: Support --json option. + * map: Improve display of remote names. + * When annex.freezecontent-command or annex.thawcontent-command is + configured but fails, prevent initialization. This allows the user to + fix their configuration and avoid crippled filesystem detection + entering an adjusted branch. + * assistant: Avoid hanging at startup when a process has a *.lock file + open in the .git directory. + * Windows: Fix duplicate file bug that could occur when files were + supposed to be moved across devices. + + -- Joey Hess Thu, 05 Jun 2025 14:10:36 -0400 + +------------------------------------------------------------------- +Tue May 20 14:30:35 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250520. + git-annex (10.20250520) upstream; urgency=medium + + * Preferred content now supports "balanced=groupname:lackingcopies" + to make files be evenly balanced amoung as many repositories as are + needed to satisfy numcopies. + * map: Fix buggy handling of remotes that are bare git repositories + accessed via ssh. + * map: Avoid looping forever with mutually recursive paths between + repositories accessed via ssh. + * whereused: Fix bug that could find matches from grafts + in remote git-annex branches. + * Windows: Fix bug that can cause git status to show annexed files as + modified when built with OsPath. + + -- Joey Hess Tue, 20 May 2025 10:25:47 -0400 + +------------------------------------------------------------------- +Wed Apr 16 17:35:22 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250416. + git-annex (10.20250416) upstream; urgency=medium + + * Added the mask special remote. + * updatecluster, updateproxy: When a remote that has no annex-uuid is + configured as annex-cluster-node, warn and avoid writing bad data to + the git-annex branch. + * Fix build without the assistant. + * fsck: Avoid complaining about required content of dead repositories. + * drop: Avoid redundant object directory thawing. + * httpalso: Windows url fix. + * Added remote.name.annex-web-options config, which is a per-remote + version of the annex.web-options config. + * migrate: Fix --remove-size to work when a file is not present. + Fixes reversion introduced in version 10.20231129. + * Support git remotes that use a IPV6 link-local address with a zone ID. + * Support git remotes that use an url with a user name that is URL + encoded, or in the case of an "scp-style" url, a user name that must be + encoded to be legal in an URL. + * Fix git-lfs special remote ssh endpoint discovery when the repository + path is URL encoded. + + -- Joey Hess Wed, 16 Apr 2025 13:34:40 -0400 + +------------------------------------------------------------------- +Thu Mar 20 17:11:33 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250320. + git-annex (10.20250320) upstream; urgency=medium + + * Added the compute special remote. + * addcomputed: New command, adds a file that is generated by a compute + special remote. + * recompute: New command, recomputes computed files. + * findcomputed: New command, displays information about computed files. + * Support help.autocorrect settings "prompt", "never", and "immediate". + * Allow setting remote.foo.annex-tracking-branch to a branch name + that contains "/", as long as it's not a remote tracking branch. + * Added OsPath build flag, which speeds up git-annex's operations on files. + * git-lfs: Added an optional apiurl parameter. + (This needs version 1.2.5 of the haskell git-lfs library to be used.) + * fsck: Remember the files that are checked, so a later run with --more + will skip them, without needing to use --incremental. + + -- Joey Hess Thu, 20 Mar 2025 13:10:48 -0400 + +------------------------------------------------------------------- +Wed Jan 15 16:38:16 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250115. + + * Improve handing of ssh connection problems during + remote annex.uuid discovery. + * log: Support --key, as well as --branch and --unused. + * Avoid verification error when addurl --verifiable is used + with an url claimed by a special remote other than the web. + * Fix installation on Android. + * Allow enableremote of an existing webdav special remote that has + read-only access. + * git-remote-annex: Use enableremote rather than initremote. + * Windows: Fix permission denied error when dropping files that + have the readonly attribute set. + * Added freezecontent-annex and thawcontent-annex hooks that + correspond to the git configs annex.freezecontent and + annex.thawcontent. + * Added secure-erase-annex hook that corresponds to the git config + annex.secure-erase-command. + * Added commitmessage-annex hook that corresponds to the git config + annex.commitmessage-command. + * Added http-headers-annex hook that corresponds to the git config + annex.http-headers-command. + * Added git configs annex.post-update-command and annex.pre-commit-command + that correspond to the post-update-annex and pre-commit-annex hooks. + * Added annex.pre-init-command git config and pre-init-annex hook + that is run before git-annex repository initialization. + * Linux standalone builds' bundled rsync updated to fix security holes. + +------------------------------------------------------------------- +Thu Jan 2 16:32:11 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250102. + + * Added config `url..annexInsteadOf` corresponding to git's + `url..pushInsteadOf`, to configure the urls to use for accessing + the git-annex repositories on a server without needing to configure + remote.name.annexUrl in each repository. + * Work around git hash-object --stdin-paths's odd stripping of carriage + return from the end of the line (some windows infection), avoiding + crashing when the repo contains a filename ending in a carriage return. + * Document that settting preferred content to "" is the same as the + default unset behavior. + * sync: Avoid misleading warning about future preferred content + transition when preferred content is set to "". + * Honor annex.addunlocked configuration when importing a tree from a + special remote. + * Removed the i386ancient standalone tarball build for linux, which + was increasingly unable to support new git-annex features. + * Removed support for building with ghc older than 9.0.2, + and with older versions of haskell libraries than are in current Debian + stable. + * stack.yaml: Update to lts-23.2. + +- Refresh "0001-persistent-2.12.0.1-include-the-code-from-persistent.patch". + Most patches to git-annex itself are now unnecessary. We only need to drop + persistent-templates from the list of build dependencies. + +------------------------------------------------------------------- +Mon Dec 2 16:37:14 UTC 2024 - Peter Simons + +- Update git-annex to version 10.20241202. + git-annex (10.20241202) upstream; urgency=medium + + * add: Consistently treat files in a dotdir as dotfiles, even + when ran inside that dotdir. + * add: When adding a dotfile as a non-large file, mention that it's a + dotfile. + * p2phttp: Added --directory option which serves multiple git-annex + repositories located inside a directory. + * When remote.name.annexUrl is an annex+http(s) url, that + uses the same hostname as remote.name.url, which is itself a http(s) + url, they are assumed to share a username and password. This avoids + unnecessary duplicate password prompts. + * git-remote-annex: Fix a reversion introduced in version 10.20241031 + that broke cloning from a special remote. + * git-remote-annex: Fix cloning from a special remote on a crippled + filesystem. + * git-remote-annex: Fix buggy behavior when annex.stalldetection is + configured. + * git-remote-annex: Require git version 2.31 or newer, since old + ones had a buggy git bundle command. + * S3: Support versioning=yes with a readonly bucket. + (Needs aws-0.24.3) + * S3: Send git-annex or other configured User-Agent. + (Needs aws-0.24.3) + * S3: Fix infinite loop and memory blowup when importing from an + unversioned S3 bucket that is large enough to need pagination. + * S3: Use significantly less memory when importing from a + versioned S3 bucket. + * vpop: Only update state after successful checkout. + + -- Joey Hess Mon, 02 Dec 2024 12:31:08 -0400 + +------------------------------------------------------------------- +Thu Oct 31 21:20:43 UTC 2024 - Peter Simons + +- Update git-annex to version 10.20241031. + git-annex (10.20241031) upstream; urgency=medium + + * Sped up proxied downloads from special remotes, by streaming. + * Added GETORDERED request to external special remote protocol. + When the external special remote responds with ORDERED, it can stream + through a proxy. + * p2phttp: Support serving unauthenticated users while requesting + authentication for operations that need it. Eg, --unauth-readonly + can be combined with --authenv. + * p2phttp: Allow unauthenticated users to lock content by default. + * p2phttp: Added --unauth-nolocking option to prevent unauthenticated + users from locking content. + * Allow enabling the servant build flag with older versions of stm, + allowing building with ghc 9.0.2. + * git-remote-annex: Fix bug that prevented using it with external special + remotes, leading to protocol error messages involving "GITMANIFEST". + * adjust: Allow any order of options when combining --hide-missing with + options like --unlock. + * Support P2P protocol version 4. This allows DATA-PRESENT to be sent + after PUT (and in the HTTP P2P protocol, v4/put has a data-present + parameter). When used with a proxy to a special remote like a S3 + bucket, this allows a custom client to upload content to S3 itself, + and then use the P2P protocol to inform the proxy that the content has + been stored there, which will result in the same git-annex branch state + updates as sending DATA via the proxy. + * Fix hang when receiving a large file into a proxied special remote. + + -- Joey Hess Thu, 31 Oct 2024 17:19:56 -0400 + ------------------------------------------------------------------- Mon Sep 30 23:17:41 UTC 2024 - Peter Simons diff --git a/git-annex.spec b/git-annex.spec index 57bc20d..eff68d8 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -1,7 +1,7 @@ # # spec file for package git-annex # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: git-annex -Version: 10.20240927 +Version: 10.20250828 Release: 0 Summary: Manage files with git, without checking their contents into git License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only @@ -93,6 +93,8 @@ BuildRequires: ghc-fdo-notify-devel BuildRequires: ghc-fdo-notify-prof BuildRequires: ghc-feed-devel BuildRequires: ghc-feed-prof +BuildRequires: ghc-file-io-devel +BuildRequires: ghc-file-io-prof BuildRequires: ghc-filepath-bytestring-devel BuildRequires: ghc-filepath-bytestring-prof BuildRequires: ghc-filepath-devel @@ -141,6 +143,8 @@ BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-locale-prof BuildRequires: ghc-optparse-applicative-devel BuildRequires: ghc-optparse-applicative-prof +BuildRequires: ghc-os-string-devel +BuildRequires: ghc-os-string-prof BuildRequires: ghc-path-pieces-devel BuildRequires: ghc-path-pieces-prof BuildRequires: ghc-persistent-devel @@ -234,6 +238,7 @@ BuildRequires: git-core BuildRequires: gpg2 BuildRequires: lsof BuildRequires: rsync +BuildRequires: sqlite3-devel Requires(post): desktop-file-utils Requires(post): hicolor-icon-theme Requires(postun): desktop-file-utils @@ -296,6 +301,7 @@ rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex %{_bindir}/%{name}-shell %{_bindir}/git-remote-tor-annex %{_bindir}/git-remote-annex +%{_bindir}/git-remote-p2p-annex %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/16x16 %dir %{_datadir}/icons/hicolor/16x16/apps @@ -305,6 +311,7 @@ rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex %{_mandir}/man1/git-annex*.1%{?ext_man} %{_mandir}/man1/git-remote-tor-annex.1%{?ext_man} %{_mandir}/man1/git-remote-annex.1%{?ext_man} +%{_mandir}/man1/git-remote-p2p-annex.1%{?ext_man} %{_datadir}/applications/git-annex.desktop %{_datadir}/icons/hicolor/16x16/apps/git-annex.png %{_datadir}/icons/hicolor/scalable/apps/git-annex.svg