From 40395fe83eaf4d831727bb7237ca0bea45d50af5 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue, 9 Nov 2021 17:04:45 -0500
Subject: [PATCH] Fix rpath

Fixes: #1987464
---
 esc.spec | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/esc.spec b/esc.spec
index 0dc5e45..bd360fe 100644
--- a/esc.spec
+++ b/esc.spec
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.1.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -48,7 +48,6 @@ AutoReqProv: 0
 
 %define escname %{name}-%{version}
 %define escdir %{_libdir}/%{escname}
-%define escbindir %{_bindir}
 %define esc_chromepath   chrome/content/esc
 %define appdir applications
 %define icondir %{_datadir}/icons/hicolor/48x48/apps
@@ -83,61 +82,52 @@ echo $RPM_BUILD_DIR
 echo "build section" $PWD
 cd esc 
 
-./autogen.sh
-make 
-%install
+autoreconf --force --install --verbose
+%configure --bindir %{escdir} --libdir %{escdir}/lib --datadir %{_datadir}
+%make_build -j1
 
+%install
 echo "install section" $PWD
 cd esc
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 
-mkdir -p $RPM_BUILD_ROOT/%{escbindir}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{icondir}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{appdir}
 mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
 mkdir -p $RPM_BUILD_ROOT/%{docdir}
 
-echo "dir: "  $RPM_BUILD_ROOT/%{escbindir}/%{name}
-sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
-chmod 755 $RPM_BUILD_ROOT/%{escbindir}/%{name}
-
-mkdir -p $RPM_BUILD_ROOT/%{escdir}
-mkdir -p $RPM_BUILD_ROOT/%{escdir}/lib
-
-cp $RPM_BUILD_ROOT/usr/local/bin/* $RPM_BUILD_ROOT/%{escdir}
-
-cp -rf $RPM_BUILD_ROOT/usr/local/lib $RPM_BUILD_ROOT/%{escdir}
+echo "dir: "  $RPM_BUILD_ROOT/%{_bindir}/%{name}
+sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{_bindir}/%{name}
+chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
 
 rm $RPM_BUILD_ROOT/%{escdir}/lib/*.a
 rm $RPM_BUILD_ROOT/%{escdir}/lib/*.la
-
-
-rm -rf $RPM_BUILD_ROOT/usr/local
+rm -r $RPM_BUILD_ROOT/%{_includedir}/coolkey-mgr/
+rm -r $RPM_BUILD_ROOT/%{_datadir}/gir-*/
 
 cp %{SOURCE3} $RPM_BUILD_ROOT/%{icondir}
-ln -s $RPMBUILD_ROOT%{icondir}/esc.png $RPM_BUILD_ROOT/%{pixmapdir}/esc.png
+cp %{SOURCE3} $RPM_BUILD_ROOT/%{pixmapdir}/esc.png
 
 cp %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/%{appdir}
 
-cd %{_builddir}
-cp %{escname}/esc/LICENSE $RPM_BUILD_ROOT/%{docdir}
-
 
 %files
-%{!?_licensedir:%global license %%doc}
-%license %{docdir}/LICENSE
+%license esc/LICENSE
 
-%{escbindir}/esc
+%{_bindir}/esc
 %{escdir}/lib
 %{escdir}/esc.js
 %{escdir}/opensc.esc.conf
 
-
 %{icondir}/esc.png
 %{pixmapdir}/esc.png
 %{_datadir}/%{appdir}/esc.desktop
 
 %changelog
+* Tue Nov 09 2021 Yaakov Selkowitz <yselkowi@redhat.com> - 1.1.2-11
+- Fix rpath (#1987464)
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild