.git-lfs.metadata

@@ -1,2 +1 @@
-e529d946985e52ff8d0559f00f372a6ed0444ad5 SOURCES/git-lfs-v3.2.0.tar.gz
+e76897da8f89170b2e23db7723408a7bdd038ee8 SOURCES/git-lfs-v3.4.1.tar.gz
-a62bf4cb31743bf18f5f62ae3f785e2c5c09e285 SOURCES/manpages.tgz

.gitignore

@@ -1,2 +1 @@
-SOURCES/git-lfs-v3.2.0.tar.gz
+SOURCES/git-lfs-v3.4.1.tar.gz
-SOURCES/manpages.tgz

SOURCES/11fe8dc62ed2eb158eaec28af90d2f509e7fd91f.patch

@@ -1,25 +0,0 @@
-From a119ca768dfeefef7609b55acbf6400fafb0ee5a Mon Sep 17 00:00:00 2001
-From: "brian m. carlson" <bk2204@github.com>
-Date: Mon, 25 Jul 2022 17:29:34 +0000
-Subject: [PATCH] t: set init.defaultBranch
-
-Previously, we used a template to set the default HEAD ref to "main" so
-that our branch would be correct.  It appears that Git has changed
-things so that that no longer works, so set init.defaultBranch as well
-to make sure we initialize new repositories properly.
----
- t/testhelpers.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/t/testhelpers.sh b/t/testhelpers.sh
-index 7c921f43e8..ea5dc05c4f 100644
---- a/t/testhelpers.sh
-+++ b/t/testhelpers.sh
-@@ -607,6 +607,7 @@ setup() {
-     git config --global http.$LFS_CLIENT_CERT_URL/.sslKey "$LFS_CLIENT_KEY_FILE"
-     git config --global http.$LFS_CLIENT_CERT_URL/.sslCert "$LFS_CLIENT_CERT_FILE"
-     git config --global http.$LFS_CLIENT_CERT_URL/.sslVerify "false"
-+    git config --global init.defaultBranch main
-   fi | sed -e 's/^/# /g'
- 
-   # setup the git credential password storage

SOURCES/README.Fedora

@@ -0,0 +1,11 @@
+git-lfs on Fedora
+=================
+
+By default, the package will run a post-install/post-uninstall task to
+enable/disable git-lfs filters in the system git configuration.
+
+If you wish to enable/disable git-lfs manually, you can set the following
+option in the system git config, and package install/uninstall will no longer
+do this:
+
+# git config --system 'fedora.git-lfs.no-modify-config' true

SOURCES/gen-manpages.sh

@@ -1,16 +0,0 @@
-# As `ronn` package has not been packaged for RHEL7 yet, man pages need to be generated on Fedora when rebasing to a new version as follows:
-
-# Pass package version(eg. `2.4.1`) as argument
-
-VERSION=$1
-
-cd git-lfs-$VERSION/docs
-
-ronn --roff man/*.ronn
-
-cd ..
-
-tar -czvf manpages.tgz docs/man/*.{1,5}
-
-cp manpages.tgz ../
-

SPECS/git-lfs.spec

@@ -1,35 +1,22 @@
-# Build man pages
-%global with_manpages 1
-
 %bcond_without check
 
 # https://github.com/git-lfs/git-lfs
 %global goipath         github.com/git-lfs/git-lfs
-Version:                3.2.0
+Version:                3.4.1
 
-# golang doesn't ship i686 binaries, we don't need the build
-# https://bugzilla.redhat.com/show_bug.cgi?id=1752991#c9
-%global golang_arches %(echo %{golang_arches} | sed "s|%{ix86}||")
 %gometa
 
 %global gobuilddir %{_builddir}/%{name}-%{version}/_build
 
-# define gobuild macro to not lose hardening, because of macro conflict
-# https://bugzilla.redhat.com/show_bug.cgi?id=1919348
-%global gobuild CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" go build -compiler gc -buildmode pie '-tags=rpm_crashtraceback libtrust_openssl ' -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}
-
 Name:           git-lfs
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Git extension for versioning large files
 
 License:        MIT
 URL:            https://git-lfs.github.io/
 Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.gz
-Source1:        manpages.tgz
+Source1:        README.Fedora
-# See this script. Generating of manpages is performed on other distros due to some missing numerous dependencies on RHEL
-Source2:        gen-manpages.sh
 
-Patch:          https://github.com/git-lfs/git-lfs/commit/11fe8dc62ed2eb158eaec28af90d2f509e7fd91f.patch
 
 # Generated provides by vendor2provides.py
 # https://src.fedoraproject.org/rpms/syncthing/blob/603e4e03a92a7d704d199629dd85304018e8279d/f/vendor2provides.py
@@ -37,12 +24,12 @@ Provides:       bundled(golang(github.com/alexbrainman/sspi)) = 909beea
 Provides:       bundled(golang(github.com/avast/retry-go)) = 2.4.2+incompatible
 Provides:       bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
 Provides:       bundled(golang(github.com/dpotapov/go-spnego)) = 298b63a
-Provides:       bundled(golang(github.com/git-lfs/gitobj/v2)) = 2.1.0
+Provides:       bundled(golang(github.com/git-lfs/gitobj/v2)) = 2.1.1
 Provides:       bundled(golang(github.com/git-lfs/go-netrc)) = f0c862d
 Provides:       bundled(golang(github.com/git-lfs/pktline)) = 06e9096
 Provides:       bundled(golang(github.com/git-lfs/wildmatch/v2)) = 2.0.1
 Provides:       bundled(golang(github.com/hashicorp/go-uuid)) = 1.0.2
-Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.0.0
+Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.0.1
 Provides:       bundled(golang(github.com/jcmturner/aescts/v2)) = 2.0.0
 Provides:       bundled(golang(github.com/jcmturner/dnsutils/v2)) = 2.0.0
 Provides:       bundled(golang(github.com/jcmturner/gofork)) = 1.0.0
@@ -55,22 +42,26 @@ Provides:       bundled(golang(github.com/olekukonko/ts)) = 78ecb04
 Provides:       bundled(golang(github.com/pkg/errors)) = c605e28
 Provides:       bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
 Provides:       bundled(golang(github.com/rubyist/tracerx)) = 7879593
-Provides:       bundled(golang(github.com/spf13/cobra)) = 0.0.3
+Provides:       bundled(golang(github.com/spf13/cobra)) = 1.6.0
-Provides:       bundled(golang(github.com/spf13/pflag)) = 1.0.3
+Provides:       bundled(golang(github.com/spf13/pflag)) = 1.0.5
 Provides:       bundled(golang(github.com/ssgelm/cookiejarparser)) = 1.0.1
 Provides:       bundled(golang(github.com/stretchr/testify)) = 1.6.1
 Provides:       bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac27
 Provides:       bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7b
 Provides:       bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3f
 Provides:       bundled(golang(golang.org/x/crypto)) = 7b82a4e
-Provides:       bundled(golang(golang.org/x/net)) = 69e39ba
+Provides:       bundled(golang(golang.org/x/net)) = 0.7.0
-Provides:       bundled(golang(golang.org/x/sync)) = 036812b
+Provides:       bundled(golang(golang.org/x/sync)) = 0.1.0
-Provides:       bundled(golang(golang.org/x/sys)) = 665e8c7
+Provides:       bundled(golang(golang.org/x/sys)) = 0.5.0
-Provides:       bundled(golang(golang.org/x/text)) = 0.3.7
+Provides:       bundled(golang(golang.org/x/text)) = 0.7.0
-Provides:       bundled(golang(gopkg.in/yaml.v3)) = 9f266ea
+Provides:       bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 
-%if 0%{?with_check}
+
-# For tests
+# Generate man pages
+BuildRequires:  /usr/bin/asciidoctor
+
+%if %{with check}
+# Tests
 BuildRequires:  perl-Digest-SHA
 BuildRequires:  perl-Test-Harness
 # Tests require full git suite, but not generally needed.
@@ -92,11 +83,6 @@ install -m 0755 -vd %{gobuilddir}/bin
 install -m 0755 -vd "$(dirname %{gobuilddir}/src/%{goipath})"
 ln -fs "$(pwd)" "%{gobuilddir}/src/%{goipath}"
 
-%if %{?with_manpages}
-# Unpack manpages generated by %%{SOURCE2}
-tar -xf %{SOURCE1}
-%endif
-
 # Modify tests so that they expect binaries where we build them.
 sed -i -e 's!\.\./bin/!/%{gobuilddir}/bin/!g' t/Makefile
 sed -i -e 's!^BINPATH=.\+!BINPATH="%{gobuilddir}/bin"!g' t/testenv.sh
@@ -106,12 +92,10 @@ export GOPATH=%{gobuilddir}:%{gopath}
 export GO111MODULE=off
 
 # Build manpages first (some embedding in the executable is done.)
+make man GIT_LFS_SHA=unused VERSION=unused PREFIX=unused
 pushd docs
-%gobuild -o mangen man/mangen.go
+%gobuild -o %{gobuilddir}/bin/mangen man/mangen.go
-./mangen
+%{gobuilddir}/bin/mangen
-# Removes unwanted source files
-# https://bugzilla.redhat.com/show_bug.cgi?id=1852842
-rm mangen man/mangen.go
 popd
 
 %gobuild -o %{gobuilddir}/bin/git-lfs %{goipath}
@@ -124,18 +108,17 @@ done
 %gobuild -o "%{gobuilddir}/bin/git-lfs-test-server-api" t/git-lfs-test-server-api/*.go
 popd
 
+# Remove man pages from docs so they don't get installed twice.
+rm -r docs/man
+
 
 %install
 # In Fedora this is done by using %%gopkginstall
 install -Dpm0755 %{gobuilddir}/bin/git-lfs %{buildroot}%{_bindir}/%{name}
-install -d -p %{buildroot}%{_mandir}/man1/
+for section in 1 5 7; do
-install -Dpm0644 docs/man/*.1 %{buildroot}%{_mandir}/man1/
+  install -d -p %{buildroot}%{_mandir}/man${section}/
-install -d -p %{buildroot}%{_mandir}/man5/
+  install -Dpm0644 man/man${section}/*.${section} %{buildroot}%{_mandir}/man${section}/
-install -Dpm0644 docs/man/*.5 %{buildroot}%{_mandir}/man5/
+done
-# Remove unwanted files from man folder
-# https://bugzilla.redhat.com/show_bug.cgi?id=1852842
-rm docs/man/*.1 docs/man/*.5
-
 
 %post
 %{_bindir}/%{name} install --system --skip-repo
@@ -149,8 +132,11 @@ exit 0
 
 %if %{with check}
 %check
+%gocheck
 PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
-    make -C t PROVE_EXTRA_ARGS="-j$(getconf _NPROCESSORS_ONLN)"
+# https://github.com/git-lfs/git-lfs/issues/5609
+# tests fails when running with low level of parallelism
+    make -C t PROVE_EXTRA_ARGS="-j40 -v"
 %endif
 
 
@@ -161,41 +147,124 @@ PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*.1*
 %{_mandir}/man5/%{name}*.5*
+%{_mandir}/man7/%{name}*.7*
 
 
 %changelog
-* Mon Jan 30 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-2
+* Mon Dec 18 2023 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-1
-- Rebuild with Golang-1.19.4
+- Update to 3.4.1
-- Resolves: #2163744
+- Resolves: RHEL-17101
 
-* Mon Jan 09 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-1
+* Thu Jan 05 2023 Ondřej Pohořelský <opohorel@redhat.com> - 3.2.0-1
-- Update to version 3.2.0
+- Update to 3.2.0
-- Resolves: #2139382
+- Resolves: #2139383
 
-* Mon Jan 17 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 2.13.3-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.3-4
-- Define %%gobuild macro with proper ldflags
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Related: rhbz#2021549
+  Related: rhbz#1991688
 
-* Tue Nov 23 2021 Ondrej Pohorelsky <opohorel@redhat.com> - 2.13.3-1
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.3-3
-- Update to version 2.13.3
+- Rebuilt for RHEL 9 BETA for openssl 3.0
-- Fixed round brackets in Provides
+  Related: rhbz#1971065
-- Moved manpages.tgz to look-a-side cache
-- Resolves: rhbz#2021549, rhbz#1870080, rhbz#1866441
 
-* Wed Jul 1 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-2
+* Wed May 05 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.3-2
-- Removed mangen source file
+- Fixed name of source tarball
-- Cleaned docs/man folder
+- Fixed date in the latest changelog entry 
-- Resolves: rhbz#1852842
+- Related: #1952517
 
-* Wed Jun 10 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-1
+* Thu Apr 22 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.3-1
-- Update to version 2.11.0
+- Update to latest version
-- Resolves: rhbz#1783391
+- Resolves: #1952517
 
-* Thu Jul 19 2018 Sebastian Kisela <skisela@redhat.com> - 2.4.1-3
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.0-2
-- Add pregenerated manpages, due to missing dependency 'ronn' in rhel7.
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Wed Jul 18 2018 Sebastian Kisela <skisela@redhat.com> - 2.4.1-2
+* Wed Jan 06 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.0-1
-- Initial build for rh-git218-git-lfs-2.4.1
+- Enable bundling
+- Update to latest version
+
+* Mon Nov 09 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.12.1-1
+- Update to latest version (#1894780)
+
+* Thu Sep 03 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.12.0-1
+- Update to latest version (#1874604)
+- Remove duplicate docs/man directory (#1852765)
+- Add an option to disable modifying the git filter config (#1768060)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun May 10 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.11.0-1
+- Update to latest version
+
+* Thu Feb 20 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.10.0-1
+- Update to latest version
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 07 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.9.2-1
+- Update to latest version
+
+* Wed Jan 01 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.9.0-1
+- Update to latest version
+
+* Fri Aug 30 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.8.0-4
+- Customize vendor information in version
+
+* Fri Aug 30 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.8.0-3
+- Update to latest version
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.2-2
+- Update to latest Go macros
+
+* Wed Apr 24 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.2-1
+- Update to latest version
+
+* Wed Feb 27 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.1-1
+- Update to latest version
+
+* Thu Feb 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.0-1
+- Update to latest version
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 15 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.6.1-1
+- Update to latest version
+
+* Mon Jan 14 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.2-4
+- Rebuilt for dependencies
+
+* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
+- 2.5.2-3
+- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
+- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
+
+* Fri Oct 12 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.2-2
+- rebuilt
+
+* Wed Oct 10 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.2-1
+- Update to latest version
+
+* Tue Sep 04 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.1-1
+- Update to latest version
+
+* Mon Sep 03 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.0-1
+- Update to 2.5.0
+
+* Wed Aug 29 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.4.2-1
+- Update to 2.4.2
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 2.4.1-3
+- Rebuild with fixed binutils
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild