From 3f0c40a8c43e49a743cd1a3d1e3db2d7bb14732e Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Sun, 19 Jun 2022 23:59:13 -0400
Subject: [PATCH] Changed license file so GitHub recognizes it as zlib.
There is no actual license change, just renaming/reformatting the file.
---
CMakeLists.txt | 2 +-
COPYING.txt | 20 --------------------
LICENSE.txt | 18 ++++++++++++++++++
Makefile.am | 2 +-
Makefile.in | 2 +-
README.txt | 2 +-
SDL2_rtf.spec.in | 2 +-
7 files changed, 23 insertions(+), 25 deletions(-)
delete mode 100644 COPYING.txt
create mode 100644 LICENSE.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd18d67..ef6705d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,7 +227,7 @@ if(SDL2RTF_INSTALL)
)
endif()
- install(FILES "COPYING.txt"
+ install(FILES "LICENSE.txt"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${PROJECT_NAME}"
COMPONENT library
)
diff --git a/COPYING.txt b/COPYING.txt
deleted file mode 100644
index 20b7a4d..0000000
--- a/COPYING.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- SDL_rtf: A companion library to SDL for displaying RTF format text
- Copyright (C) 2003-2022 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..d8a0c99
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,18 @@
+Copyright (C) 2003-2022 Sam Lantinga <slouken@libsdl.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/Makefile.am b/Makefile.am
index 714e286..af329fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ libSDL2_rtf_la_SOURCES = \
SDL_rtfreadr.h \
SDL_rtf.c
-EXTRA_DIST = CHANGES.txt COPYING.txt README.txt \
+EXTRA_DIST = CHANGES.txt LICENSE.txt README.txt \
version.rc \
Makefile.os2 \
SDL2_rtf.spec \
diff --git a/Makefile.in b/Makefile.in
index 968f324..fa317ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,7 +406,7 @@ libSDL2_rtf_la_SOURCES = \
SDL_rtfreadr.h \
SDL_rtf.c
-EXTRA_DIST = CHANGES.txt COPYING.txt README.txt \
+EXTRA_DIST = CHANGES.txt LICENSE.txt README.txt \
version.rc \
Makefile.os2 \
SDL2_rtf.spec \
diff --git a/README.txt b/README.txt
index e3e715d..65e8778 100644
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ The SDL_ttf library can be found at: http://www.libsdl.org/projects/SDL_rtf/
To make the library, type './configure' then 'make' to build the SDL rtf
library and the showrtf example application.
-This library is under the zlib license, see the file "COPYING" for details.
+This library is under the zlib license, see the file "LICENSE.txt" for details.
Enjoy!
-Sam Lantinga <slouken@libsdl.org> (8/16/2003)
diff --git a/SDL2_rtf.spec.in b/SDL2_rtf.spec.in
index 76fdccd..81c3ac5 100644
--- a/SDL2_rtf.spec.in
+++ b/SDL2_rtf.spec.in
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc README.txt CHANGES.txt COPYING.txt
+%doc README.txt CHANGES.txt LICENSE.txt
%{prefix}/lib/lib*.so.*
%files devel