Changeset 1650

Show
Ignore:
Timestamp:
04/12/07 13:32:39 (2 years ago)
Author:
dsugar
Message:

Finish up spec changes for release.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/SPEC/framework-eclipse.spec

    r1647 r1650  
    9090 
    9191%build 
     92#libselinux fragment 
    9293cd ${RPM_BUILD_DIR}/libselinux.linux.%{arch} 
    9394ant -f ${RPM_BUILD_DIR}/framework-plugin/libselinuxjava/antbuild.xml -Dtarget_arch=%{arch} -Dtarget_dir=${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava -Djava_target_dir=${RPM_BUILD_DIR}/libselinux.linux.%{arch}/src/com/tresys/framework/compiler/linkage/libselinuxjava/ 
    …… 
    9596ant -f rpmbuild.xml buildjar 
    9697 
     98#libselinux plugin 
    9799cd ${RPM_BUILD_DIR}/libselinuxjava-plugin 
    98100ant -f rpmbuild.xml buildjar 
    99101 
     102#cdsframework help 
    100103cd ${RPM_BUILD_DIR}/framework-help 
    101104ant -f rpmbuild.xml 
    102105 
     106#cdsframework plugin 
    103107cd ${RPM_BUILD_DIR}/framework-plugin 
    104108ant -f rpmbuild.xml -Dlibselinux_fragment_jar=${RPM_BUILD_DIR}/libselinuxjava-plugin/library.jar -Dlibselinux_plugin_jar=${RPM_BUILD_DIR}/libselinux.linux.x86/libselinuxjava.jar buildjar 
    …… 
    109113rm -rf ${RPM_BUILD_ROOT} 
    110114mkdir -p ${RPM_BUILD_ROOT}%{plugin_dir} 
    111 mkdir -p ${RPM_BUILD_ROOT}%{selinuxjava_dir}/libselinuxjava 
     115mkdir -p ${RPM_BUILD_ROOT}%{selinux_frag_dir}/libselinuxjava 
    112116 
    113117mkdir -p ${RPM_BUILD_ROOT}%{cds_feature_dir} 
    114 mkdir -p ${RPM_BUILD_ROOT}%{selinux_frag_dir} 
    115  
     118mkdir -p ${RPM_BUILD_ROOT}%{selinux_feature_dir} 
     119 
     120#features 
     121cp ${RPM_SOURCE_DIR}/eclipse-feature/feature.xml ${RPM_BUILD_ROOT}%{cds_feature_dir} 
     122cp ${RPM_SOURCE_DIR}/libselinuxjava-feature/feature.xml ${RPM_BUILD_ROOT}%{selinux_feature_dir} 
     123 
     124# cds framework plugin 
    116125cp ${RPM_BUILD_DIR}/framework-plugin/CDSFramework.jar ${RPM_BUILD_ROOT}%{plugin_dir} 
    117126cp ${RPM_BUILD_DIR}/framework-plugin/COPYING ${RPM_BUILD_ROOT}%{plugin_dir} 
    …… 
    121130cp -R ${RPM_BUILD_DIR}/framework-plugin/resources ${RPM_BUILD_ROOT}%{plugin_dir}/resources 
    122131cp -R ${RPM_BUILD_DIR}/framework-plugin/META-INF ${RPM_BUILD_ROOT}%{plugin_dir}/META-INF 
    123 cp ${RPM_SOURCE_DIR}/eclipse-feature/feature.xml ${RPM_BUILD_ROOT}%{feature_dir} 
    124  
    125 cp ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava/libselinuxjava.so ${RPM_BUILD_ROOT}%{selinuxjava_dir}/libselinuxjava/ 
    126 cp ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava.jar ${RPM_BUILD_ROOT}%{selinuxjava_dir}/ 
    127 cp -R ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/META-INF ${RPM_BUILD_ROOT}%{selinuxjava_dir} 
    128  
    129  
     132 
     133# cds framework help 
    130134cp -R ${RPM_BUILD_DIR}/framework-help/help.jar ${RPM_BUILD_ROOT}%{help_jar} 
    131135 
     136#libselinuxjava fragment 
     137cp ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava/libselinuxjava.so ${RPM_BUILD_ROOT}%{selinux_frag_dir}/libselinuxjava/ 
     138cp ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava.jar ${RPM_BUILD_ROOT}%{selinux_frag_dir}/ 
     139cp -R ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/META-INF ${RPM_BUILD_ROOT}%{selinux_frag_dir} 
     140 
     141#libselinuxjava plugin 
     142cp ${RPM_BUILD_DIR}/libselinuxjava-plugin/plugin.jar ${RPM_BUILD_ROOT}%{selinux_plugin_jar} 
     143 
     144 
    132145install -d -m755 ${RPM_BUILD_ROOT}%{plugin_dir} 
    133 install -d -m755 ${RPM_BUILD_ROOT}%{feature_dir} 
    134 install -d -m755 ${RPM_BUILD_ROOT}%{selinuxjava_dir} 
    135  
     146install -d -m755 ${RPM_BUILD_ROOT}%{selinux_frag_dir} 
     147install -d -m755 ${RPM_BUILD_ROOT}%{cds_feature_dir} 
     148install -d -m755 ${RPM_BUILD_ROOT}%{selinux_feature_dir} 
    136149 
    137150%clean 
    …… 
    154167%dir %{plugin_dir}/icons/dlcl16 
    155168%dir %{plugin_dir}/icons/elcl16 
     169%dir %{plugin_dir}/icons/wizban 
    156170%dir %{plugin_dir}/resources 
    157171%dir %{plugin_dir}/resources/build 
    …… 
    159173%dir %{plugin_dir}/resources/dictionary 
    160174%dir %{plugin_dir}/resources/link 
    161 %dir %{feature_dir} 
    162 %dir %{selinuxjava_dir} 
    163 %dir %{selinuxjava_dir}/libselinuxjava 
    164 %dir %{selinuxjava_dir}/META-INF 
    165  
    166 %{feature_dir}/feature.xml 
    167  
    168 %{selinuxjava_dir}/libselinuxjava.jar 
    169 %{selinuxjava_dir}/libselinuxjava/libselinuxjava.so 
    170 %{selinuxjava_dir}/META-INF/MANIFEST.MF 
     175%dir %{selinux_frag_dir} 
     176%dir %{selinux_frag_dir}/libselinuxjava 
     177%dir %{selinux_frag_dir}/META-INF 
     178 
     179%dir %{cds_feature_dir} 
     180%dir %{selinux_feature_dir} 
     181 
     182%{cds_feature_dir}/feature.xml 
     183%{selinux_feature_dir}/feature.xml 
     184 
     185 
     186%{selinux_frag_dir}/libselinuxjava.jar 
     187%{selinux_frag_dir}/libselinuxjava/libselinuxjava.so 
     188%{selinux_frag_dir}/META-INF/MANIFEST.MF 
    171189 
    172190%{help_jar} 
     191%{selinux_plugin_jar} 
    173192 
    174193%{plugin_dir}/CDSFramework.jar 
    …… 
    194213%{plugin_dir}/icons/cview24/resource.png 
    195214%{plugin_dir}/icons/cview24/userdomain.png 
     215%{plugin_dir}/icons/wizban/new_project.png 
     216%{plugin_dir}/icons/wizban/new_system.png 
    196217%{plugin_dir}/icons/framework.png 
    197218%{plugin_dir}/icons/framework_old.png