Sources could not be expanded: conflict in file xflr5.spec

Hi everyone,

I’m trying to update the following package from version 6.14 to 6.30
https://build.opensuse.org/package/show/science/xflr5

Everything goes well in my home project and locally using osc, however there is this annoying message
Sources could not be expanded: conflict in file xflr5.spec
without any explanation

I’m running of ideas of things to try.

Any help will be welcome.

On Sat 05 Nov 2016 08:46:01 AM CDT, techwinder wrote:

Hi everyone,

I’m trying to update the following package from version 6.14 to 6.30
Show science / xflr5 - openSUSE Build Service

Everything goes well in my home project and locally using osc, however
there is this annoying message
-Sources could not be expanded: conflict in file xflr5.spec-
without any explanation

I’m running of ideas of things to try.

Any help will be welcome.

Hi
This looks resolved on OBS?

A couple of comments, you should look at adding the rpm optflags to the
build eg;


cat > .qmake.cache <<EOF
QMAKE_CFLAGS_RELEASE = "%{optflags}"
QMAKE_CXXFLAGS_RELEASE = "%{optflags}"
EOF

In the line where you have # Source0 the for example %{name} should be
%%{name} to stop rpmlint from thinking it’s an unused macro.


Cheers Malcolm °¿° LFCS, SUSE Knowledge Partner (Linux Counter #276890)
openSUSE Leap 42.1|GNOME 3.16.2|4.1.34-33-default
If you find this post helpful and are logged into the web interface,
please show your appreciation and click on the star below… Thanks!

This looks resolved on OBS?

Er… no; still the same message

Did the two mods to the spec file, although I must admit I have no idea what this does.

This means project from which you branched has overlapping changes since then. You need to do local “osc pull”, resolve conflicts and commit results back to your project. Of course you always can display unmerged sources in OBS, but you won’t be able to submit request in such state.

Thanks, it is fixed now.