diff --git a/yelp.spec b/yelp.spec index 60f775f..164b63b 100644 --- a/yelp.spec +++ b/yelp.spec @@ -3,7 +3,7 @@ Name: yelp Epoch: 2 Version: 40~beta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -56,11 +56,6 @@ the libraries in the yelp-libs package. %build %configure --disable-static - -# drop unneeded direct library deps with --as-needed -# libtool doesn't make this easy, so we do it the hard way -sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - %make_build %install @@ -73,8 +68,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop -%ldconfig_scriptlets libs - %files -f %{name}.lang %doc AUTHORS NEWS README %license COPYING @@ -88,7 +81,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %{_datadir}/yelp-xsl/xslt/common/domains/yelp.xml %files libs -%{_libdir}/libyelp.so.* +%{_libdir}/libyelp.so.0* %dir %{_libdir}/yelp %dir %{_libdir}/yelp/web-extensions %{_libdir}/yelp/web-extensions/libyelpwebextension.so @@ -100,6 +93,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sun Feb 28 2021 Kalev Lember - 2:40~beta-2 +- Drop libtool as-needed hack as as-needed is in default LDFLAGS now +- Remove unneeded ldconfig_scriptlets macro call +- Tighten soname globs + * Thu Feb 18 2021 Kalev Lember - 2:40~beta-1 - Update to 40.beta