rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update license and use https for subpackage url (Tim Landscheidt,#2)

Browse Source
This commit is contained in:
Jens Petersen 2022-04-27 10:54:18 +08:00
parent 57481f9394
commit 0b9d47c300
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
COPYING
View File

@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 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 Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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. Also add information on how to contact you by electronic and paper mail.
@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school, 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. 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 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 The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with 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 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 Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>. <https://www.gnu.org/philosophy/why-not-lgpl.html>.

4
ghc-rpm-macros.spec
View File

@ -184,6 +184,10 @@ EOF
%changelog %changelog
* Wed Apr 27 2022 Tim Landscheidt <tim@tim-landscheidt.de>
- Update license from https://www.gnu.org/licenses/
- Use https for subpackage URLs
* Thu Mar 10 2022 Jens Petersen <petersen@redhat.com> - 2.3.15-1 * Thu Mar 10 2022 Jens Petersen <petersen@redhat.com> - 2.3.15-1
- ghc_set_gcc_flags: disable brp-strip-lto to avoid strip timestamp warnings - ghc_set_gcc_flags: disable brp-strip-lto to avoid strip timestamp warnings

2
macros.ghc-extra
View File

@ -21,7 +21,7 @@ print(string.sub(pv, string.find(pv, "[%d.]+$")))\
Summary: Haskell %{pkgname} library\ Summary: Haskell %{pkgname} library\
%{?1:Version: %{pkgver}}\ %{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\ %{-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")}\ %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(%{ghc_prefix}-[^, ]*\\)-devel/\\1/g")}\
\ \
%description -n %{basepkg}\ %description -n %{basepkg}\