From c3b99cf90765907b4fe724eb4c3b20a303e9888c Mon Sep 17 00:00:00 2001 From: mwall Date: Mon, 1 Jun 2020 08:17:07 -0400 Subject: [PATCH] separate changeslogs for redhat and suse --- DEV_NOTES.txt | 23 ++-- makefile | 44 +++++--- pkg/{changelog.rpm => changelog.el} | 0 pkg/changelog.suse | 165 ++++++++++++++++++++++++++++ 4 files changed, 207 insertions(+), 25 deletions(-) rename pkg/{changelog.rpm => changelog.el} (100%) create mode 100644 pkg/changelog.suse diff --git a/DEV_NOTES.txt b/DEV_NOTES.txt index c7f9dd72..0ca94878 100644 --- a/DEV_NOTES.txt +++ b/DEV_NOTES.txt @@ -9,8 +9,9 @@ checklist for doing a release: 3. Make sure all changes have been logged 1. docs/changes.txt 2. make deb-changelog - 3. make rpm-changelog - 4. docs/upgrading.htm + 3. make redhat-changelog + 4. make suse-changelog + 5. docs/upgrading.htm 4. Create the packages 1. make src-package 2. make debian-packages @@ -46,7 +47,8 @@ git clone https://github.com/weewx/weewx.git vi bin/weewx/__init__.py make version make deb-changelog -make rpm-changelog +make redhat-changelog +make suse-changelog vi docs/changes.txt # as needed vi docs/upgrading.htm # as needed git commit -a -m "release x.y.z" @@ -127,11 +129,17 @@ how to build debian packages: make debian-packages how to build redhat packages: - make rpm-changelog - emacs pkg/changelog.rpm # add any package-specific changes, if any - git commit -m "update rpm changelog" pkg/changelog.rpm + make redhat-changelog + emacs pkg/changelog.el # add any package-specific changes, if any + git commit -m "update redhat changelog" pkg/changelog.el make redhat-packages +how to build redhat packages: + make suse-changelog + emacs pkg/changelog.suse # add any package-specific changes, if any + git commit -m "update suse changelog" pkg/changelog.suse + make suse-packages + to display debconf variables: sudo debconf-show weewx @@ -261,7 +269,8 @@ notes ------------------------------------------------------------------------- there are multiple changelogs: docs/changes.txt - definitive changelog for the application pkg/debian/changelog - changes to the debian packaging - pkg/changelog.rpm - changes to the redhat packaging + pkg/changelog.el - changes to the redhat packaging + pkg/changelog.suse - changes to the suse packaging when signing, gpg info must match the name and email in the latest package changelog entry. diff --git a/makefile b/makefile index ad4a1a0c..fc8cdc17 100644 --- a/makefile +++ b/makefile @@ -36,8 +36,9 @@ help: info @echo " install run the generic python install" @echo " version get version from __init__ and insert elsewhere" @echo "" - @echo " deb-changelog prepend stub changelog entry for deb" - @echo " rpm-changelog prepend stub changelog entry for rpm" + @echo " deb-changelog prepend stub changelog entry for deb" + @echo " redhat-changelog prepend stub changelog entry for redhat" + @echo " suse-changelog prepend stub changelog entry for suse" @echo "" @echo " src-package create source tarball suitable for distribution" @echo "debian-packages create the debian packages" @@ -222,21 +223,22 @@ upload-debian: scp $(DSTDIR)/python-$(DEBPKG) $(USER)@$(WEEWX_COM):$(WEEWX_STAGING) scp $(DSTDIR)/python3-$(DEBPKG) $(USER)@$(WEEWX_COM):$(WEEWX_STAGING) -RPMREVISION=1 -RPMVER=$(VERSION)-$(RPMREVISION) -# add a skeleton entry to rpm changelog -rpm-changelog: - if [ "`grep $(RPMVER) pkg/changelog.rpm`" = "" ]; then \ - pkg/mkchangelog.pl --action stub --format redhat --release-version $(RPMVER) > pkg/changelog.rpm.new; \ - cat pkg/changelog.rpm >> pkg/changelog.rpm.new; \ - mv pkg/changelog.rpm.new pkg/changelog.rpm; \ -fi - -# use rpmbuild to create the rpm package # specify the operating system release target (e.g., 7 for centos7) OSREL= # specify the operating system label (e.g., el, suse) RPMOS=$(shell if [ -f /etc/SuSE-release -o -f /etc/SUSE-brand ]; then echo suse; elif [ -f /etc/redhat-release ]; then echo el; else echo os; fi) + +RPMREVISION=1 +RPMVER=$(VERSION)-$(RPMREVISION) +# add a skeleton entry to rpm changelog +rpm-changelog: + if [ "`grep $(RPMVER) pkg/changelog.el`" = "" ]; then \ + pkg/mkchangelog.pl --action stub --format redhat --release-version $(RPMVER) > pkg/changelog.$(RPMOS).new; \ + cat pkg/changelog.$(RPMOS) >> pkg/changelog.$(RPMOS).new; \ + mv pkg/changelog.$(RPMOS).new pkg/changelog.$(RPMOS); \ +fi + +# use rpmbuild to create the rpm package # specify the architecture (always noarch) RPMARCH=noarch RPMBLDDIR=$(BLDDIR)/weewx-$(RPMVER).$(RPMOS)$(OSREL).$(RPMARCH) @@ -254,7 +256,7 @@ rpm-package: $(DSTDIR)/$(SRCPKG) -e 's%RPMREVISION%$(RPMREVISION)%' \ -e 's%OSREL%$(OSREL)%' \ pkg/weewx.spec.in > $(RPMBLDDIR)/SPECS/weewx.spec - cat pkg/changelog.rpm >> $(RPMBLDDIR)/SPECS/weewx.spec + cat pkg/changelog.$(RPMOS) >> $(RPMBLDDIR)/SPECS/weewx.spec cp dist/weewx-$(VERSION).tar.gz $(RPMBLDDIR)/SOURCES rpmbuild -ba --clean --define '_topdir $(CWD)/$(RPMBLDDIR)' --target noarch $(CWD)/$(RPMBLDDIR)/SPECS/weewx.spec mkdir -p $(DSTDIR) @@ -265,21 +267,27 @@ ifeq ("$(SIGN)","1") # rpm --addsign $(DSTDIR)/weewx-$(RPMVER).$(RPMOS)$(OSREL).src.rpm endif +redhat-changelog: + make rpm-changelog RPMOS=el + redhat-packages: rpm-package-el7 rpm-package-el8 rpm-package-el7: - make rpm-package OSREL=7 + make rpm-package RPMOS=el OSREL=7 rpm-package-el8: - make rpm-package OSREL=8 + make rpm-package RPMOS=el OSREL=8 + +suse-changelog: + make rpm-changelog RPMOS=suse suse-packages: rpm-package-suse12 rpm-package-suse15 rpm-package-suse12: - make rpm-package OSREL=12 + make rpm-package RPMOS=suse OSREL=12 rpm-package-suse15: - make rpm-package OSREL=15 + make rpm-package RPMOS=suse OSREL=15 # run rpmlint on the rpm package check-rpm: diff --git a/pkg/changelog.rpm b/pkg/changelog.el similarity index 100% rename from pkg/changelog.rpm rename to pkg/changelog.el diff --git a/pkg/changelog.suse b/pkg/changelog.suse new file mode 100644 index 00000000..43482266 --- /dev/null +++ b/pkg/changelog.suse @@ -0,0 +1,165 @@ +* Sat May 30 2020 Matthew Wall (weewx) - 4.1.1-1 +- new upstream release +- remove the implicitly-applied dependencies in the redhat rpms +* Mon May 25 2020 Matthew Wall (weewx) - 4.1.0-1 +- new upstream release +* Thu Apr 30 2020 Matthew Wall (weewx) - 4.0.0-1 +- new upstream release +* Thu Apr 09 2020 Matthew Wall (weewx) - 4.0.0b18-2 +- fix python/python3 invocations +* Thu Apr 09 2020 Matthew Wall (weewx) - 4.0.0b18-1 +- new upstream release +* Tue Mar 31 2020 Matthew Wall - 4.0.0b17-1 +- new upstream release +* Wed Feb 26 2020 Matthew Wall - 4.0.0b13-1 +- new upstream release +* Sun Feb 02 2020 Matthew Wall - 4.0.0b11-1 +- new upstream release +* Sat Jan 04 2020 Matthew Wall - 4.0.0b6-1 +- new upstream release +* Sun Jul 14 2019 [ultimate] Matthew Wall (weewx) - 3.9.2-1 +- new upstream release +* Wed Feb 06 2019 Matthew Wall (weewx) - 3.9.1-2 +- fix html_root location for suse +* Wed Feb 06 2019 Matthew Wall (weewx) - 3.9.1-1 +- new upstream release +* Tue Feb 05 2019 Matthew Wall (weewx) - 3.9.0-1 +- new upstream release +* Mon Jan 28 2019 Matthew Wall (weewx) - 3.9.0b3-1 +- new upstream release +* Sat Jan 26 2019 Matthew Wall (weewx) - 3.9.0b2-1 +- new upstream release +* Tue Jan 22 2019 Matthew Wall (weewx) - 3.9.0b1-1 +- new upstream release +* Thu Aug 16 2018 Matthew Wall (weewx) - 3.8.2-1 +- new upstream release +* Fri Jun 22 2018 Matthew Wall (weewx) - 3.8.1-1 +- new upstream release +* Tue Nov 21 2017 mwall - 3.8.0-1 +- new upstream release +* Tue Nov 21 2017 mwall - 3.8.0a2-1 +- new upstream release +* Wed Mar 22 2017 Matthew Wall (weewx) - 3.7.1-1 +- new upstream release +* Fri Mar 10 2017 Matthew Wall (weewx) - 3.7.0-1 +- new upstream release +* Sat Mar 04 2017 Matthew Wall (weewx) - 3.7.0b3-1 +- new upstream release +* Sat Feb 18 2017 Matthew Wall (weewx) - 3.7.0b2-1 +- new upstream release +* Thu Feb 09 2017 Matthew Wall (weewx) - 3.7.0a3-1 +- new upstream release +* Thu Oct 13 2016 Matthew Wall (weewx) - 3.6.1-1 +- new upstream release +* Fri Oct 07 2016 Matthew Wall (weewx) - 3.6.0-1 +- new upstream release +* Tue Oct 04 2016 Thomas Keffer (Author of weewx) - 3.6.0b3-1 +- new upstream release +* Mon Sep 26 2016 Matthew Wall (weewx) - 3.6.0b2-1 +- new upstream release +* Sun Sep 25 2016 Matthew Wall (weewx) - 3.6.0b1-1 +- new upstream release +* Thu Sep 22 2016 Matthew Wall (weewx) - 3.6.0a1-1 +- new upstream release +* Sun Mar 13 2016 Matthew Wall (weewx) - 3.5.0-1 +- new upstream release +* Sat Jan 16 2016 Matthew Wall (weewx) - 3.4.0-1 +- new upstream release +* Sun Dec 06 2015 Matthew Wall (weewx) - 3.3.1-1 +- new upstream release +* Sat Dec 05 2015 Matthew Wall (weewx) - 3.3.0-1 +- new upstream release +* Sat Oct 31 2015 mwall - 3.3.0b1-1 +- new upstream release +* Sat Jul 18 2015 Matthew Wall (weewx) - 3.2.1-1 +- new upstream release +* Wed Jul 15 2015 Matthew Wall (weewx) - 3.2.0-1 +- new upstream release +* Wed Jul 15 2015 Thomas Keffer (Author of weewx) - 3.2.0-1 +- new upstream release +* Wed Jul 15 2015 Matthew Wall (weewx) - 3.2.0b3-1 +- new upstream release +* Tue Jul 07 2015 Matthew Wall (weewx) - 3.2.0b1-1 +- new upstream release +- fixes to rpm pre/post scripts in weewx.spec +* Sun Jul 05 2015 Matthew Wall (weewx) - 3.2.0a4-1 +- new upstream release +* Sat Apr 25 2015 Matthew Wall (weewx) - 3.2.0a1-1 +- new upstream release +- use unified wee_X utilities +* Thu Feb 05 2015 Matthew Wall (weewx) - 3.1.0-1 +- new upstream release +* Sat Dec 06 2014 Matthew Wall (weewx) - 3.0.1-1 +- new upstream release +* Fri Dec 05 2014 Thomas Keffer (Author of weewx) - 3.0.0-1 +- new upstream release +* Mon Dec 01 2014 Matthew Wall (weewx) - 3.0.0b2-1 +- new upstream release +* Sat Nov 29 2014 Matthew Wall (weewx) - 3.0.0a5-1 +- new upstream release +* Sat Nov 29 2014 Matthew Wall (weewx) - 3.0.0a4-1 +- new upstream release +* Fri Nov 28 2014 Matthew Wall (weewx) - 3.0.0a3-1 +- new upstream release +* Thu Nov 27 2014 Matthew Wall (weewx) - 3.0.0a2-1 +- new upstream release +* Sat Oct 11 2014 Matthew Wall (weewx) - 2.7.0-1 +- new upstream release +* Mon Jun 16 2014 Matthew Wall (weewx) - 2.6.4-1 +- new upstream release +- added cc3000, ultimeter, ws1 drivers +* Thu Apr 10 2014 Matthew Wall (weewx) - 2.6.3-1 +- new upstream release +* Sun Feb 16 2014 Matthew Wall (weewx) - 2.6.2-1 +- new upstream release +* Sat Feb 08 2014 Matthew Wall (weewx) - 2.6.1-1 +- new upstream release +* Fri Feb 07 2014 Matthew Wall (weewx) - 2.6.0-1 +- new upstream release +* Wed Feb 05 2014 Matthew Wall (weewx) - 2.6.0b2-1 +- new upstream release +* Tue Feb 04 2014 Matthew Wall (weewx) - 2.6.0b1-1 +- new upstream release +* Tue Jan 28 2014 Matthew Wall (weewx) - 2.6.0a6-1 +- new upstream release +* Mon Dec 30 2013 Matthew Wall - 2.5.1-1 +- added ws23xx and te923 drivers +* Tue Oct 29 2013 Matthew Wall - 2.5.0-1 +- new upstream release +* Sat Oct 19 2013 Matthew Wall - 2.5.0b3-1 +- new upstream release +* Fri Oct 18 2013 Matthew Wall - 2.5.0b2-1 +- new upstream release +* Sat Oct 12 2013 Matthew Wall - 2.5.0b1-1 +- new upstream release +* Sun Aug 04 2013 Matthew Wall - 2.4.0-1 +- new upstream release +* Sat Jun 22 2013 Matthew Wall - 2.3.3-1 +- new upstream release +* Sun Jun 16 2013 Matthew Wall - 2.3.2-1 +- new upstream release +* Mon Apr 15 2013 Thomas Keffer - 2.3.1-1 +- new upstream release +* Tue Apr 09 2013 Matthew Wall - 2.3.0-1 +- new upstream release +* Fri Feb 15 2013 Matthew Wall - 2.2.1-1 +- fixed ordinals +* Thu Feb 14 2013 Matthew Wall - 2.2.0-1 +- no packaging changes for the 2.2.0 release +* Wed Feb 13 2013 Matthew Wall - 2.2.0b2-1 +- second beta for 2.2.0 +* Sun Feb 10 2013 Matthew Wall - 2.2.0b1-1 +- first beta for 2.2.0 +* Sat Feb 09 2013 Matthew Wall - 2.2.0a5-1 +- fixed postrm to work with ubuntu systems +* Fri Feb 08 2013 Matthew Wall - 2.2.0a4-1 +- include logrotate and syslog snippets +- use wee_config_* naming +* Sun Feb 03 2013 Matthew Wall - 2.2.0a3-1 +- removed apache dependencies +- put generated html in /var/www/html/weewx +* Mon Jan 28 2013 Matthew Wall - 2.2.0a2-1 +- merged packaging branch to trunk +- put chkconfig in preun rather than postun as per rpmlint suggestion +* Sat Jan 26 2013 Matthew Wall - 2.1.1-1 +- initial redhat package