From 9537efe9075b8465533e4a92e2e80566d4173517 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Tue, 30 Jul 2024 14:17:59 +0800
Subject: [PATCH] move pkgconfig files into devel pacakage

(cherry picked from commit 5e61018b988a2df481785d8b97ec34c3dcddd284)
---
 gmp.spec | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/gmp.spec b/gmp.spec
index 914f821..6d9daad 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -1,10 +1,10 @@
 Name: gmp
 Version: 6.3.0
-Release: 2
+Release: 3
 Epoch: 1
 URL: https://gmplib.org
 Source0: https://gmplib.org/download/gmp/gmp-%{version}.tar.xz
-License: LGPLv3 and GPLv2
+License: (LGPL-3.0-or-later OR GPL-2.0-or-later OR (LGPL-3.0-or-later AND GPL-2.0-or-later)) AND GFDL-1.3-invariants-or-later
 BuildRequires: gcc gcc-c++ make m4
 Summary: A GNU multiple precision arithmetic library
 
@@ -18,7 +18,8 @@ precision than is directly supported by the basic C types.
 Summary: Development library package for GMP.
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: %{name}-c++%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Conflicts: %{name}%{?_isa} < 1:6.3.0-3
+Conflicts: %{name}-c++%{?_isa} < 1:6.3.0-3
 
 %description devel
 Devel package include header files, documentation and libraries for GMP
@@ -35,11 +36,7 @@ GMP dependent library for C++ applications.
 
 %build
 if as --help | grep -q execstack; then
-%if "%toolchain" == "clang"
-  export CCAS="clang -c -Wa,--noexecstack"
-%else
-  export CCAS="gcc -c -Wa,--noexecstack"
-%endif
+  export CCAS="%{__cc} -c -Wa,--noexecstack"
 fi
 
 %ifarch %{ix86}
@@ -57,29 +54,20 @@ export LD_LIBRARY_PATH=`pwd`/.libs
 %make_build
 
 %install
-export LD_LIBRARY_PATH=`pwd`/.libs
 %make_install
 install -m 644 gmp-mparam.h ${RPM_BUILD_ROOT}%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib{gmp,mp,gmpxx}.la
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-ln -sf libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/libgmpxx.so
 
-basearch=%{_arch}
-%ifarch %{ix86}
-basearch=i386
-%endif
+%delete_la
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %check
 export LD_LIBRARY_PATH=`pwd`/.libs
 %make_build check
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LESSERv3 COPYINGv2 COPYINGv3
 %doc NEWS README
 %{_libdir}/libgmp.so.*
-%{_libdir}/pkgconfig/gmp.pc
 
 %files devel
 %{_libdir}/libgmpxx.so
@@ -88,12 +76,17 @@ export LD_LIBRARY_PATH=`pwd`/.libs
 %{_infodir}/gmp.info*
 %{_libdir}/libgmpxx.a
 %{_libdir}/libgmp.a
+%{_libdir}/pkgconfig/gmp.pc
+%{_libdir}/pkgconfig/gmpxx.pc
 
 %files c++
 %{_libdir}/libgmpxx.so.*
-%{_libdir}/pkgconfig/gmpxx.pc
 
 %changelog
+* Tue Jul 30 2024 Funda Wang <fundawang@yeah.net> - 1:6.3.0-3
+- move pkgconfig files into devel pacakage
+- merge clang and gcc declaration
+
 * Sat Aug 05 2023 cf-zhao <zhaochuanfeng@huawei.com> 1:6.3.0-2
 - Support build with clang
 
-- 
Gitee