osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:114, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=51

_service

@@ -1,15 +0,0 @@
-<services>
-  <service name="obs_scm" mode="disabled">
-    <param name="url">https://git.joeyh.name/git/git-annex.git</param>
-    <param name="scm">git</param>
-    <param name="revision">8.20211231</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="changesgenerate">disable</param>
-  </service>
-  <service mode="disabled" name="set_version" />
-  <service mode="disabled" name="tar" />
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-</services>

git-annex-10.20220127.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b04556ce285230e22587cf85923385cb70399aa2f6f9606645aef4d5d63255bb
+size 8700035

git-annex-8.20211231.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6e60171cd1a22cd3259a17144fd5706dd15e7ed120e1524f0982c4504e72a0a
-size 6768544

git-annex.changes

@@ -1,40 +1,76 @@
 -------------------------------------------------------------------
-Wed Jan 19 12:40:15 UTC 2022 - Ben Greiner <code@bnavigator.de>
+Fri Feb  4 11:49:28 UTC 2022 - psimons@suse.com
+
+- Update git-annex to version 10.20220127.
+  git-annex (10.20220127) upstream; urgency=medium
+
+    * New v10 repository version (with v9 as a stepping-stone to it).
+      v8 remains the default version for now.
+    * In v10, object files are locked using separate lock files. This allows
+      the object files to be kept non-writable even in repositories where
+      core.sharedRepository is set.
+    * The v10 upgrade will happen automatically, one year after the v9
+      upgrade, in order to allow time for any old git-annex processes that
+      are not aware of the locking change to finish. Or git-annex upgrade
+      can be used to upgrade to v10 immediately.
+    * In v9 upgrade, set filter.annex.process. This makes git add/checkout faster
+      when there are a lot of unlocked annexed files or non-annexed files, but can
+      also make git add of large files to the annex somewhat slower.
+      If this tradeoff does not work for your use case, you can still unset
+      filter.annex.process.
+    * export: When a non-annexed symlink is in the tree to be exported, skip it.
+    * import: When the previously exported tree contained a non-annexed symlink,
+      preserve it in the imported tree so it does not get deleted.
+    * enableremote, renameremote: Better handling of the unusual case where
+      multiple special remotes have been initialized with the same name.
+    * Recover from corrupted content being received from a git remote,
+      by deleting the temporary file when it fails to verify. This prevents
+      a retry from failing again.
+      (reversion introduced in version 8.20210903)
+    * adb: Added ignorefinderror configuration parameter.
+    * Avoid crashing when run in a bare git repo that somehow contains an
+      index file.
+    * Reject combinations of --batch (or --batch-keys) with options like
+      --all or --key or with filenames.
+
+   -- Joey Hess <id@joeyh.name>  Thu, 27 Jan 2022 13:25:19 -0400
+
+  git-annex (8.20211231) upstream; urgency=medium
 
-- Update to git-annex version 8.20211231
     * Improved support for using git-annex in a read-only repository,
-    git-annex branch information from remotes that cannot be merged
+      git-annex branch information from remotes that cannot be merged into
-    into the git-annex branch will now not crash it, but will be
+      the git-annex branch will now not crash it, but will be merged in
-    merged in memory.
+      memory.
-  * addurl, youtube-dl: When --check-raw prevents downloading an
+    * addurl, youtube-dl: When --check-raw prevents downloading an url,
-    url, still continue with any downloads that come after it,
+      still continue with any downloads that come after it, rather than
-    rather than erroring out.
+      erroring out.
-  * Fix locking problems when annex.pidlock is set and concurrency
+    * Fix locking problems when annex.pidlock is set and concurrency is
-    is enabled eg with -J.
+      enabled eg with -J.
     * Improve error message display when autoinit fails due to eg, a
       permissions problem.
-  * export: Avoid unncessarily re-exporting non-annexed files that
+    * export: Avoid unncessarily re-exporting non-annexed files that were
-    were already exported.
+      already exported.
-  * Improve git command queue flushing so that eg, addurl of
+    * Improve git command queue flushing so that eg, addurl of several
-    several large files that take time to download will update the
+      large files that take time to download will update the index for each
-    index for each file, rather than deferring the index updates to
+      file, rather than deferring the index updates to the end.
-    the end.
+    * sync: Better error message when unable to export to a remote because
-  * sync: Better error message when unable to export to a remote
+      remote.name.annex-tracking-branch is configured to a ref that does not
-    because remote.name.annex-tracking-branch is configured to a
+      exist.
-    ref that does not exist.
     * Fix build with ghc 9.0.1
     * Fix build with old versions of feed library.
-- git-annex 8.20211123 was released with these changes:
+
+   -- Joey Hess <id@joeyh.name>  Fri, 31 Dec 2021 15:03:36 -0400
+
+  git-annex (8.20211123) upstream; urgency=medium
+
     * Bugfix: When -J was enabled, getting files could leak an
       ever-growing number of git cat-file processes.
-  * Support git's new "ort" resolver, which became the default in
+    * Support git's new "ort" resolver, which became the default in git 2.34.0,
-    git 2.34.0, and broke the test suite and automatic merge
+      and broke the test suite and automatic merge resolution of a conflict
-    resolution of a conflict between an annexed file and a
+      between an annexed file and a non-annexed file.
-    non-annexed file.
     * importfeed: Display url before starting youtube-dl download.
-- Move to _service checking out the upstream source directly
+
-- Avoid compiling and linking the binary a second time in the
+   -- Joey Hess <id@joeyh.name>  Tue, 23 Nov 2021 15:19:16 -0400
-  install phase and a third time in the check phase
 
 -------------------------------------------------------------------
 Sat Nov 20 17:31:42 UTC 2021 - psimons@suse.com

git-annex.spec

@@ -17,13 +17,12 @@
 
 
 Name:           git-annex
-Version:        8.20211231
+Version:        10.20220127
 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
-URL:            https://git-annex.branchable.com/
+URL:            https://hackage.haskell.org/package/%{name}
-# Update the revision element in the _service file and run `osc service runall` for updates
+Source0:        https://github.com/opensuse-haskell/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  bash-completion
 BuildRequires:  chrpath
 BuildRequires:  curl
@@ -130,8 +129,8 @@ BuildRequires:  lsof
 BuildRequires:  rsync
 Requires(post): desktop-file-utils
 Requires(post): hicolor-icon-theme
-Requires(postun):desktop-file-utils
+Requires(postun): desktop-file-utils
-Requires(postun):hicolor-icon-theme
+Requires(postun): hicolor-icon-theme
 Recommends:     curl
 Recommends:     gpg2
 Recommends:     lsof
@@ -169,26 +168,20 @@ Optional dependency offering bash completion for git-annex
 
 %prep
 %autosetup
-# don't build again when installing manuals, completions, and desktop files
-sed -i '/^install-.*:/ s/build//' Makefile
 
 %build
 %define cabal_configure_options -ftestsuite
 %ghc_bin_build
 
+%check
+%make_build DESTDIR=%{buildroot} BUILDER=./Setup test
+
 %install
 %ghc_bin_install
-# The make install-completions target expects the binary in the local directory
-ln -s %{buildroot}%{_bindir}/git-annex ./git-annex
 make DESTDIR=%{buildroot} BUILDER=./Setup install-mans install-completions install-desktop
 rm %{buildroot}%{_datadir}/fish/vendor_completions.d/git-annex.fish
 rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex
 
-%check
-export PATH=%{buildroot}%{_bindir}:$PATH
-# this is `make test` but without the repeated build of the binaries and with immediate display of the results
-%{buildroot}%{_bindir}/git-annex test
-
 %files
 %license COPYRIGHT
 %doc CHANGELOG NEWS README
@@ -200,7 +193,7 @@ export PATH=%{buildroot}%{_bindir}:$PATH
 %dir %{_datadir}/icons/hicolor/16x16/apps
 %dir %{_datadir}/icons/hicolor/scalable
 %dir %{_datadir}/icons/hicolor/scalable/apps
-%config %{_sysconfdir}/xdg/autostart/git-annex.desktop
+%{_sysconfdir}/xdg/autostart/git-annex.desktop
 %{_mandir}/man1/git-annex*.1%{?ext_man}
 %{_mandir}/man1/git-remote-tor-annex.1%{?ext_man}
 %{_datadir}/applications/git-annex.desktop