Fix rpath

Fixes: #1987464
This commit is contained in:
Yaakov Selkowitz 2021-11-09 17:04:45 -05:00
parent 1dcfaf739c
commit 40395fe83e

View File

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