Changeset 20444

Show
Ignore:
Timestamp:
07/05/07 07:59:22 (1 year ago)
Author:
patrick
Message:

MFT r20436: Separate the Tweek flagpoll bits into separate files for the three

different Tweek APIs. This is done so that the tweek-java RPM
package does not have to depend on tweek-c++-devel in order to be
used.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/build_windows.py

    r20363 r20444  
    670670                             'TWEEK_VERSION', tweek_subst_vars, 
    671671                             [(r'tweek\tweekParam.h',), ('tweek.fpc',), 
     672                              ('tweek-java.fpc',), ('tweek-python.fpc',), 
    672673                              (r'tweek\version.rc', 
    673674                               os.path.join(gJugglerDir, 'version.rc.in'))])) 
    …… 
    11161117   destdir = os.path.join(prefix, 'lib', 'flagpoll') 
    11171118   smartCopy(os.path.join(buildDir, 'Tweek_CXX', 'tweek.fpc'), destdir) 
     1119   smartCopy(os.path.join(buildDir, 'Tweek_CXX', 'tweek-java.fpc'), destdir) 
     1120   smartCopy(os.path.join(buildDir, 'Tweek_CXX', 'tweek-python.fpc'), destdir) 
    11181121 
    11191122   destdir = os.path.join(prefix, 'share', 'tweek', 'test') 
    …… 
    14391442   srcroot = os.path.join(buildDir, 'Gadgeteer') 
    14401443 
    1441    drivers = ['DTrack', 'DataGlove', 'DirectXJoystick', 'Ether24', 
     1444   drivers = ['DTrack', 'DataGlove', 'X-IST', 'DirectXJoystick', 'Ether24', 
    14421445              'Fastrak', 'Flock', 'IBox', 'IntersenseAPI', 'IS900', 
    14431446              'MotionStar', 'MSFTSpeechRecognition', 'PinchGlove', 

  • juggler/branches/2.2/macros/tweek.m4

    r19729 r20444  
    3131[ 
    3232    dnl Get the cflags and libraries from flagpoll 
    33     AC_ARG_WITH(tweek-meta-file, 
    34                 [  --with-tweek-meta-file=<PATH> 
     33    AC_ARG_WITH(tweek-cxx-meta-file, 
     34                [  --with-tweek-cxx-meta-file=<PATH> 
    3535                          Flagpoll metadata file for 
    36                           Tweek (optional)                [No default]], 
    37                 [tweek_meta_file="$withval"], [tweek_meta_file=""]) 
    38  
    39     dnl See if the user specified where to find the Tweek meta file. If not, 
    40     dnl take a guess. 
    41     if test "x$tweek_meta_file" != "x" ; then 
    42         tweek_meta_dir=`dirname $tweek_meta_file` 
    43         tweek_flagpoll_args="--extra-paths=$tweek_meta_dir tweek --from-file=$tweek_meta_file" 
     36                          Tweek C++ API (optional)        [No default]], 
     37                [tweek_cxx_meta_file="$withval"], [tweek_cxx_meta_file=""]) 
     38    AC_ARG_WITH(tweek-java-meta-file, 
     39                [  --with-tweek-java-meta-file=<PATH> 
     40                          Flagpoll metadata file for 
     41                          Tweek Java API (optional)       [No default]], 
     42                [tweek_java_meta_file="$withval"], [tweek_java_meta_file=""]) 
     43 
     44    dnl See if the user specified where to find the Tweek C++ API meta file. 
     45    dnl If not, take a guess. 
     46    if test "x$tweek_cxx_meta_file" != "x" ; then 
     47        tweek_cxx_meta_dir=`dirname $tweek_cxx_meta_file` 
     48        tweek_cxx_flagpoll_args="--extra-paths=$tweek_cxx_meta_dir tweek --from-file=$tweek_cxx_meta_file" 
    4449    elif test -f "$instlinks/share/flagpoll/tweek.fpc" ; then 
    45         tweek_meta_dir="$instlinks/share/flagpoll" 
    46         tweek_flagpoll_args="--extra-paths=$tweek_meta_dir tweek --from-file=$tweek_meta_dir/tweek.fpc" 
     50        tweek_cxx_meta_dir="$instlinks/share/flagpoll" 
     51        tweek_cxx_flagpoll_args="--extra-paths=$tweek_cxx_meta_dir tweek --from-file=$tweek_cxx_meta_dir/tweek.fpc" 
    4752    else 
    48         tweek_flagpoll_args="tweek" 
     53        tweek_cxx_flagpoll_args="tweek" 
     54    fi 
     55 
     56    dnl See if the user specified where to find the Tweek Java API meta file. 
     57    dnl If not, take a guess. 
     58    if test "x$tweek_java_meta_file" != "x" ; then 
     59        tweek_java_meta_dir=`dirname $tweek_java_meta_file` 
     60        tweek_java_flagpoll_args="--extra-paths=$tweek_java_meta_dir tweek-java --from-file=$tweek_java_meta_file" 
     61    elif test -f "$instlinks/share/flagpoll/tweek.fpc" ; then 
     62        tweek_java_meta_dir="$instlinks/share/flagpoll" 
     63        tweek_java_flagpoll_args="--extra-paths=$tweek_java_meta_dir tweek-java --from-file=$tweek_java_meta_dir/tweek-java.fpc" 
     64    else 
     65        tweek_java_flagpoll_args="tweek-java" 
     66    fi 
     67 
     68    dnl See if the user specified where to find the Tweek Python API meta 
     69    dnl file. If not, take a guess. 
     70    if test "x$tweek_python_meta_file" != "x" ; then 
     71        tweek_python_meta_dir=`dirname $tweek_python_meta_file` 
     72        tweek_python_flagpoll_args="--extra-paths=$tweek_python_meta_dir tweek-python --from-file=$tweek_python_meta_file" 
     73    elif test -f "$instlinks/share/flagpoll/tweek.fpc" ; then 
     74        tweek_python_meta_dir="$instlinks/share/flagpoll" 
     75        tweek_python_flagpoll_args="--extra-paths=$tweek_python_meta_dir tweek-python --from-file=$tweek_python_meta_dir/tweek-python.fpc" 
     76    else 
     77        tweek_python_flagpoll_args="tweek-python" 
    4978    fi 
    5079 
    …… 
    6998   DPP_PREREQ([2.0.1]) 
    7099 
    71    if test "x$tweek_flagpoll_args" = "x" ; then 
     100   if test "x$tweek_cxx_flagpoll_args" = "x" ; then 
    72101      _TWEEK_PATH_SETUP() 
    73102   fi 
    …… 
    76105      ifelse([$3], , :, [$3]) 
    77106   else 
    78       TWEEK_VERSION=`$FLAGPOLL $tweek_flagpoll_args --modversion` 
     107      TWEEK_VERSION=`$FLAGPOLL $tweek_cxx_flagpoll_args --modversion` 
    79108 
    80109      min_tweek_version=ifelse([$1], ,0.0.1,[$1]) 
    …… 
    99128AC_DEFUN([TWEEK_PATH_CXX], 
    100129[ 
    101    if test "x$tweek_flagpoll_args" = "x" ; then 
     130   if test "x$tweek_cxx_flagpoll_args" = "x" ; then 
    102131      _TWEEK_PATH_SETUP() 
    103132   fi 
    …… 
    116145      ifelse([$3], , :, [$3]) 
    117146   else 
    118       if ! (eval $FLAGPOLL $tweek_flagpoll_args --modversion >/dev/null 2>&1) 
     147      if ! (eval $FLAGPOLL $tweek_cxx_flagpoll_args --modversion >/dev/null 2>&1) 
    119148      then 
    120149         AC_MSG_ERROR([*** Flagpoll has no valid Tweek configuration ***]) 
    …… 
    122151      else 
    123152         AC_MSG_CHECKING([whether Tweek C++ API is available]) 
    124          has_cxx=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-api-available` 
     153         has_cxx=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-cxx-api-available` 
    125154 
    126155         if test "x$has_cxx" = "xY" ; then 
    …… 
    133162 
    134163            if test "x$tweek_version_okay" = "xyes" ; then 
    135                TWEEK_CXXFLAGS=`$FLAGPOLL $tweek_flagpoll_args --cflags` 
    136                TWEEK_LIBS=`$FLAGPOLL $tweek_flagpoll_args --libs` 
    137                TWEEK_EXTRA_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-extra-libs` 
    138                TWEEK_PROF_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-profiled_libs` 
    139                TWEEK_LIBS_STATIC=`$FLAGPOLL $tweek_flagpoll_args --get-static-libs` 
    140                TWEEK_PROF_LIBS_STATIC_LD=`$FLAGPOLL $tweek_flagpoll_args --get-profiled-static-libs` 
    141  
    142                TWEEK_CXX_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idl` 
    143                TWEEK_CXX_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlflags` 
    144                TWEEK_CXX_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlgendir` 
    145                TWEEK_CXX_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlincflag` 
     164               TWEEK_CXXFLAGS=`$FLAGPOLL $tweek_cxx_flagpoll_args --cflags` 
     165               TWEEK_LIBS=`$FLAGPOLL $tweek_cxx_flagpoll_args --libs` 
     166               TWEEK_EXTRA_LIBS=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-extra-libs` 
     167               TWEEK_PROF_LIBS=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-profiled_libs` 
     168               TWEEK_LIBS_STATIC=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-static-libs` 
     169               TWEEK_PROF_LIBS_STATIC_LD=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-profiled-static-libs` 
     170 
     171               TWEEK_CXX_IDL=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-cxx-idl` 
     172               TWEEK_CXX_IDL_OPTS=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-cxx-idlflags` 
     173               TWEEK_CXX_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-cxx-idlgendir` 
     174               TWEEK_CXX_IDL_INCFLAG=`$FLAGPOLL $tweek_cxx_flagpoll_args --get-cxx-idlincflag` 
    146175 
    147176               ifelse([$2], , :, [$2]) 
    …… 
    179208AC_DEFUN([TWEEK_PATH_JAVA], 
    180209[ 
    181    if test "x$tweek_flagpoll_args" = "x" ; then 
     210   if test "x$tweek_java_flagpoll_args" = "x" ; then 
    182211      _TWEEK_PATH_SETUP() 
    183212   fi 
    …… 
    193222      ifelse([$3], , :, [$3]) 
    194223   else 
    195       if ! (eval $FLAGPOLL $tweek_flagpoll_args --modversion >/dev/null 2>&1) 
     224      if ! (eval $FLAGPOLL $tweek_java_flagpoll_args --modversion >/dev/null 2>&1) 
    196225      then 
    197226         AC_MSG_ERROR([*** Flagpoll has no valid Tweek configuration ***]) 
    …… 
    199228      else 
    200229         AC_MSG_CHECKING([whether Tweek Java API is available]) 
    201          has_java=`$FLAGPOLL $tweek_flagpoll_args --get-java-api-available` 
     230         has_java=`$FLAGPOLL $tweek_java_flagpoll_args --get-java-api-available` 
    202231 
    203232         if test "x$has_java" = "xY" ; then 
    …… 
    210239 
    211240            if test "x$tweek_version_okay" = "xyes" ; then 
    212                TWEEK_JAVA_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-java-idl` 
    213                TWEEK_JAVA_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlflags` 
    214                TWEEK_JAVA_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlgendir` 
    215                TWEEK_JAVA_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlincflag` 
    216                TWEEK_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-jars` 
    217                TWEEK_EXT_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars` 
     241               TWEEK_JAVA_IDL=`$FLAGPOLL $tweek_java_flagpoll_args --get-java-idl` 
     242               TWEEK_JAVA_IDL_OPTS=`$FLAGPOLL $tweek_java_flagpoll_args --get-java-idlflags` 
     243               TWEEK_JAVA_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_java_flagpoll_args --get-java-idlgendir` 
     244               TWEEK_JAVA_IDL_INCFLAG=`$FLAGPOLL $tweek_java_flagpoll_args --get-java-idlincflag` 
     245               TWEEK_JARS=`$FLAGPOLL $tweek_java_flagpoll_args --get-jars` 
     246               TWEEK_EXT_JARS=`$FLAGPOLL $tweek_java_flagpoll_args --get-ext-jars` 
    218247 
    219248               ifelse([$2], , :, [$2]) 
    …… 
    245274AC_DEFUN([TWEEK_PATH_PYTHON], 
    246275[ 
    247    if test "x$tweek_flagpoll_args" = "x" ; then 
     276   if test "x$tweek_python_flagpoll_args" = "x" ; then 
    248277      _TWEEK_PATH_SETUP() 
    249278   fi 
    …… 
    258287   else 
    259288      AC_MSG_CHECKING([whether Tweek Python API is available]) 
    260       has_java=`$FLAGPOLL $tweek_flagpoll_args --get-python-idl-available` 
     289      has_java=`$FLAGPOLL $tweek_python_flagpoll_args --get-python-idl-available` 
    261290 
    262291      if test "x$has_java" = "xY" ; then 
    …… 
    269298 
    270299         if test "x$tweek_version_okay" = "xyes" ; then 
    271             TWEEK_PYTHON_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-python-idl` 
    272             TWEEK_PYTHON_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args ---get-python-idlflags` 
    273             TWEEK_PYTHON_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-python-idlgendir` 
    274             TWEEK_PYTHON_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-python-idlincflag` 
    275             TWEEK_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-jars` 
    276             TWEEK_EXT_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars` 
     300            TWEEK_PYTHON_IDL=`$FLAGPOLL $tweek_python_flagpoll_args --get-python-idl` 
     301            TWEEK_PYTHON_IDL_OPTS=`$FLAGPOLL $tweek_python_flagpoll_args ---get-python-idlflags` 
     302            TWEEK_PYTHON_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_python_flagpoll_args --get-python-idlgendir` 
     303            TWEEK_PYTHON_IDL_INCFLAG=`$FLAGPOLL $tweek_python_flagpoll_args --get-python-idlincflag` 
     304            TWEEK_JARS=`$FLAGPOLL $tweek_python_flagpoll_args --get-jars` 
     305            TWEEK_EXT_JARS=`$FLAGPOLL $tweek_python_flagpoll_args --get-ext-jars` 
    277306 
    278307            ifelse([$2], , :, [$2]) 

  • juggler/branches/2.2/modules/tweek/Makefile.inc.in

    r20363 r20444  
    328328          $(EXTRA_INSTALL_ARGS) $(topdir)/tweek.fpc                     \ 
    329329          $(instlinks)/share/flagpoll/tweek.fpc 
     330ifndef NO_JAVA 
     331ifeq ($(BUILD_JAVA), Y) 
     332        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \ 
     333          $(EXTRA_INSTALL_ARGS) $(topdir)/tweek-java.fpc                \ 
     334          $(instlinks)/share/flagpoll/tweek-java.fpc 
     335endif 
     336endif 
     337        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \ 
     338          $(EXTRA_INSTALL_ARGS) $(topdir)/tweek-python.fpc              \ 
     339          $(instlinks)/share/flagpoll/tweek-python.fpc 
    330340ifdef BUILD_TYPE 
    331341        $(MAKE) links-$(BUILD_TYPE) 
    …… 
    449459          $(topdir)/tweek.fpc                                           \ 
    450460          $(libdir)$(LIBBITSUF)/flagpoll/tweek-$(VERSION_DOT).$(PLATFORM).$(ISA).fpc 
     461ifndef NO_JAVA 
     462ifeq ($(BUILD_JAVA), Y) 
     463        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \ 
     464          $(topdir)/tweek-java.fpc                                      \ 
     465          $(libdir)$(LIBBITSUF)/flagpoll/tweek-java-$(VERSION_DOT).$(PLATFORM).noarch.fpc 
     466endif 
     467endif 
     468        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \ 
     469          $(topdir)/tweek-python.fpc                                    \ 
     470          $(libdir)$(LIBBITSUF)/flagpoll/tweek-python-$(VERSION_DOT).$(PLATFORM).noarch.fpc 
    451471 
    452472PREINSTALL_HEADERS=     pre-install-headers 

  • juggler/branches/2.2/modules/tweek/configure.ac

    r20301 r20444  
    14521452AC_CONFIG_FILES([ 
    14531453   tweek.fpc 
     1454   tweek-java.fpc 
     1455   tweek-python.fpc 
    14541456   Makefile 
    14551457   Makefile.inc 

  • juggler/branches/2.2/modules/tweek/tweek.fpc.in

    r19569 r20444  
    1717data_subdir = @data_subdir@ 
    1818 
    19 config_java_idl = @config_java_idl@ 
    2019CXX_IDL_CMD = @CXX_IDL_CMD@ 
    21 PYTHON_IDL = @PYTHON_IDL@ 
    22 tweek_idlflags_java = @tweek_idlflags_java@ 
    2320tweek_idlflags_cxx = @tweek_idlflags_cxx@ 
    24 tweek_idlflags_python = @tweek_idlflags_python@ 
    25 tweek_idl_inc_flag_java = @tweek_idl_incflag_java@ 
    2621tweek_idl_inc_flag_cxx = @tweek_idl_incflag_cxx@ 
    27 tweek_idl_inc_flag_python = @tweek_idl_incflag_python@ 
    28 tweek_idlgendir_java = @tweek_idlgendir_java@ 
    2922tweek_idlgendir_cxx = @tweek_idlgendir_cxx@ 
    30 tweek_idlgendir_python = @tweek_idlgendir_python@ 
    31 tweek_java_api_jars = @tweek_java_api_jars@ 
    32 tweek_ext_jars = @tweek_ext_jars@ 
    3323BUILD_CXX = @BUILD_CXX@ 
    34 BUILD_JAVA = @BUILD_JAVA@ 
    35 BUILD_PYTHON_IDL = @BUILD_PYTHON_IDL@ 
    3624tweek_extra_cxxflags = @tweek_extra_cxxflags@ 
    3725tweek_extra_include_dirs = @tweek_extra_include_dirs@ 
    …… 
    5644URL: http://www.vrjuggler.org/tweek/ 
    5745Version: ${tweek_version} 
    58 Provides: tweek 
     46Provides: tweek tweek-c++ 
    5947Requires: @CXX_ORB_DEPS@ vpr = @VPR_VERSION@ 
    6048Arch: ${ISA} 
    …… 
    6452 
    6553 
    66 ######################### Tweek Specific Flagpoll Variables ################### 
     54######################### Tweek-Specific Flagpoll Variables ################### 
    6755 
    6856cxx_api_available: ${BUILD_CXX} 
    …… 
    7765cxx_idlincflag: ${tweek_idl_inc_flag_cxx} 
    7866 
    79 java_api_available: ${BUILD_JAVA} 
    80 java_idl: ${config_java_idl} 
    81 java_idlflags: ${tweek_idlflags_java} 
    82 java_idlgendir: ${tweek_idlgendir_java} 
    83 java_idlincflag: ${tweek_idl_inc_flag_java} 
    84 jars: ${tweek_java_api_jars} 
    85 ext_jars: ${tweek_ext_jars} 
    86  
    8767tweek_app_defs_file: ${tweek_share_dir}/tweek.appdefs.mk 
    88  
    89 python_idl_available: ${BUILD_PYTHON_IDL} 
    90 python_idl: ${PYTHON_IDL} 
    91 python_idlflags: ${tweek_idlflags_python} 
    92 python_idlgendir: ${tweek_idlgendir_python} 
    93 python_idlincflag: ${tweek_idl_inc_flag_python} 
    94  
    95  

  • juggler/branches/2.2/release/vrjuggler.spec

    r20434 r20444  
    101101URL: http://www.vrjuggler.org/vapor/ 
    102102Group: Development/C++ 
     103Requires: flagpoll >= 0.8.1 
    103104Requires: cppdom-devel >= 0.3.3 
    104105Requires: boost-devel >= 1.32 
    …… 
    135136Group: Development/C++ 
    136137Requires: libomniorb-devel >= 4.0.6-2 
     138Requires: flagpoll >= 0.8.1 
    137139Requires: vpr-devel = %{vpr_version}-%{vpr_release} 
    138140Requires: tweek-c++ = %{tweek_version}-%{tweek_release} 
    …… 
    165167%java_req 
    166168Requires: tweek-java-jni = %{tweek_version}-%{tweek_release} 
     169Requires: flagpoll >= 0.8.1 
    167170Provides: tweek-java = %{tweek_version}-%{tweek_release} 
    168171AutoReqProv: no 
    …… 
    195198URL: http://www.vrjuggler.org/jccl/ 
    196199Group: Development/C++ 
     200Requires: flagpoll >= 0.8.1 
    197201Requires: vpr-devel = %{vpr_version}-%{vpr_release} 
    198202Provides: jccl-c++-devel = %{jccl_version}-%{jccl_release} 
    …… 
    267271Group: Development/C++ 
    268272Requires: vpr-devel = %{vpr_version}-%{vpr_release} 
     273Requires: flagpoll >= 0.8.1 
    269274Requires: gmtl >= 0.4.5 
    270275Requires: sonix = %{sonix_version}-%{sonix_release} 
    …… 
    329334URL: http://www.vrjuggler.org/gadgeteer/ 
    330335Group: Development/C++ 
     336Requires: flagpoll >= 0.8.1 
    331337Requires: gmtl >= 0.4.5 
    332338Requires: vpr-devel = %{vpr_version}-%{vpr_release} 
    …… 
    346352URL: http://www.vrjuggler.org/vrjuggler/ 
    347353Group: Development/C++ 
     354Requires: flagpoll >= 0.8.1 
    348355Requires: vpr-devel = %{vpr_version}-%{vpr_release} 
    349356Requires: jccl-c++-devel = %{jccl_version}-%{jccl_release} 
    …… 
    380387URL: http://www.vrjuggler.org/vrjuggler/ 
    381388Group: Development/C++ 
     389Requires: flagpoll >= 0.8.1 
    382390Requires: vrjuggler-opengl = %{vrjuggler_version}-%{vrjuggler_release} 
    383391Requires: vrjuggler-devel = %{vrjuggler_version}-%{vrjuggler_release} 
    …… 
    408416URL: http://www.vrjuggler.org/vrjuggler/ 
    409417Group: Development/C++ 
     418Requires: flagpoll >= 0.8.1 
    410419Requires: vrjuggler-performer = %{vrjuggler_version}-%{vrjuggler_release} 
    411420Requires: vrjuggler-devel = %{vrjuggler_version}-%{vrjuggler_release} 
    …… 
    633642%{_libdir}/%{vj_arch}/libtweek*.a 
    634643%{_libdir}/%{vj_arch}/*/libtweek*.a 
    635 %{_libdir}/flagpoll/tweek*.fpc 
     644%{_libdir}/flagpoll/tweek-%{tweek_version}*.fpc 
     645%{_libdir}/flagpoll/tweek-python-%{tweek_version}*.fpc 
    636646%{_prefix}/share/aclocal/tweek.m4 
    637647%{_prefix}/share/tweek-%{tweek_version}/test 
    …… 
    651661%{_bindir}/tweek 
    652662%{_bindir}/tweek-base.sh 
     663%{_libdir}/flagpoll/tweek-java-%{tweek_version}*.fpc 
    653664%dir %{_prefix}/share/tweek-%{tweek_version}/beans/ 
    654665%{_prefix}/share/tweek-%{tweek_version}/beans