jds SVN: spec-files

[Brian Cameron]

Laca:

I think you misunderstand.  This checking got broken when we moved
patches from Solaris/patches to spec-file/patches.  Previously we were
patching the code in the SUNWgnome-session.spec file instead of 
gnome-session.spec.  This patch was only being applied when HAL was
not enabled since we only ship gnome-volcheck if HAL isn't being used.
We don't ship gnome-volcheck anymore since HAL has gone in.

The problem was that after this patch was moved to the
gnome-session.spec file, we started applying the patch all the time.  So
you in GNOME 2.19 you will incorrectly see a gnome-volcheck entry in
your /usr/share/gnome/default.session file.  This obviously does nothing
since we don't ship this program anymore.

Therefore the "%if %with_hal" checking has been likewise moved to the
gnome-session.spec, so now this patch should only get applied when HAL
is not installed.

This is the behavior we want, so I think Irene did the right thing here.

Brian

>>         * SUNWgnome-session.spec: Remove %if %with_hal, since it is no use.
>>         * base-specs/gnome-session.spec: %if %with_hal then do not apply patch7,
>>         volcheck.diff so that this patch will not be applied when HAL is enabled.
>>         Also modify the source path so that the source can be found.
> 
> I'd like to keep the %with_hal stuff around please.
> It's very useful if you try to build JDS on Solaris 10, which
> is possible if you upgrade a few libs like Xft and fontconfig and
> disable HAL support in GNOME.
> 
> Laca
> 
>