diff --git a/.gitignore b/.gitignore index ee0843a..42153ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ clog-spec clog -/lorax-templates-rhel-9.0-34.tar.gz -/lorax-templates-rhel-9.0-35.tar.gz /lorax-templates-rhel-10.0-1.tar.gz /lorax-templates-rhel-10.0-2.tar.gz /lorax-templates-rhel-10.0-3.tar.gz diff --git a/Makefile b/Makefile index 0cf4684..d3c9e8c 100644 --- a/Makefile +++ b/Makefile @@ -41,9 +41,19 @@ clog: release: $(MAKE) bump-serial && $(MAKE) tar && $(MAKE) update-spec && $(MAKE) commit +release-merge: + $(MAKE) bump-serial && $(MAKE) tar && $(MAKE) update-spec && $(MAKE) amend + + commit: $(RHPKG) new-sources ${TARBALL} git add -u git commit -F clog +amend: + $(RHPKG) new-sources ${TARBALL} + git add -u + git commit --amend + + .PHONY: tar ${TARBALL} bump-serial update-spec release clog commit diff --git a/README b/README index 114107e..56fd906 100644 --- a/README +++ b/README @@ -13,9 +13,8 @@ Hi there! If you're trying to fix something here, do the following: # To rebase from RHEL: 1. Add "cs" remote: `git remote add cs https://gitlab.com/redhat/centos-stream/rpms/lorax-templates-rhel.git` 2. `git merge [-X ours] cs/c9s` -3. `make release` -4. Examine the changes with 'git show' and make sure they look ok. -5. Push the changes to your fork of the project with: - 'git push REMOTE BRANCHNAME' and follow the instructions to - create a merge request in gitlab. -6. `git rebase --interactive HEAD~2` and merge the commits together +3. `make release-merge` +4. Edit the %changelog section of lorax-templates-rhel.spec appropriately +5. `git add lorax-templates-rhel.spec` +6. `git commit --amend` + diff --git a/SERIAL b/SERIAL index 48082f7..b1bd38b 100644 --- a/SERIAL +++ b/SERIAL @@ -1 +1 @@ -12 +13 diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec index d491532..c51bb66 100644 --- a/lorax-templates-rhel.spec +++ b/lorax-templates-rhel.spec @@ -1,6 +1,6 @@ Name: lorax-templates-rhel Version: 10.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: RHEL build templates for lorax and livemedia-creator License: GPLv2+ @@ -10,7 +10,7 @@ BuildArch: noarch # This tarball is generated from the contents of this dist-git repository # by running the command `make tar`. # See README for full details of how to update this package -Source0: lorax-templates-rhel-10.0-12.tar.gz +Source0: lorax-templates-rhel-10.0-13.tar.gz # Required for the template branding support Requires: lorax >= 34.9.1 @@ -38,6 +38,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Thu Apr 07 2022 Stephen Gallagher - 10.0-13 +- Re-sync from CentOS Stream 9 + * Tue Mar 08 2022 Stephen Gallagher - 10.0-12 - Don't try to install packages that don't exist in ELN - redhat-release-eula diff --git a/sources b/sources index a8027f0..d8d570d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-templates-rhel-10.0-12.tar.gz) = cb6ed24e25c3b495e99052bdcfa47c60f9d818e1680e1fbf2235789f995dda87e5e0826e7bf37b74444ebba6b39a6a4cabb09b17fa494beafcc4693083be83a3 +SHA512 (lorax-templates-rhel-10.0-13.tar.gz) = ec9a014f962701c9181493f9c78fcae8b1d4905cca38b251d121ce8275deb5a4e380cc6bf65bcf0bf54f2c31b1a8f6371bde01a6eed9991e0d132bd2d90be406