https://bugzilla.rpmfusion.org/show_bug.cgi?id=3853
--- Comment #16 from Sérgio Basto <sergio(a)serjux.com> 2016-01-05 03:28:11 CET ---
(In reply to comment #12)
(In reply to comment #11)
> 6 commits ?, can't you do it in one commit ?
> Please do:
> git rebase -i HEAD~6
> modify last 5 commits from pick to squash, compose the commit message and save
> it, after rebase done, please do:
> git push --force
>
> And F22 do you want also update it ? if so I need another pull request (from
> f22 to f22) and finally package maintainer (fas userename is churchyard) agree
> with it ?
>
> Thanks.
Ok, ready pull request for master and f22 in one commit.
btw after update master, you just have do
git checkout f22; git merge master ; git push
if you want do the same commit, now to fix it you may do :
git checkout f22;
git reset HEAD~1 --hard
git merge master
git push --force
git checkout master
anyway mpv doesn't built in F22 and F23 ends with :
RPM build errors:
error: Installed (but unpackaged) file(s) found:
/usr/share/icons/hicolor/scalable/apps/mpv-gradient.svg
/usr/share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
File listed twice: /usr/share/doc/mpv/example.conf
File listed twice: /usr/share/doc/mpv/input.conf
File listed twice: /usr/share/doc/mpv/mplayer-input.conf
File listed twice: /usr/share/doc/mpv/restore-old-bindings.conf
Installed (but unpackaged) file(s) found:
/usr/share/icons/hicolor/scalable/apps/mpv-gradient.svg
/usr/share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
ERROR: Exception(./mpv-0.14.0-1.fc23.src.rpm) Config(fedora-22-x86_64) 3
minutes 22 seconds
--
Configure bugmail:
https://bugzilla.rpmfusion.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.