Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/libfm

This commit is contained in:
Mamoru TASAKA 2017-02-08 15:44:50 +09:00
commit b4931f71b3

View File

@ -9,7 +9,7 @@
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
%global usegit 0
%global mainrel 1
%global mainrel 2
%global githash ab583d7800bbc308f2852384f87c2357f49b01cd
%global shorthash %(TMP=%githash ; echo ${TMP:0:10})
%global gitdate Fri, 9 Dec 2016 01:44:54 +0200
@ -269,6 +269,7 @@ do
done
# GTK2
%if ! 0%{?bootstrap}
%if 0%{?fedora} >= 22
pushd INSTDIR-gtk2
@ -285,6 +286,7 @@ cp -a ./%{_libdir}/libfm/modules/gtk/ \
$RPM_BUILD_ROOT%{_libdir}/libfm/modules/
popd
%endif
%endif
/usr/lib/rpm/check-rpaths
@ -397,6 +399,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%endif
%changelog
* Mon Feb 6 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.5-2
- spec file fix for bootstrap mode on fedora (bug 1419338)
* Sun Dec 11 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.5-1
- 1.2.5 released.