PR#2: Use https where possible - rpms/ghc-rpm-macros

rpms / ghc-rpm-macros

#2 Use https where possible

Closed 2 years ago by petersen. Opened 3 years ago by scfc.

Unknown source use-https into rawhide

Use https where possible

Tim Landscheidt • 2 years ago

fd61b9f

COPYING

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`GNU GENERAL PUBLIC LICENSE`
		`Version 3, 29 June 2007`

		`- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>`
		`+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>`
		`Everyone is permitted to copy and distribute verbatim copies`
		`of this license document, but changing it is not allowed.`

		`@@ -645,7 +645,7 @@`
		`GNU General Public License for more details.`

		`You should have received a copy of the GNU General Public License`
		`- along with this program. If not, see <http://www.gnu.org/licenses/>.`
		`+ along with this program. If not, see <https://www.gnu.org/licenses/>.`

		`Also add information on how to contact you by electronic and paper mail.`

		`@@ -664,11 +664,11 @@`
		`You should also get your employer (if you work as a programmer) or school,`
		`if any, to sign a "copyright disclaimer" for the program, if necessary.`
		`For more information on this, and how to apply and follow the GNU GPL, see`
		`- <http://www.gnu.org/licenses/>.`
		`+ <https://www.gnu.org/licenses/>.`

		`The GNU General Public License does not permit incorporating your program`
		`into proprietary programs. If your program is a subroutine library, you`
		`may consider it more useful to permit linking proprietary applications with`
		`the library. If this is what you want to do, use the GNU Lesser General`
		`Public License instead of this License. But first, please read`
		`- <http://www.gnu.org/philosophy/why-not-lgpl.html>.`
		`+ <https://www.gnu.org/licenses/why-not-lgpl.html>.`

ghc-rpm-macros.spec

file modified

+5 -1

		`@@ -8,7 +8,7 @@`

		`Name: ghc-rpm-macros`
		`Version: 2.2.3`
		`- Release: 3%{?dist}`
		`+ Release: 4%{?dist}`
		`Summary: RPM macros for building Haskell packages for GHC`

		`License: GPLv3+`
		`@@ -174,6 +174,10 @@`


		`%changelog`
		`+ * Sun Aug 8 2021 Tim Landscheidt <tim@tim-landscheidt.de> - 2.2.3-4`
		`+ - Update license from https://www.gnu.org/licenses/`
		`+ - Use https for subpackage URLs`
		`+`
		`* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-3`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild`

macros.ghc-extra

file modified

+1 -1

		`@@ -21,7 +21,7 @@`
		`Summary: Haskell %{pkgname} library\`
		`%{?1:Version: %{pkgver}}\`
		`%{-l:License: %{-l*}}\`
		`- Url: http://hackage.haskell.org/package/%{pkgname}\`
		`+ Url: https://hackage.haskell.org/package/%{pkgname}\`
		`%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" \| sed -e "s/\\(%{ghc_prefix}-[^, ]*\\)-devel/\\1/g")}\`
		`\`
		`%description -n %{basepkg}\`

scfc commented 3 years ago

Update license from https://www.gnu.org/licenses/
Use https for subpackage URLs

petersen commented 2 years ago

Just noticed this through https://packager-dashboard.fedoraproject.org/

First thanks and sorry for missing this.

Could you either drop the changelog or rebase to fix the conflict?
Thank you!

rebased onto fd61b9f

2 years ago

petersen commented 2 years ago

I am so sorry I don't watch pagure PRs carefully enough.

Tell me if you want to rebase again or I can merge this by hand.
I think the main conflict would be in the spec file since not using rpmautospec
(that's why I suggested to drop the changelog there:).
If you prefer not to rebase or there should be another conflict I will go ahead and git merge by hand.

[worse I wrote this comment some months ago (except the last work), but didn't to post it until now.]

Edited 2 years ago by petersen

petersen commented 2 years ago

Committed in 0b9d47c, thank you!