Laca:
> I'd prefer the default branding to be no branding, i.e. vanilla GNOME.
I have also been bitten a few times by building a module and not
realizing I need to pass in the right branding flag.
In my opinion, it might be nicer if pkgtool checked if you are running
JDS versus Indiana and set the default flag to whatever you are actually
using, rather than defaulting to no-branding.
Brian
> I've just committed this:
>
> Index: base-specs/libgnome.spec
> ===================================================================
> --- base-specs/libgnome.spec (revision 12983)
> +++ base-specs/libgnome.spec (working copy)
> @@ -82,8 +82,14 @@
>
> %prep
> %setup -q
> +%if %option_with_sun_branding
> %patch1 -p1
> %patch2 -p1
> +%endif
> +%if %option_with_indiana_branding
> +%patch1 -p1
> +%patch2 -p1
> +%endif
> %patch3 -p1
> %patch4 -p1
>
> @@ -180,6 +186,9 @@
> %{_mandir}/man7/*
>
> %changelog
> +* Mon Feb 11 2008 - laca at sun.com
> +- do not apply patches 1 or 2 (branding patches) if neither Sun nor
> Indiana
> + branding is selected
> * Mon Jan 28 2008 - damien.carbery at sun.com
> - Bump to 2.21.90.
> * Fri Jan 18 2007 - glynn.foster at sun.com
>
> I verified that "prep" completes in all 3 valid cases (Sun branding,
> Indiana branding, no branding).
>
> Laca
>
> On Sat, 2008-02-09 at 22:59 +0100, Patrick Ale wrote:
>> Hello all :)
>>
>> Is it possible to make a default definition in the options.inc
>> regarding branding?
>> At this moment the "Quick start" on the project side fails the installation.
>>
>> The reason for this is an %if block in libgnome.spec that loads a
>> patch based on what branding you use. Not giving the branding per
>> --with option leads to an error.
>>
>>
>> Summary:
>>
>> package | status | details
>> ---------------------------------+-------------+-------------------------------
>> SUNWgnome-libs.spec | ERROR |
>> SUNWgnome-libs.spec(17): libgnome.spec(85): ERROR: no such patch:
>> Patch1
>>
>>
>>
>> Alternatively, when no default branding can be specified due to
>> political reasons or something like this, we could change the
>> documentation on the project page a bit.
>>
>>
>> --
>> Now build the entire stack -
>>
>> jdsuser at jdsbuild:~> pkgtool --download build -v *.spec
>> --
>>
>>
>> Could read something like:
>>
>> --
>> Now build the entire stack. Choose whether you'd like to use the Sun
>> branding or the Indiana branding and specify this with either --with
>> sun-branding or --with indiana-branding.
>>
>> jdsuser at jdsbuild-> pkgtool --dowwnload --with sun-branding build -v *.spec
>> --
>>
>>
>>
>> --
>> Patrick
>
