[opensuse-buildservice] Re: Request 329144 created by dimstar_suse (submit openSUSE:Factory/tevent)
Hi Dominique, On Fri, Sep 04, 2015 at 04:30:05PM +0200, Dominique Leuenberger wrote:
Visit https://build.opensuse.org/request/show/329144
Actions: - submit network:samba:STABLE/tevent => openSUSE:Factory/tevent
changes files: --------------
++++++ new changes file: --- tevent-man.changes +++ tevent-man.changes
This split causes an minor issue to the network:samba:STABLE/tevent/ tevent.spec file. In the header we there now have too: # # spec file for package tevent-man # I've already tried to remove the unintended -man suffix in the tevent.spec file. But after the commit some OBS magic modifies the header again. Cheers, Lars -- Lars Müller [ˈlaː(r)z ˈmʏlɐ] Samba Team + SUSE Labs SUSE Linux, Maxfeldstraße 5, 90409 Nürnberg, Germany
Lars Müller
This split causes an minor issue to the network:samba:STABLE/tevent/ tevent.spec file. In the header we there now have too:
# # spec file for package tevent-man #
I've already tried to remove the unintended -man suffix in the tevent.spec file. But after the commit some OBS magic modifies the header again.
%if %{build_man} Name: %{_name}-man BuildRequires: doxygen %else format_spec_file will always see the first Name. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Mon, 2015-09-07 at 14:45 +0200, Lars Mueller wrote:
++++++ new changes file: --- tevent-man.changes +++ tevent-man.changes
This split causes an minor issue to the network:samba:STABLE/tevent/ tevent.spec file. In the header we there now have too:
# # spec file for package tevent-man #
That seems to be one of the source services (likely format_spec_file) to do some magic which it is not supposed to do. In most such cases I've actually seen the 'main' package name being used across all .spec files. And I checked: it IS the format_spec_file service:
osc diff | cat Index: tevent.spec =================================================================== --- tevent.spec (revision bc4333a2aca0e590b02092cb03e94756) +++ tevent.spec (working copy) @@ -1,5 +1,5 @@ # -# spec file for package tevent-man +# spec file for package tevent # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. #
osc service lr format_spec_file osc diff | cat
I'll rise a ticket on github against that source service; as it's only a comment (that is, to my knowledge, not used anywhere), it should hopefully not cause strange side-effects. Dominique -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
Hi Dominique, On Mon, Sep 07, 2015 at 02:55:21PM +0200, Dominique Leuenberger / DimStar wrote:
On Mon, 2015-09-07 at 14:45 +0200, Lars Mueller wrote:
++++++ new changes file: --- tevent-man.changes +++ tevent-man.changes
This split causes an minor issue to the network:samba:STABLE/tevent/ tevent.spec file. In the header we there now have too:
# # spec file for package tevent-man #
That seems to be one of the source services (likely format_spec_file) to do some magic which it is not supposed to do.
In most such cases I've actually seen the 'main' package name being used across all .spec files.
The tevent spec was quite "clean" till someone modified it recently. ;)
And I checked: it IS the format_spec_file service:
osc diff | cat Index: tevent.spec =================================================================== --- tevent.spec (revision bc4333a2aca0e590b02092cb03e94756) +++ tevent.spec (working copy) @@ -1,5 +1,5 @@ # -# spec file for package tevent-man +# spec file for package tevent # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. #
osc service lr format_spec_file osc diff | cat
I'll rise a ticket on github against that source service; as it's only a comment (that is, to my knowledge, not used anywhere), it should hopefully not cause strange side-effects.
Thanks! I've tried to modify the spec to have %if %{build_man} == 0 Name: %{_name} ... to reverse the logic as suggested by Andreas - if I had been able to read his comment correct. But this approach leads to two errors: (E) signature /home/lmuelle/opensuse/network:samba:STABLE/tevent/tevent-0.9.25.tar.asc does not validate ERROR: tevent.changes not a subpackage, please remove After your reply I keep it as it is. :-) Cheers, Lars -- Lars Müller [ˈlaː(r)z ˈmʏlɐ] Samba Team + SUSE Labs SUSE Linux, Maxfeldstraße 5, 90409 Nürnberg, Germany
On Mon, 2015-09-07 at 15:16 +0200, Lars Mueller wrote:
Hi Dominique,
On Mon, Sep 07, 2015 at 02:55:21PM +0200, Dominique Leuenberger / DimStar wrote:
On Mon, 2015-09-07 at 14:45 +0200, Lars Mueller wrote:
++++++ new changes file: --- tevent-man.changes +++ tevent-man.changes
This split causes an minor issue to the network:samba:STABLE/tevent/ tevent.spec file. In the header we there now have too:
# # spec file for package tevent-man #
That seems to be one of the source services (likely format_spec_file) to do some magic which it is not supposed to do.
In most such cases I've actually seen the 'main' package name being used across all .spec files.
The tevent spec was quite "clean" till someone modified it recently. ;)
Yeah; me me me... doxygen has been a pain for a while already.. and this only, because they decided to switch to cmake as their build system; how stupid can it get. If you really mind the comment in the .spec file, we can change the pre_checkin.sh to update the Name: field in the spec and not have this conditionally set based on build_man... this would be another option of course (attached patch should be able to handle it) Dominique
Dominique Leuenberger / DimStar
Index: pre_checkin.sh =================================================================== --- pre_checkin.sh (revision bc4333a2aca0e590b02092cb03e94756) +++ pre_checkin.sh (working copy) @@ -1,4 +1,4 @@ #!/bin/bash
-sed 's/%define.*build_man.*0/%define build_man 1/' tevent.spec > tevent-man.spec +sed -e 's/%define.*build_man.*0/%define build_man 1/' -e 's/^Name:.*%{_name}$/Name: %{_name}-man/' tevent.spec > tevent-man.spec cp tevent.changes tevent-man.changes Index: tevent-man.spec =================================================================== --- tevent-man.spec (revision bc4333a2aca0e590b02092cb03e94756) +++ tevent-man.spec (working copy) @@ -22,11 +22,10 @@ %define build_man 1 %define _name tevent
+Name: %{_name}-man
There should be no need for _name any more. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
participants (4)
-
Andreas Schwab
-
Dominique Leuenberger / DimStar
-
Lars Mueller
-
Lars Müller