Update to the latest master (with 2 patch from 1.2)

This commit is contained in:
Mamoru TASAKA 2016-12-11 00:29:17 +09:00
parent 28c4bbc29a
commit 7fbd9d46a6
3 changed files with 9 additions and 5 deletions

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ libfm-0.1.12.tar.gz
/libfm-1.2.4-D20161105gitc2989af0154256c35c5def4b9f5a758c8a3878ca.tar.gz
/libfm-1.2.4-D20161204git275559f196db6340d4ae6119a10d9b0efedaf84f.tar.gz
/libfm-1.2.4-D20161206gita24389f804ae95f737bbb4239be00bc99a62180b.tar.gz
/libfm-1.2.4-D20161209gitab583d7800bbc308f2852384f87c2357f49b01cd.tar.gz

View File

@ -9,11 +9,11 @@
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
%global usegit 1
%global mainrel 12
%global githash a24389f804ae95f737bbb4239be00bc99a62180b
%global mainrel 13
%global githash ab583d7800bbc308f2852384f87c2357f49b01cd
%global shorthash %(TMP=%githash ; echo ${TMP:0:10})
%global gitdate Tue, 6 Dec 2016 00:32:28 +0200
%global gitdate_num 20161206
%global gitdate Fri, 9 Dec 2016 01:44:54 +0200
%global gitdate_num 20161209
%if 0%{?usegit} >= 1
%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash}
@ -402,6 +402,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%endif
%changelog
* Sun Dec 11 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.4-13.D20161209gitab583d7800
- Update to the latest master (with 2 patch from 1.2)
* Wed Dec 7 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.4-12.D20161206gita24389f804
- Update to the latest master (with 2 patch from 1.2)

View File

@ -1 +1 @@
65cceafd08cb243d369935f2bd8f4a02 libfm-1.2.4-D20161206gita24389f804ae95f737bbb4239be00bc99a62180b.tar.gz
871987509c119113984f0b86882f1a33 libfm-1.2.4-D20161209gitab583d7800bbc308f2852384f87c2357f49b01cd.tar.gz