From 3b1ad263941ab83826f8504193672b6faf540a55 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 4 Jun 2024 09:32:09 +1000
Subject: [PATCH] Remove the CC-BY-NC website from the tarball (#2290306)

Resolves: RHEL-39942
---
 check.spec | 35 +++++++++++++++++++++++------------
 sources    |  2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/check.spec b/check.spec
index 2d6d3f8..1aab202 100644
--- a/check.spec
+++ b/check.spec
@@ -1,16 +1,19 @@
-%global with_mingw 0
-
-%if 0%{?fedora}
-%global with_mingw 1
-%endif
+%bcond mingw %[0%{?fedora}]
 
 Name:           check
 Version:        0.15.2
-Release:        12%{?dist}
+Release:        14%{?dist}
 Summary:        A unit test framework for C
-Source0:        https://github.com/libcheck/check/archive/%{version}/%{name}-%{version}.tar.gz
 License:        LGPL-2.1-or-later
 URL:            https://libcheck.github.io/check/
+VCS:            https://github.com/libcheck/check
+# The upstream tarball includes the web/ folder with files licensed CC-BY-NC.
+# This license is not allowed in Fedora
+# Our tarball are the same sources with the web/ folder removed.
+# Easiest way to verify: unpack both tarballs and run
+#    diff -r check-0.15.2 upstream-check-0.15.2
+# Source0:      {vcs}/archive/{version}/{name}-{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 # Only needed for autotools in Fedora
 Patch0:         %{name}-0.11.0-info-in-builddir.patch
 # Fix test failures due to varying floating point behavior across platforms
@@ -27,7 +30,7 @@ BuildRequires:  pkgconfig(libsubunit)
 %endif
 BuildRequires:  texinfo, texlive-tex, graphviz
 
-%if %{with_mingw}
+%if %{with mingw}
 BuildRequires: mingw32-filesystem >= 95
 BuildRequires: mingw32-gcc-c++
 
@@ -45,6 +48,7 @@ The output from unit tests can be used within source code editors and IDEs.
 %package devel
 Summary:        Libraries and headers for developing programs with check
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-static%{?_isa} = %{version}-%{release}
 
 %description devel
 Libraries and headers for developing programs with check
@@ -65,7 +69,7 @@ Requires:       %{name} = %{version}-%{release}
 The checkmk binary translates concise versions of test suites into C
 programs suitable for use with the Check unit test framework.
 
-%if %{with_mingw}
+%if %{with mingw}
 %package -n mingw32-check
 Summary:        Libraries and headers for developing programs with check
 BuildArch: noarch
@@ -125,7 +129,7 @@ cd -
 %cmake -DCHECK_ENABLE_TIMEOUT_TESTS:BOOL=OFF
 %cmake_build
 
-%if %{with_mingw}
+%if %{with mingw}
 %mingw_configure
 %mingw_make %{?_smp_mflags}
 %endif
@@ -143,7 +147,7 @@ cd -
 # The library does not really depend on -pthread
 sed -i 's/ -pthread//' %{buildroot}%{_libdir}/pkgconfig/check.pc
 
-%if %{with_mingw}
+%if %{with mingw}
 %mingw_make_install
 %mingw_debug_install_post
 
@@ -197,7 +201,7 @@ cd -
 %{_bindir}/checkmk
 %{_mandir}/man1/checkmk.1*
 
-%if %{with_mingw}
+%if %{with mingw}
 %files -n mingw32-check
 %license COPYING.LESSER
 %{mingw32_bindir}/libcheck-0.dll
@@ -222,6 +226,13 @@ cd -
 %endif
 
 %changelog
+* Tue Jun 04 2024 Peter Hutterer <peter.hutterer@redhat.com> 0.15.2-14
+- Remove the CC-BY-NC website from the tarball (#2290306)
+
+* Tue May 21 2024 Jerry James <loganjerry@gmail.com> - 0.15.2-13
+- Fix check-devel for cmake users (rhbz#2161231)
+- Simplify conditional logic for mingw
+
 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index c7807ab..92a318d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (check-0.15.2.tar.gz) = cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
+SHA512 (check-0.15.2.tar.gz) = 20ad6a43f8d80e5c4d6805bb4e20d37ac8765d0661683f7c5366c22d04b471fcac7dcf279fa76c95d447f38073fba89cadc6a03917ad23bdcf14c3bb9670d5d6