Changeset 20727

Show
Ignore:
Timestamp:
08/16/07 21:06:47 (1 year ago)
Author:
patrick
Message:

Merged changes from the 2.2 branch that will be helpful when the next
release comes around.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • juggler/trunk/release/vrjuggler.spec

    r20680 r20727  
    5757%define vrjuggler_release %{global_release}%{?dist} 
    5858 
     59# Change these to drop the patch number for the stable release. 
     60%define vpr_version_dist %{vpr_version} 
     61%define tweek_version_dist %{tweek_version} 
     62%define jccl_version_dist %{jccl_version} 
     63%define sonix_version_dist %{sonix_version} 
     64%define gadgeteer_version_dist %{gadgeteer_version} 
     65%define vrjuggler_version_dist %{vrjuggler_version} 
     66 
    5967%define have_java %(if [ -x $JDK_HOME/bin/javac ] ; then echo 1; else echo 0; fi) 
    6068 
     
    961969%files -n vpr-devel 
    962970%defattr(-, root, root) 
    963 %{_includedir}/vpr-%{vpr_version}/ 
     971%{_includedir}/vpr-%{vpr_version_dist}/ 
    964972%{_libdir}/libvpr*.a 
    965973%{_libdir}/%{vj_arch}/libvpr*.a 
     
    969977%{_prefix}/share/aclocal/vpr.m4 
    970978%{_prefix}/share/aclocal/vrj-helpers.m4 
    971 %{_prefix}/share/vpr-%{vpr_version
     979%{_prefix}/share/vpr-%{vpr_version_dist
    972980 
    973981%if %have_omniorb 
     
    981989%{_libdir}/%{vj_arch}/libtweek*.so 
    982990%{_libdir}/%{vj_arch}/*/libtweek*.so 
    983 %dir %{_prefix}/share/tweek-%{tweek_version}/ 
    984 %{_prefix}/share/tweek-%{tweek_version}/data 
     991%dir %{_prefix}/share/tweek-%{tweek_version_dist}/ 
     992%{_prefix}/share/tweek-%{tweek_version_dist}/data 
    985993%doc COPYING.txt modules/tweek/ChangeLog 
    986994 
    987995%files -n tweek-c++-devel 
    988996%defattr(-, root, root) 
    989 %{_includedir}/tweek-%{tweek_version
     997%{_includedir}/tweek-%{tweek_version_dist
    990998%{_libdir}/libtweek*.a 
    991999%{_libdir}/%{vj_arch}/libtweek*.a 
    9921000%{_libdir}/%{vj_arch}/*/libtweek*.a 
    993 %{_libdir}/flagpoll/tweek-%{tweek_version}*.fpc 
    994 %{_libdir}/flagpoll/tweek-python-%{tweek_version}*.fpc 
     1001%{_libdir}/flagpoll/tweek-%{tweek_version_dist}*.fpc 
     1002%{_libdir}/flagpoll/tweek-python-%{tweek_version_dist}*.fpc 
    9951003%{_prefix}/share/aclocal/tweek.m4 
    996 %{_prefix}/share/tweek-%{tweek_version}/test 
    997 %{_prefix}/share/tweek-%{tweek_version}/tweek.appdefs.mk 
     1004%{_prefix}/share/tweek-%{tweek_version_dist}/test 
     1005%{_prefix}/share/tweek-%{tweek_version_dist}/tweek.appdefs.mk 
    9981006%endif 
    9991007 
     
    10011009%files -n tweek-java-jni 
    10021010%defattr(-, root, root) 
    1003 %{_prefix}/share/tweek-%{tweek_version}/java/%{tweek_arch} 
     1011%{_prefix}/share/tweek-%{tweek_version_dist}/java/%{tweek_arch} 
    10041012 
    10051013%files -n tweek-java 
     
    10101018%{_bindir}/tweek 
    10111019%{_bindir}/tweek-base.sh 
    1012 %{_libdir}/flagpoll/tweek-java-%{tweek_version}*.fpc 
    1013 %{_prefix}/share/tweek-%{tweek_version}/beans 
    1014 %dir %{_prefix}/share/tweek-%{tweek_version}/java/ 
    1015 %{_prefix}/share/tweek-%{tweek_version}/java/*.jar 
    1016 %{_prefix}/share/tweek-%{tweek_version}/java/*.txt 
    1017 %{_prefix}/share/tweek-%{tweek_version}/LICENSE 
    1018 %{_prefix}/share/tweek-%{tweek_version}/README.source 
     1020%{_libdir}/flagpoll/tweek-java-%{tweek_version_dist}*.fpc 
     1021%{_prefix}/share/tweek-%{tweek_version_dist}/beans 
     1022%dir %{_prefix}/share/tweek-%{tweek_version_dist}/java/ 
     1023%{_prefix}/share/tweek-%{tweek_version_dist}/java/*.jar 
     1024%{_prefix}/share/tweek-%{tweek_version_dist}/java/*.txt 
     1025%{_prefix}/share/tweek-%{tweek_version_dist}/LICENSE 
     1026%{_prefix}/share/tweek-%{tweek_version_dist}/README.source 
    10191027%doc COPYING.txt modules/tweek/ChangeLog 
    10201028%endif 
     
    10291037%{_libdir}/%{vj_arch}/libjccl*.so 
    10301038%{_libdir}/%{vj_arch}/*/libjccl*.so 
    1031 %dir %{_prefix}/share/jccl-%{jccl_version}/ 
    1032 %{_prefix}/share/jccl-%{jccl_version}/data 
    1033 %{_prefix}/share/jccl-%{jccl_version}/tools 
     1039%dir %{_prefix}/share/jccl-%{jccl_version_dist}/ 
     1040%{_prefix}/share/jccl-%{jccl_version_dist}/data 
     1041%{_prefix}/share/jccl-%{jccl_version_dist}/tools 
    10341042%doc COPYING.txt modules/jackal/ChangeLog 
    10351043 
    10361044%files -n jccl-c++-devel 
    10371045%defattr(-, root, root) 
    1038 %{_includedir}/jccl-%{jccl_version
     1046%{_includedir}/jccl-%{jccl_version_dist
    10391047%{_libdir}/libjccl*.a 
    10401048%{_libdir}/%{vj_arch}/libjccl*.a 
     
    10421050%{_libdir}/flagpoll/jccl*.fpc 
    10431051%{_prefix}/share/aclocal/jccl.m4 
    1044 %{_prefix}/share/jccl-%{jccl_version}/test 
     1052%{_prefix}/share/jccl-%{jccl_version_dist}/test 
    10451053 
    10461054%if %have_omniorb 
    10471055%files -n jccl-rtrc-plugin-c++ 
    10481056%defattr(-, root, root) 
    1049 %{_libdir}/jccl-%{jccl_version
     1057%{_libdir}/jccl-%{jccl_version_dist
    10501058%endif 
    10511059 
     
    10531061%files -n jccl-java 
    10541062%defattr(-, root, root) 
    1055 %dir %{_prefix}/share/jccl-%{jccl_version}/beans/ 
    1056 %{_prefix}/share/jccl-%{jccl_version}/beans/jccl_config.* 
    1057 %{_prefix}/share/jccl-%{jccl_version}/beans/jccl_editors.* 
    1058 %{_prefix}/share/jccl-%{jccl_version}/java 
     1063%dir %{_prefix}/share/jccl-%{jccl_version_dist}/beans/ 
     1064%{_prefix}/share/jccl-%{jccl_version_dist}/beans/jccl_config.* 
     1065%{_prefix}/share/jccl-%{jccl_version_dist}/beans/jccl_editors.* 
     1066%{_prefix}/share/jccl-%{jccl_version_dist}/java 
    10591067%doc COPYING.txt modules/jackal/ChangeLog 
    10601068 
    10611069%files -n jccl-rtrc-plugin-java 
    10621070%defattr(-, root, root) 
    1063 %{_prefix}/share/jccl-%{jccl_version}/beans/jccl_rtrc.* 
     1071%{_prefix}/share/jccl-%{jccl_version_dist}/beans/jccl_rtrc.* 
    10641072%endif 
    10651073 
     
    10731081%{_libdir}/%{vj_arch}/libsonix*.so 
    10741082%{_libdir}/%{vj_arch}/*/libsonix*.so 
    1075 %dir %{_libdir}/sonix-%{sonix_version}/ 
    1076 %dir %{_libdir}/sonix-%{sonix_version}/plugins/ 
    1077 %dir %{_libdir}/sonix-%{sonix_version}/plugins/dbg/ 
    1078 %dir %{_libdir}/sonix-%{sonix_version}/plugins/opt/ 
    1079 %{_prefix}/share/sonix-%{sonix_version}/data 
     1083%dir %{_libdir}/sonix-%{sonix_version_dist}/ 
     1084%dir %{_libdir}/sonix-%{sonix_version_dist}/plugins/ 
     1085%dir %{_libdir}/sonix-%{sonix_version_dist}/plugins/dbg/ 
     1086%dir %{_libdir}/sonix-%{sonix_version_dist}/plugins/opt/ 
     1087%{_prefix}/share/sonix-%{sonix_version_dist}/data 
    10801088%doc COPYING.txt modules/sonix/ChangeLog 
    10811089 
    10821090%files -n sonix-devel 
    10831091%defattr(-, root, root) 
    1084 %{_includedir}/sonix-%{sonix_version
     1092%{_includedir}/sonix-%{sonix_version_dist
    10851093%{_libdir}/libsonix*.a 
    10861094%{_libdir}/%{vj_arch}/libsonix*.a 
     
    10881096%{_libdir}/flagpoll/sonix*.fpc 
    10891097%{_prefix}/share/aclocal/sonix.m4 
    1090 %{_prefix}/share/sonix-%{sonix_version}/samples 
     1098%{_prefix}/share/sonix-%{sonix_version_dist}/samples 
    10911099 
    10921100%if %have_audiere 
    10931101%files -n sonix-plugin-audiere 
    10941102%defattr(-, root, root) 
    1095 %{_libdir}/sonix-%{sonix_version}/plugins/*/Audiere_snd.so 
     1103%{_libdir}/sonix-%{sonix_version_dist}/plugins/*/Audiere_snd.so 
    10961104%endif 
    10971105 
     
    10991107%files -n sonix-plugin-openal 
    11001108%defattr(-, root, root) 
    1101 %{_libdir}/sonix-%{sonix_version}/plugins/*/OpenAL_snd.so 
     1109%{_libdir}/sonix-%{sonix_version_dist}/plugins/*/OpenAL_snd.so 
    11021110%endif 
    11031111 
     
    11111119%{_libdir}/%{vj_arch}/libgadget*.so 
    11121120%{_libdir}/%{vj_arch}/*/libgadget*.so 
    1113 %dir %{_libdir}/gadgeteer-%{gadgeteer_version}/ 
    1114 %dir %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/ 
    1115 %dir %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/ 
    1116 %dir %{_libdir}/gadgeteer-%{gadgeteer_version}/plugins/ 
    1117 %dir %{_libdir}/gadgeteer-%{gadgeteer_version}/plugins/debug/ 
    1118 %dir %{_prefix}/share/gadgeteer-%{gadgeteer_version}/ 
    1119 %{_prefix}/share/gadgeteer-%{gadgeteer_version}/data 
    1120 %{_prefix}/share/gadgeteer-%{gadgeteer_version}/tools 
     1121%dir %{_libdir}/gadgeteer-%{gadgeteer_version_dist}/ 
     1122%dir %{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/ 
     1123%dir %{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/ 
     1124%dir %{_libdir}/gadgeteer-%{gadgeteer_version_dist}/plugins/ 
     1125%dir %{_libdir}/gadgeteer-%{gadgeteer_version_dist}/plugins/debug/ 
     1126%{_prefix}/share/gadgeteer-%{gadgeteer_version_dist}/data 
     1127%{_prefix}/share/gadgeteer-%{gadgeteer_version_dist}/tools 
    11211128%doc COPYING.txt modules/gadgeteer/ChangeLog 
    11221129 
    11231130%files -n gadgeteer-devel 
    11241131%defattr(-, root, root) 
    1125 %{_includedir}/gadgeteer-%{gadgeteer_version}/cluster 
    1126 %{_includedir}/gadgeteer-%{gadgeteer_version}/gadget 
    1127 %{_includedir}/gadgeteer-%{gadgeteer_version}/plugins 
     1132%{_includedir}/gadgeteer-%{gadgeteer_version_dist}/cluster 
     1133%{_includedir}/gadgeteer-%{gadgeteer_version_dist}/gadget 
     1134%{_includedir}/gadgeteer-%{gadgeteer_version_dist}/plugins 
    11281135%{_libdir}/libgadget*.a 
    11291136%{_libdir}/%{vj_arch}/libgadget*.a 
     
    11311138%{_libdir}/flagpoll/gadgeteer*.fpc 
    11321139%{_prefix}/share/aclocal/gadget.m4 
    1133 %{_prefix}/share/gadgeteer-%{gadgeteer_version}/*.mk 
    1134 %{_prefix}/share/gadgeteer-%{gadgeteer_version}/samples 
    1135 %{_prefix}/share/gadgeteer-%{gadgeteer_version}/test 
     1140%{_prefix}/share/gadgeteer-%{gadgeteer_version_dist}/*.mk 
     1141%{_prefix}/share/gadgeteer-%{gadgeteer_version_dist}/samples 
     1142%{_prefix}/share/gadgeteer-%{gadgeteer_version_dist}/test 
    11361143 
    11371144%files -n gadgeteer-driver-5dt-dataglove 
    11381145%defattr(-, root, root) 
    1139 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/DataGlove_drv.so 
    1140 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/DataGlove_drv.so 
     1146%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/DataGlove_drv.so 
     1147%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/DataGlove_drv.so 
    11411148 
    11421149%files -n gadgeteer-driver-dtrack 
    11431150%defattr(-, root, root) 
    1144 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/DTrack_drv.so 
    1145 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/DTrack_drv.so 
     1151%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/DTrack_drv.so 
     1152%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/DTrack_drv.so 
    11461153 
    11471154%files -n gadgeteer-driver-etherio24 
    11481155%defattr(-, root, root) 
    1149 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/ElexolEther24_drv.so 
    1150 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/ElexolEther24_drv.so 
     1156%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/ElexolEther24_drv.so 
     1157%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/ElexolEther24_drv.so 
    11511158 
    11521159%files -n gadgeteer-driver-flock 
    11531160%defattr(-, root, root) 
    1154 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/Flock_drv.so 
    1155 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/Flock_drv.so 
     1161%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/Flock_drv.so 
     1162%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/Flock_drv.so 
    11561163 
    11571164%files -n gadgeteer-driver-fastrak 
    11581165%defattr(-, root, root) 
    1159 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/Fastrak_drv.so 
    1160 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/Fastrak_drv.so 
     1166%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/Fastrak_drv.so 
     1167%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/Fastrak_drv.so 
    11611168 
    11621169%files -n gadgeteer-driver-ibox 
    11631170%defattr(-, root, root) 
    1164 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/IBox_drv.so 
    1165 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/IBox_drv.so 
     1171%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/IBox_drv.so 
     1172%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/IBox_drv.so 
    11661173 
    11671174%files -n gadgeteer-driver-intersense-api 
    11681175%defattr(-, root, root) 
    1169 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/IntersenseAPI_drv.so 
    1170 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/IntersenseAPI_drv.so 
     1176%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/IntersenseAPI_drv.so 
     1177%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/IntersenseAPI_drv.so 
    11711178 
    11721179%files -n gadgeteer-driver-is900 
    11731180%defattr(-, root, root) 
    1174 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/IS900_drv.so 
    1175 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/IS900_drv.so 
     1181%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/IS900_drv.so 
     1182%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/IS900_drv.so 
    11761183 
    11771184%files -n gadgeteer-driver-joydev 
    11781185%defattr(-, root, root) 
    1179 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/LinuxJoydev_drv.so 
    1180 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/LinuxJoydev_drv.so 
     1186%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/LinuxJoydev_drv.so 
     1187%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/LinuxJoydev_drv.so 
    11811188 
    11821189%files -n gadgeteer-driver-motionstar 
    11831190%defattr(-, root, root) 
    1184 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/MotionStar_drv.so 
    1185 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/MotionStar_drv.so 
     1191%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/MotionStar_drv.so 
     1192%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/MotionStar_drv.so 
    11861193 
    11871194%if %have_libusb 
    11881195%files -n gadgeteer-driver-p5glove 
    11891196%defattr(-, root, root) 
    1190 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/P5Glove_drv.so 
    1191 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/P5Glove_drv.so 
     1197%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/P5Glove_drv.so 
     1198%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/P5Glove_drv.so 
    11921199%endif 
    11931200 
    11941201%files -n gadgeteer-driver-pinchglove 
    11951202%defattr(-, root, root) 
    1196 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/PinchGlove_drv.so 
    1197 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/PinchGlove_drv.so 
     1203%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/PinchGlove_drv.so 
     1204%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/PinchGlove_drv.so 
    11981205 
    11991206%files -n gadgeteer-driver-serial-encoder 
    12001207%defattr(-, root, root) 
    1201 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/SerialEncoder_drv.so 
    1202 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/SerialEncoder_drv.so 
     1208%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/SerialEncoder_drv.so 
     1209%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/SerialEncoder_drv.so 
    12031210 
    12041211%files -n gadgeteer-driver-spaceball 
    12051212%defattr(-, root, root) 
    1206 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/SpaceBall_drv.so 
    1207 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/SpaceBall_drv.so 
     1213%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/SpaceBall_drv.so 
     1214%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/SpaceBall_drv.so 
    12081215 
    12091216%files -n gadgeteer-driver-threedmouse 
    12101217%defattr(-, root, root) 
    1211 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/ThreeDMouse_drv.so 
    1212 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/ThreeDMouse_drv.so 
     1218%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/ThreeDMouse_drv.so 
     1219%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/ThreeDMouse_drv.so 
    12131220 
    12141221%files -n gadgeteer-driver-trackd 
    12151222%defattr(-, root, root) 
    1216 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/Trackd_drv.so 
    1217 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/Trackd_drv.so 
     1223%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/Trackd_drv.so 
     1224%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/Trackd_drv.so 
    12181225 
    12191226%if %have_trackdapi 
    12201227%files -n gadgeteer-driver-trackd-api 
    12211228%defattr(-, root, root) 
    1222 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/TrackdAPI_drv.so 
    1223 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/TrackdAPI_drv.so 
     1229%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/TrackdAPI_drv.so 
     1230%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/TrackdAPI_drv.so 
    12241231%endif 
    12251232 
     
    12271234%files -n gadgeteer-driver-vrpn 
    12281235%defattr(-, root, root) 
    1229 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/VRPN_drv.so 
    1230 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/VRPN_drv.so 
     1236%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/VRPN_drv.so 
     1237%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/VRPN_drv.so 
    12311238%endif 
    12321239 
    12331240%files -n gadgeteer-driver-wanda 
    12341241%defattr(-, root, root) 
    1235 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/Wanda_drv.so 
    1236 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/Wanda_drv.so 
     1242%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/Wanda_drv.so 
     1243%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/Wanda_drv.so 
    12371244 
    12381245%if %have_ftd2xx && %have_libusb 
    12391246%files -n gadgeteer-driver-x-ist 
    12401247%defattr(-, root, root) 
    1241 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/X-IST_drv.so 
    1242 %{_libdir}/gadgeteer-%{gadgeteer_version}/drivers/debug/X-IST_drv.so 
     1248%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/X-IST_drv.so 
     1249%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/drivers/debug/X-IST_drv.so 
    12431250%endif 
    12441251 
    12451252%files -n gadgeteer-plugin-application-data-manager 
    12461253%defattr(-, root, root) 
    1247 %{_libdir}/gadgeteer-%{gadgeteer_version}/plugins/ApplicationDataManager.so 
    1248 %{_libdir}/gadgeteer-%{gadgeteer_version}/plugins/debug/ApplicationDataManager.so 
     1254%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/plugins/ApplicationDataManager.so 
     1255%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/plugins/debug/ApplicationDataManager.so 
    12491256 
    12501257%files -n gadgeteer-plugin-remote-input-manager 
    12511258%defattr(-, root, root) 
    1252 %{_libdir}/gadgeteer-%{gadgeteer_version}/plugins/RIMPlugin.so 
    1253 %{_libdir}/gadgeteer-%{gadgeteer_version}/plugins/debug/RIMPlugin.so 
     1259%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/plugins/RIMPlugin.so 
     1260%{_libdir}/gadgeteer-%{gadgeteer_version_dist}/plugins/debug/RIMPlugin.so 
    12541261 
    12551262%files 
     
    12621269%{_libdir}/%{vj_arch}/libvrj-*.so 
    12631270%{_libdir}/%{vj_arch}/*/libvrj-*.so 
    1264 %dir %{_prefix}/share/vrjuggler-%{vrjuggler_version}/ 
    1265 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/data 
    1266 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/tools 
     1271%dir %{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/ 
     1272%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/data 
     1273%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/tools 
    12671274%doc COPYING.txt INSTALL.html INSTALL.txt README.html README.txt modules/vrjuggler/ChangeLog modules/vrjuggler/RELEASE_NOTES.txt 
    12681275 
    12691276%files -n vrjuggler-devel 
    12701277%defattr(-, root, root) 
    1271 %dir %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/ 
    1272 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/*.h 
    1273 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Display 
    1274 %dir %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Draw/ 
    1275 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Draw/*.h 
    1276 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Kernel 
    1277 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Performance 
    1278 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Sound 
    1279 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Test 
    1280 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Util 
     1278%dir %{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/ 
     1279%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/*.h 
     1280%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Display 
     1281%dir %{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Draw/ 
     1282%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Draw/*.h 
     1283%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Kernel 
     1284%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Performance 
     1285%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Sound 
     1286%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Test 
     1287%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Util 
    12811288%{_libdir}/libvrj-*.a 
    12821289%{_libdir}/%{vj_arch}/libvrj-*.a 
     
    12841291%{_libdir}/flagpoll/vrjuggler*.fpc 
    12851292%{_prefix}/share/aclocal/vrj.m4 
    1286 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/*.mk 
    1287 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/samples 
    1288 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/test 
     1293%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/*.mk 
     1294%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/samples 
     1295%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/test 
    12891296 
    12901297%files -n vrjuggler-opengl 
     
    12961303%files -n vrjuggler-opengl-devel 
    12971304%defattr(-, root, root) 
    1298 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Draw/OGL 
    1299 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Draw/OSG 
    1300 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Draw/OpenGL 
    1301 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Draw/OpenSG 
     1305%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Draw/OGL 
     1306%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Draw/OSG 
     1307%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Draw/OpenSG 
    13021308%{_libdir}/libvrj_ogl*.a 
    13031309%{_libdir}/%{vj_arch}/libvrj_ogl*.a 
     
    13131319%files -n vrjuggler-performer-devel 
    13141320%defattr(-, root, root) 
    1315 %{_includedir}/vrjuggler-%{vrjuggler_version}/vrj/Draw/Pf 
     1321%{_includedir}/vrjuggler-%{vrjuggler_version_dist}/vrj/Draw/Pf 
    13161322%{_libdir}/libvrj_pf*.a 
    13171323%{_libdir}/%{vj_arch}/libvrj_pf*.a 
     
    13231329%defattr(-, root, root) 
    13241330%{_bindir}/vrjconfig 
    1325 %dir %{_prefix}/share/vrjuggler-%{vrjuggler_version}/beans/ 
    1326 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/beans/customeditors 
    1327 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/beans/wizards 
    1328 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/beans/VRJConfig.* 
    1329 %dir %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/ 
    1330 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/CommonEditors.jar 
    1331 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/jgraphaddons.jar 
    1332 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/jgraph.jar 
     1331%dir %{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/beans/ 
     1332%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/beans/customeditors 
     1333%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/beans/wizards 
     1334%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/beans/VRJConfig.* 
     1335%dir %{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/ 
     1336%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/CommonEditors.jar 
     1337%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/jgraphaddons.jar 
     1338%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/jgraph.jar 
    13331339%doc COPYING.txt modules/vrjuggler/vrjconfig/LICENSE-java-laf.txt 
    13341340%endif 
     
    13371343%files -n vrjuggler-perf-plugin-c++ 
    13381344%defattr(-, root, root) 
    1339 %{_libdir}/vrjuggler-%{vrjuggler_version
     1345%{_libdir}/vrjuggler-%{vrjuggler_version_dist
    13401346%endif 
    13411347 
     
    13431349%files -n vrjuggler-perf-plugin-java 
    13441350%defattr(-, root, root) 
    1345 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/beans/PerformanceMonitor.* 
    1346 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/gnujaxp.jar 
    1347 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/jcommon.jar 
    1348 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/jfreechart.jar 
    1349 %{_prefix}/share/vrjuggler-%{vrjuggler_version}/java/servlet.jar 
     1351%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/beans/PerformanceMonitor.* 
     1352%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/gnujaxp.jar 
     1353%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/jcommon.jar 
     1354%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/jfreechart.jar 
     1355%{_prefix}/share/vrjuggler-%{vrjuggler_version_dist}/java/servlet.jar 
    13501356%endif 
    13511357