From 862f4dce3c3e9dfa26a84fdd8cb2211f25f9263a Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 20 Nov 2020 19:48:45 +0100
Subject: [PATCH] Release 3.14.1| Fix pkg-config files

---
 petsc.spec | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/petsc.spec b/petsc.spec
index 7e9e1cc..4dab9b6 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -262,7 +262,7 @@
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
 Version: %{releasever}.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-%{version}.tar.gz
@@ -699,9 +699,6 @@ install -pm 644 %{_arch}/include/*.mod $RPM_BUILD_ROOT%{_fmoddir}/%{name}/
 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}/
 
 cp -a %{_arch}/lib/pkgconfig $RPM_BUILD_ROOT%{_libdir}/
-pushd $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-#ln -fs PETSc.pc petsc.pc
-popd
 
 install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT%{_libdir}/%{name}/conf/
 install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT%{_libdir}/%{name}/conf/
@@ -731,9 +728,6 @@ install -pm 644 %{_arch}/include/*.mod $RPM_BUILD_ROOT%{_fmoddir}/%{name}64/
 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}64/
 
 cp -p %{_arch}/lib/pkgconfig/PETSc.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/PETSc64.pc
-pushd $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-#ln -fs PETSc64.pc petsc64.pc
-popd
 
 install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT%{_libdir}/%{name}64/conf/
 install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT%{_libdir}/%{name}64/conf/
@@ -767,9 +761,6 @@ cp -a %{_arch}/lib/pkgconfig $RPM_BUILD_ROOT$MPI_LIB/
 sed -e 's|-I${includedir}/petsc|-I%{_includedir}/openmpi-%{_arch}/petsc|g' -i $RPM_BUILD_ROOT$MPI_LIB/pkgconfig/PETSc.pc
 sed -e 's|-L${libdir}|-L%{_libdir}/openmpi/lib|g' -i $RPM_BUILD_ROOT$MPI_LIB/pkgconfig/PETSc.pc
 sed -e 's|ldflag_rpath=-L|ldflag_rpath=-L%{_libdir}/openmpi/lib|g' -i $RPM_BUILD_ROOT$MPI_LIB/pkgconfig/PETSc.pc
-pushd $RPM_BUILD_ROOT$MPI_LIB/pkgconfig
-#ln -fs PETSc.pc petsc.pc
-popd
 
 install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT$MPI_LIB/%{name}/conf/
 install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT$MPI_LIB/%{name}/conf/
@@ -922,7 +913,7 @@ xvfb-run -a make all test -C build64 V=1
 %{_libdir}/libpetsc.so.*
 
 %files devel
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/PETSc.pc
 %{_libdir}/%{name}/
 %{_libdir}/libpetsc.so
 %{_includedir}/%{name}/
@@ -938,7 +929,7 @@ xvfb-run -a make all test -C build64 V=1
 %{_libdir}/libpetsc64.so.*
 
 %files -n petsc64-devel
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/PETSc64.pc
 %{_libdir}/%{name}64/
 %{_libdir}/libpetsc64.so
 %{_includedir}/%{name}64/
@@ -953,7 +944,7 @@ xvfb-run -a make all test -C build64 V=1
 %files openmpi-devel
 %{_libdir}/openmpi/lib/libpetsc.so
 %{_libdir}/openmpi/lib/%{name}/
-%{_libdir}/openmpi/lib/pkgconfig/*.pc
+%{_libdir}/openmpi/lib/pkgconfig/PETSc.pc
 %{_includedir}/openmpi-%{_arch}/%{name}/
 %if 0%{?el7}
 %{_fmoddir}/openmpi-%{_arch}/%{name}/
@@ -970,7 +961,7 @@ xvfb-run -a make all test -C build64 V=1
 %files mpich-devel
 %{_libdir}/mpich/lib/libpetsc.so
 %{_libdir}/mpich/lib/%{name}/
-%{_libdir}/mpich/lib/pkgconfig/*.pc
+%{_libdir}/mpich/lib/pkgconfig/PETSc.pc
 %{_includedir}/mpich-%{_arch}/%{name}/
 %if 0%{?el7}
 %{_fmoddir}/mpich-%{_arch}/%{name}/
@@ -980,6 +971,9 @@ xvfb-run -a make all test -C build64 V=1
 %endif
 
 %changelog
+* Fri Nov 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 3.14.1-2
+- Fix pkg-config files
+
 * Wed Nov 04 2020 Antonio Trande <sagitter@fedoraproject.org> - 3.14.1-1
 - Release 3.14.1