From ab79bf730ad9b70a6f3408fbee9e6da7e857e391ebc0f6a39b4c20d2cd658794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 2 Dec 2020 15:03:38 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:43, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=21 --- git-annex-8.20201116.tar.gz | 3 --- git-annex-8.20201127.tar.gz | 3 +++ git-annex.changes | 33 +++++++++++++++++++++++++++++++++ git-annex.spec | 2 +- 4 files changed, 37 insertions(+), 4 deletions(-) delete mode 100644 git-annex-8.20201116.tar.gz create mode 100644 git-annex-8.20201127.tar.gz diff --git a/git-annex-8.20201116.tar.gz b/git-annex-8.20201116.tar.gz deleted file mode 100644 index 875e757..0000000 --- a/git-annex-8.20201116.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e34b92349470cc62ed45441ee8ad6cff0b385fb3388d8c192ef63d50c3a1eea -size 8457065 diff --git a/git-annex-8.20201127.tar.gz b/git-annex-8.20201127.tar.gz new file mode 100644 index 0000000..c2ce76a --- /dev/null +++ b/git-annex-8.20201127.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bb8fe61d4e0f0d25a220c11e00413c6b8a5ee67dcf91833c34095fc72a436a9 +size 8490201 diff --git a/git-annex.changes b/git-annex.changes index 98e440b..e800551 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sun Nov 29 15:48:14 UTC 2020 - psimons@suse.com + +- Update git-annex to version 8.20201127. + git-annex (8.20201127) upstream; urgency=medium + + * adjust: New --unlock-present mode which locks files whose content is not + present (so the broken symlink is visible), while unlocking files whose + content is present. + * Added annex.adjustedbranchrefresh git config to update adjusted + branches set up by git-annex adjust --unlock-present/--hide-missing. + * Fix hang when an external special remote program exited but + the stderr pipe to it was left open, due to a daemon having inherited + the file descriptor. + * Fix a bug that could make resuming a download from the web fail + when the entire content of the file is actually already present + locally. + * examinekey: Added a "file" format variable for consistency with find, + and for easier scripting. + * init: When writing hook scripts, set all execute bits, not only + the user execute bit. + * upgrade: Support an edge case upgrading a v5 direct mode repo + where nothing had ever been committed to the head branch. + * Made the test suite significantly less noisy, only displaying command + output when something failed. + * Fix building without the torrent library. + Thanks, Kyle Meyer. + * Fix build on Windows. + * Prevent windows assistant from trying (and failing) to upgrade + itself, which has never been supported on windows. + + -- Joey Hess Fri, 27 Nov 2020 12:54:11 -0400 + ------------------------------------------------------------------- Tue Nov 17 15:41:20 UTC 2020 - Ondřej Súkup diff --git a/git-annex.spec b/git-annex.spec index b876dc7..bc4256c 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -17,7 +17,7 @@ Name: git-annex -Version: 8.20201116 +Version: 8.20201127 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 From 3be5d738ec2a2d5b9af3d9fc9296de58597824609509a078080d884e8c1b6038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:53:23 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:59, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=22 --- git-annex.changes | 5 +++++ git-annex.spec | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/git-annex.changes b/git-annex.changes index e800551..d31f0ad 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Sun Nov 29 15:48:14 UTC 2020 - psimons@suse.com diff --git a/git-annex.spec b/git-annex.spec index bc4256c..4219f09 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -127,7 +127,6 @@ BuildRequires: git-core BuildRequires: gpg2 BuildRequires: lsof BuildRequires: rsync -Requires: git-core Requires(post): desktop-file-utils Requires(post): hicolor-icon-theme Requires(postun): desktop-file-utils @@ -138,6 +137,12 @@ Recommends: lsof Recommends: rsync Recommends: ssh Suggests: %{name}-bash-completion +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %description Git-annex allows managing files with git, without checking the file contents @@ -165,7 +170,7 @@ Requires: bash-completion Supplements: (%{name} and bash-completion) %description bash-completion -Optional dependency offering bash completion for git-annex +Optional dependency offering bash completion for git-annex})}} %prep %autosetup From 2d81a3406be0f37b6a3140b5269269542b1638a3348292c717e1949ff2da2e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:41 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:67, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=23 --- git-annex.changes | 2 +- git-annex.spec | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/git-annex.changes b/git-annex.changes index d31f0ad..7f671ae 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Sun Nov 29 15:48:14 UTC 2020 - psimons@suse.com diff --git a/git-annex.spec b/git-annex.spec index 4219f09..a207e73 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -137,12 +137,7 @@ Recommends: lsof Recommends: rsync Recommends: ssh Suggests: %{name}-bash-completion -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %description Git-annex allows managing files with git, without checking the file contents @@ -164,13 +159,12 @@ up and use git-annex this way. %package bash-completion Summary: Bash completion for git-annex -Group: System/Shells Requires: %{name} = %{version} Requires: bash-completion Supplements: (%{name} and bash-completion) %description bash-completion -Optional dependency offering bash completion for git-annex})}} +Optional dependency offering bash completion for git-annex %prep %autosetup @@ -188,20 +182,12 @@ make DESTDIR=%{buildroot} BUILDER=./Setup install-mans install-completions insta rm %{buildroot}%{_datadir}/fish/vendor_completions.d/git-annex.fish rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun - %files %license COPYRIGHT %doc CHANGELOG NEWS README %{_bindir}/%{name} %{_bindir}/%{name}-shell -%{_bindir}/git-remote-tor-annex +%{_bindir}/git-remote-tor-annex} %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/16x16 %dir %{_datadir}/icons/hicolor/16x16/apps From fcf77f5276190fa7e761c5971250f66f5cc2539122ccdd62b672144c8d25d1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:46 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:68, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=24 --- git-annex.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-annex.changes b/git-annex.changes index 7f671ae..c614054 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build From 849d6f85e75dbe45e2cfafba499dac33b8551f43a265e0950f6868b397ee91bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sun, 20 Dec 2020 13:19:32 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:69, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=25 --- git-annex.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-annex.spec b/git-annex.spec index a207e73..280b491 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -187,7 +187,7 @@ rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex %doc CHANGELOG NEWS README %{_bindir}/%{name} %{_bindir}/%{name}-shell -%{_bindir}/git-remote-tor-annex} +%{_bindir}/git-remote-tor-annex %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/16x16 %dir %{_datadir}/icons/hicolor/16x16/apps