diff --git a/libv4l.spec b/libv4l.spec index ceece47..9fabcd7 100644 --- a/libv4l.spec +++ b/libv4l.spec @@ -1,6 +1,6 @@ Name: libv4l -Version: 1.26.0 -Release: 1mamba +Version: 1.26.1 +Release: 2mamba Summary: Collection of video4linux support libraries Group: System/Libraries Vendor: openmamba @@ -89,16 +89,11 @@ QT video capture tool. [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %meson_install -:<< __OLD -mkdir -p %{buildroot}%{_datadir}/applications - -desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps -install -pm 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -__OLD - %find_lang %{name} --all-name +# Conflicting with glibc +rm -f %{buildroot}%{_libdir}/gconv/gconv-modules + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -114,6 +109,11 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +# regenerate iconv cache +iconvconfig +: + %posttrans -n qv4l2 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -132,6 +132,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libv4l/ov518-decomp %{_libdir}/libv4l/v4l1compat.so %{_libdir}/libv4l/v4l2convert.so +%{_libdir}/gconv/ARIB-STD-B24.so +%{_libdir}/gconv/EN300-468-TAB00.so %doc COPYING %files devel @@ -144,9 +146,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libv4lconvert.so %{_libdir}/libdvbv5.so %{_libdir}/libv4l2rds.so -%{_libdir}/gconv/ARIB-STD-B24.so -%{_libdir}/gconv/EN300-468-TAB00.so -%{_libdir}/gconv/gconv-modules %{_libdir}/pkgconfig/libv4l1.pc %{_libdir}/pkgconfig/libv4l2.pc %{_libdir}/pkgconfig/libv4lconvert.pc @@ -219,6 +218,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Dec 13 2023 Silvan Calarco 1.26.1-2mamba +- bump release to ensure updating from a previous build + +* Wed Dec 13 2023 Silvan Calarco 1.26.1-1mamba +- update to 1.26.1 + +* Wed Dec 13 2023 Silvan Calarco 1.26.0-2mamba +- remove %_libdir/gconv-modules conflicting with glibc; run iconvconfig on install + * Fri Dec 08 2023 Silvan Calarco 1.26.0-1mamba - update to 1.26.0