Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/yelp.git#21215b19b981ca39e0dac5ecbf47c7749fb18b50
This commit is contained in:
DistroBaker 2021-03-18 20:40:44 +00:00
parent 330c04271e
commit 6c374d104c
1 changed files with 7 additions and 9 deletions

View File

@ -3,7 +3,7 @@
Name: yelp Name: yelp
Epoch: 2 Epoch: 2
Version: 40~beta Version: 40~beta
Release: 1%{?dist} Release: 2%{?dist}
Summary: Help browser for the GNOME desktop Summary: Help browser for the GNOME desktop
License: LGPLv2+ and ASL 2.0 and GPLv2+ License: LGPLv2+ and ASL 2.0 and GPLv2+
@ -56,11 +56,6 @@ the libraries in the yelp-libs package.
%build %build
%configure --disable-static %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 %make_build
%install %install
@ -73,8 +68,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete
%check %check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop
%ldconfig_scriptlets libs
%files -f %{name}.lang %files -f %{name}.lang
%doc AUTHORS NEWS README %doc AUTHORS NEWS README
%license COPYING %license COPYING
@ -88,7 +81,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop
%{_datadir}/yelp-xsl/xslt/common/domains/yelp.xml %{_datadir}/yelp-xsl/xslt/common/domains/yelp.xml
%files libs %files libs
%{_libdir}/libyelp.so.* %{_libdir}/libyelp.so.0*
%dir %{_libdir}/yelp %dir %{_libdir}/yelp
%dir %{_libdir}/yelp/web-extensions %dir %{_libdir}/yelp/web-extensions
%{_libdir}/yelp/web-extensions/libyelpwebextension.so %{_libdir}/yelp/web-extensions/libyelpwebextension.so
@ -100,6 +93,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop
%changelog %changelog
* Sun Feb 28 2021 Kalev Lember <klember@redhat.com> - 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 <klember@redhat.com> - 2:40~beta-1 * Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 2:40~beta-1
- Update to 40.beta - Update to 40.beta