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
This commit is contained in:
Peter Simons 2022-02-09 13:44:56 +00:00 committed by Git OBS Bridge
parent 1e5226a53a
commit 19e1a07a61
5 changed files with 83 additions and 69 deletions

View File

@ -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>

View File

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

View File

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

View File

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

View File

@ -17,13 +17,12 @@
Name: git-annex Name: git-annex
Version: 8.20211231 Version: 10.20220127
Release: 0 Release: 0
Summary: Manage files with git, without checking their contents into git 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 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: bash-completion
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: curl BuildRequires: curl
@ -130,8 +129,8 @@ BuildRequires: lsof
BuildRequires: rsync BuildRequires: rsync
Requires(post): desktop-file-utils Requires(post): desktop-file-utils
Requires(post): hicolor-icon-theme 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: curl
Recommends: gpg2 Recommends: gpg2
Recommends: lsof Recommends: lsof
@ -169,26 +168,20 @@ Optional dependency offering bash completion for git-annex
%prep %prep
%autosetup %autosetup
# don't build again when installing manuals, completions, and desktop files
sed -i '/^install-.*:/ s/build//' Makefile
%build %build
%define cabal_configure_options -ftestsuite %define cabal_configure_options -ftestsuite
%ghc_bin_build %ghc_bin_build
%check
%make_build DESTDIR=%{buildroot} BUILDER=./Setup test
%install %install
%ghc_bin_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 make DESTDIR=%{buildroot} BUILDER=./Setup install-mans install-completions install-desktop
rm %{buildroot}%{_datadir}/fish/vendor_completions.d/git-annex.fish rm %{buildroot}%{_datadir}/fish/vendor_completions.d/git-annex.fish
rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex 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 %files
%license COPYRIGHT %license COPYRIGHT
%doc CHANGELOG NEWS README %doc CHANGELOG NEWS README
@ -200,7 +193,7 @@ export PATH=%{buildroot}%{_bindir}:$PATH
%dir %{_datadir}/icons/hicolor/16x16/apps %dir %{_datadir}/icons/hicolor/16x16/apps
%dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable
%dir %{_datadir}/icons/hicolor/scalable/apps %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-annex*.1%{?ext_man}
%{_mandir}/man1/git-remote-tor-annex.1%{?ext_man} %{_mandir}/man1/git-remote-tor-annex.1%{?ext_man}
%{_datadir}/applications/git-annex.desktop %{_datadir}/applications/git-annex.desktop