File conflict when upgrading package

[Sandro Mani <manisandro@xxxxxxxxx>]

Hi,

There was an incorrect desktop-file-install call in a package I maintain, i.e.

desktop-file-install --dir=%{buildroot}%{_datadir}/applications/%{name}.desktop %{SOURCE1}

which caused the .desktop file to get installed to

/usr/share/applications/%{name}.desktop/%{name}.desktop

I fixed the syntax (by removing the %{name}.desktop part), but now when upgrading the package I get

Transaction check error:
  file /usr/share/applications/xflr5.desktop from install of xflr5-6.09.05-5.fc21.x86_64 conflicts with file from package xflr5-6.09.05-4.fc21.x86_64

How can I make the update work smoothly? I tried explicitly specifying Conflicts: xflr5 < 5.09.05-5, but it did not help.

Thanks,
Sandro

-- 
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct