Changeset 18681

Show
Ignore:
Timestamp:
04/14/06 19:31:56 (3 years ago)
Author:
patrick
Message:

The %{release} macro is not behaving in %prep. It is just as broken as
%{version} was, so make the same name change (to %{global_release}).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/release/vrjuggler.spec

    r18680 r18681  
    22%define name vrjuggler 
    33%define global_version 2.1.7 
    4 %define release        1 
     4%define global_release 1 
    55 
    66%define vpr_version 1.1.17 
    7 %define vpr_release %{release} 
     7%define vpr_release %{global_release} 
    88%define tweek_version 1.1.3 
    9 %define tweek_release %{release} 
     9%define tweek_release %{global_release} 
    1010%define jccl_version 1.1.3 
    11 %define jccl_release %{release} 
     11%define jccl_release %{global_release} 
    1212%define sonix_version 1.1.2 
    13 %define sonix_release %{release} 
     13%define sonix_release %{global_release} 
    1414%define gadgeteer_version 1.1.7 
    15 %define gadgeteer_release %{release} 
     15%define gadgeteer_release %{global_release} 
    1616%define vrjuggler_version %{global_version} 
    17 %define vrjuggler_release %{release} 
     17%define vrjuggler_release %{global_release} 
    1818 
    1919# JDK 1.5.0 is the lowest version with native support for the x86_64 
    …… 
    4040Summary: VR Juggler is the virtual platform for VR application development 
    4141Version: %{global_version} 
    42 Release: %{release} 
    43 Source: %{name}-%{global_version}-%{release}.src.tar.bz2 
     42Release: %{global_release} 
     43Source: %{name}-%{global_version}-%{global_release}.src.tar.bz2 
    4444URL: http://www.vrjuggler.org/ 
    4545Group: Development/Libraries 
    46 BuildRoot: %{_tmppath}/%{name}-%{global_version}-%{release}-buildroot 
     46BuildRoot: %{_tmppath}/%{name}-%{global_version}-%{global_release}-buildroot 
    4747License: LGPL 
    4848Requires: vpr = %{vpr_version}-%{vpr_release} 
    …… 
    454454rm -rf %{buildroot} 
    455455# For now don't keep unpacking 
    456 %setup -q -n %{name}-%{global_version}-%{release}.src 
    457 #%setup -DT -q -n %{name}-%{global_version}-%{release}.src 
     456%setup -q -n %{name}-%{global_version}-%{global_release}.src 
     457#%setup -DT -q -n %{name}-%{global_version}-%{global_release}.src 
    458458./configure.pl --with-boost=/usr --with-boost-includes=/usr/include     \ 
    459459               --with-gmtl=/usr --with-openal=/usr --with-audiere=/usr  \