5 changed files with 133 additions and 88 deletions
--- a/.git-lfs.metadata
+++ b/.git-lfs.metadata
@ -1,2 +1 @@
 e76897da8f89170b2e23db7723408a7bdd038ee8 SOURCES/git-lfs-v3.4.1.tar.gz
-8f640c97e9736385e8cad79c91c983de895d6053 SOURCES/manpages.tgz
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
 SOURCES/git-lfs-v3.4.1.tar.gz
-SOURCES/manpages.tgz
--- a/SOURCES/README.Fedora
+++ b/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
--- a/SOURCES/gen-manpages.sh
+++ b/SOURCES/gen-manpages.sh
@ -1,15 +0,0 @@
-# As `asciidoctor` package has not been packaged to RHEL 8:
-
-# Pass package version(eg. `3.4.0`) as argument
-
-VERSION=$1
-
-cd git-lfs-$VERSION
-
-make man GIT_LFS_SHA=unused VERSION=unused PREFIX=unused
-rm -r man/html
-
-tar -czvf manpages.tgz man/*
-
-cp manpages.tgz ../
-
--- a/SPECS/git-lfs.spec
+++ b/SPECS/git-lfs.spec
@ -1,33 +1,21 @@
-# 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.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:        3%{?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
-# See this script. Generating of manpages is performed on other distros due to some missing rubygem-asciidoctor on RHEL-8
-Source2:        gen-manpages.sh
+Source1:        README.Fedora


 # Generated provides by vendor2provides.py
@ -69,8 +57,11 @@ Provides:       bundled(golang(golang.org/x/text)) = 0.7.0
 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
-./mangen
-# Removes unwanted source files
-# https://bugzilla.redhat.com/show_bug.cgi?id=1852842
-rm mangen man/mangen.go
+%gobuild -o %{gobuilddir}/bin/mangen man/mangen.go
+%{gobuilddir}/bin/mangen
 popd

 %gobuild -o %{gobuilddir}/bin/git-lfs %{goipath}
@ -124,21 +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/
-install -Dpm0644 man/man1/*.1 %{buildroot}%{_mandir}/man1/
-install -d -p %{buildroot}%{_mandir}/man5/
-install -Dpm0644 man/man5/*.5 %{buildroot}%{_mandir}/man5/
-install -d -p %{buildroot}%{_mandir}/man7/
-install -Dpm0644 man/man7/*.7 %{buildroot}%{_mandir}/man7/
-
-# Remove unwanted files from man folder
-# https://bugzilla.redhat.com/show_bug.cgi?id=1852842
-rm -r man/*
-
+for section in 1 5 7; do
+  install -d -p %{buildroot}%{_mandir}/man${section}/
+  install -Dpm0644 man/man${section}/*.${section} %{buildroot}%{_mandir}/man${section}/
+done

 %post
 %{_bindir}/%{name} install --system --skip-repo
@ -152,6 +132,7 @@ exit 0

 %if %{with check}
 %check
+%gocheck
 PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
 # https://github.com/git-lfs/git-lfs/issues/5609
 # tests fails when running with low level of parallelism
@ -170,50 +151,120 @@ PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \


 %changelog
-* Mon Sep 23 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-3
- Rebuild with new Golang
- Resolves: RHEL-57900
+* Mon Dec 18 2023 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-1
+- Update to 3.4.1
+- Resolves: RHEL-17101

-* Mon Apr 22 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-2
- Rebuild with new Golang
- Resolves: RHEL-32543, RHEL-28377, RHEL-28399, RHEL-28423
+* Thu Jan 05 2023 Ondřej Pohořelský <opohorel@redhat.com> - 3.2.0-1
+- Update to 3.2.0
+- Resolves: #2139383

-* Mon Dec 18 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.4.1-1
- Update to version 3.4.1
- Resolves: RHEL-17102
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.3-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Mon Jan 30 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-2
- Rebuild with Golang-1.19.4
- Resolves: #2163744
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.3-3
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065

-* Mon Jan 09 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-1
- Update to version 3.2.0
- Resolves: #2139382
+* Wed May 05 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.3-2
+- Fixed name of source tarball
+- Fixed date in the latest changelog entry 
+- Related: #1952517

-* Mon Jan 17 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 2.13.3-2
- Define %%gobuild macro with proper ldflags
- Related: rhbz#2021549
+* Thu Apr 22 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.3-1
+- Update to latest version
+- Resolves: #1952517

-* Tue Nov 23 2021 Ondrej Pohorelsky <opohorel@redhat.com> - 2.13.3-1
- Update to version 2.13.3
- Fixed round brackets in Provides
- Moved manpages.tgz to look-a-side cache
- Resolves: rhbz#2021549, rhbz#1870080, rhbz#1866441
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

-* Wed Jul 1 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-2
- Removed mangen source file
- Cleaned docs/man folder
- Resolves: rhbz#1852842
+* Wed Jan 06 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.0-1
+- Enable bundling
+- Update to latest version

-* Wed Jun 10 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-1
- Update to version 2.11.0
- Resolves: rhbz#1783391
+* Mon Nov 09 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.12.1-1
+- Update to latest version (#1894780)

-* Thu Jul 19 2018 Sebastian Kisela <skisela@redhat.com> - 2.4.1-3
- Add pregenerated manpages, due to missing dependency 'ronn' in rhel7.
+* 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)

-* Wed Jul 18 2018 Sebastian Kisela <skisela@redhat.com> - 2.4.1-2
- Initial build for rh-git218-git-lfs-2.4.1
+* 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