diff --git a/_service b/_service deleted file mode 100644 index f16198a..0000000 --- a/_service +++ /dev/null @@ -1,15 +0,0 @@ - - - https://git.joeyh.name/git/git-annex.git - git - 8.20211231 - @PARENT_TAG@ - disable - - - - - *.tar - xz - - diff --git a/git-annex-10.20220127.tar.gz b/git-annex-10.20220127.tar.gz new file mode 100644 index 0000000..38c9997 --- /dev/null +++ b/git-annex-10.20220127.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b04556ce285230e22587cf85923385cb70399aa2f6f9606645aef4d5d63255bb +size 8700035 diff --git a/git-annex-8.20211231.tar.xz b/git-annex-8.20211231.tar.xz deleted file mode 100644 index c0247d1..0000000 --- a/git-annex-8.20211231.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6e60171cd1a22cd3259a17144fd5706dd15e7ed120e1524f0982c4504e72a0a -size 6768544 diff --git a/git-annex.changes b/git-annex.changes index b898b82..b0b3ea2 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,40 +1,76 @@ ------------------------------------------------------------------- -Wed Jan 19 12:40:15 UTC 2022 - Ben Greiner +Fri Feb 4 11:49:28 UTC 2022 - psimons@suse.com -- 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 - into the git-annex branch will now not crash it, but will be - merged in memory. - * addurl, youtube-dl: When --check-raw prevents downloading an - url, still continue with any downloads that come after it, - rather than erroring out. - * Fix locking problems when annex.pidlock is set and concurrency - is 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 - were already exported. - * Improve git command queue flushing so that eg, addurl of - several large files that take time to download will update the - index for each file, rather than deferring the index updates to - the end. - * sync: Better error message when unable to export to a remote - because remote.name.annex-tracking-branch is configured to a - 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: - * 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 - git 2.34.0, and broke the test suite and automatic merge - resolution of a conflict between an annexed file and a - 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 - install phase and a third time in the check phase +- 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 Thu, 27 Jan 2022 13:25:19 -0400 + + git-annex (8.20211231) upstream; urgency=medium + + * Improved support for using git-annex in a read-only repository, + git-annex branch information from remotes that cannot be merged into + the git-annex branch will now not crash it, but will be merged in + memory. + * addurl, youtube-dl: When --check-raw prevents downloading an url, + still continue with any downloads that come after it, rather than + erroring out. + * Fix locking problems when annex.pidlock is set and concurrency is + 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 were + already exported. + * Improve git command queue flushing so that eg, addurl of several + large files that take time to download will update the index for each + file, rather than deferring the index updates to the end. + * sync: Better error message when unable to export to a remote because + remote.name.annex-tracking-branch is configured to a ref that does not + exist. + * Fix build with ghc 9.0.1 + * Fix build with old versions of feed library. + + -- Joey Hess 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 git 2.34.0, + and broke the test suite and automatic merge resolution of a conflict + between an annexed file and a non-annexed file. + * importfeed: Display url before starting youtube-dl download. + + -- Joey Hess Tue, 23 Nov 2021 15:19:16 -0400 ------------------------------------------------------------------- Sat Nov 20 17:31:42 UTC 2021 - psimons@suse.com diff --git a/git-annex.spec b/git-annex.spec index d31fb23..9cfab6f 100644 --- a/git-annex.spec +++ b/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/ -# Update the revision element in the _service file and run `osc service runall` for updates -Source0: %{name}-%{version}.tar.xz +URL: https://hackage.haskell.org/package/%{name} +Source0: https://github.com/opensuse-haskell/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz 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):hicolor-icon-theme +Requires(postun): desktop-file-utils +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