diff --git a/harfbuzz.spec b/harfbuzz.spec index c8637e2cef260b00e0c614759e1471f97118707f..f01c827b60461570f6143104a3227e9e8c6ec096 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,6 +1,6 @@ Name: harfbuzz Version: 2.8.1 -Release: 4 +Release: 5 Summary: A text shaping engine License: MIT @@ -12,7 +12,7 @@ Patch0002: backport-0001-CVE-2023-25193.patch Patch0003: backport-0002-CVE-2023-25193.patch BuildRequires: gcc-c++ freetype-devel cairo-devel glib2-devel graphite2-devel -BuildRequires: gtk-doc libicu-devel gobject-introspection-devel +BuildRequires: gtk-doc libicu-devel gobject-introspection-devel chrpath Provides: harfbuzz-icu Obsoletes: harfbuzz-icu @@ -36,7 +36,7 @@ Header files and libraries for building a extension library for %{name}. %autosetup -n %{name}-%{version} -p1 %build -%configure --disable-static --with-graphite2 --with-gobject --enable-introspection +%configure --disable-static --with-graphite2 --with-gobject --enable-introspection CFLAGS="-fPIE -pie" make %{?_smp_mflags} @@ -45,10 +45,22 @@ make check %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -%delete_la +chrpath -d %{buildroot}%{_libdir}/lib%{name}-icu.so.* +chrpath -d %{buildroot}%{_libdir}/lib%{name}-gobject.so.* +chrpath -d %{buildroot}%{_libdir}/lib%{name}-subset.so.* + +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +%delete_la %ldconfig_scriptlets +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + %files %doc AUTHORS NEWS %license COPYING @@ -58,6 +70,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %{_libdir}/libharfbuzz-icu.so.* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/HarfBuzz-0.0.typelib +%config(noreplace) /etc/ld.so.conf.d/* %files devel %{_bindir}/* @@ -73,6 +86,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %{_datadir}/gtk-doc/html/harfbuzz/* %changelog +* Wed Nov 08 2023 zhangxianting - 2.8.1-5 +- Enable fPIE and Remove rpath + * Wed Feb 15 2023 zhouwenpei - 2.8.1-4 - fix CVE-2023-25193