Changeset 1797

Timestamp:

01/07/08 15:05:23 (1 year ago)

Author:

dsugar

Message:

use XPath to get version for libselinuxjava fragment
maybe it will build in koji now?

Files:

• trunk/build/SPEC/eclipse-cdsframework.spec (modified) (4 diffs)
• trunk/build/buildrpm.sh (modified) (1 diff)

trunk/build/SPEC/eclipse-cdsframework.spec

@@ -10 +10 @@
-BuildRequires: libselinux >= 1.30
-BuildRequires: eclipse-slide >= %{slide_min_ver}
+BuildRequires: perl(XML::XPath)
-
-## The source for this packaged was pulled from upstreams' svn repo.
@@ -29 +30 @@
-
-%define svnbase                 http://oss.tresys.com/repos/cdsframework/trunk/
-
-#get version numbers from eclipse plugin files
-#%define cds_fet_version                %(wget -q -O - %{svnbase}/oss-feature/feature.xml | xpath /feature/@version  2> /dev/null | cut -d '"' -f 2)
-#%define cds_plugin_ver         %(wget -q -O - %{svnbase}/framework-plugin/META-INF/MANIFEST.MF | grep Bundle-Version | cut -d : -f 2 | tr -d " ")
-#%define help_ver                       %(wget -q -O - %{svnbase}/helpfiles/META-INF/MANIFEST.MF | grep Bundle-Version | cut -d : -f 2 | tr -d " ")
-
-#%define selinux_plugin_ver     %(wget -q -O - %{svnbase}/libselinuxjava-plugin/META-INF/MANIFEST.MF | grep Bundle-Version  | cut -d : -f 2 | tr -d " ")
-#%define selinux_frag_ver       %(wget -q -O - %{svnbase}/libselinux.linux.%{arch}/META-INF/MANIFEST.MF | grep Bundle-Version  | cut -d : -f 2 | tr -d " ")
-#%define selinux_fet_ver                %(wget -q -O - %{svnbase}/libselinuxjava-oss-feature/feature.xml | xpath /feature/@version  2> /dev/null | cut -d '"' -f 2)
-
-#%define slide_min_ver          %(wget -q -O - %{svnbase}/framework-plugin/META-INF/MANIFEST.MF | grep slide | cut -d '"' -f 2)
-
-#%define cds_feature_dir                %{eclipse_base}/features/com.tresys.cdsframework_%{cds_fet_version}
-#%define plugin_dir                     %{eclipse_base}/plugins/com.tresys.cdsframework_%{cds_plugin_ver}
-#%define help_jar                       %{eclipse_base}/plugins/com.tresys.cdsframework.doc.user_%{help_ver}.jar
-
-#%define selinux_feature_dir    %{eclipse_base}/features/com.tresys.cdsframework.libselinuxjava_feature_%{selinux_fet_ver}
-#%define selinux_plugin_jar     %{eclipse_base}/plugins/com.tresys.cdsframework.libselinuxjava_%{selinux_plugin_ver}.jar
-#%define selinux_frag_dir               %{eclipse_base}/plugins/com.tresys.framework.libselinuxjava.linux.%{arch}_%{selinux_frag_ver}
-
-%ifarch i386
@@ -74 +56 @@
-%prep
-%setup -q -c -n eclipse-cdsframework
-
-#rm -rf ${RPM_SOURCE_DIR}
-#mkdir -p ${RPM_SOURCE_DIR}
-#svn export %{svnbase}/framework-plugin/ ${RPM_SOURCE_DIR}/framework-plugin 
-#svn export %{svnbase}/oss-feature/ ${RPM_SOURCE_DIR}/eclipse-feature
-#svn export %{svnbase}/helpfiles/ ${RPM_SOURCE_DIR}/framework-help
-
-#svn export %{svnbase}/libselinux.linux.%{arch}/ ${RPM_SOURCE_DIR}/libselinux.linux.%{arch}
-#svn export %{svnbase}/libselinuxjava-oss-feature/ ${RPM_SOURCE_DIR}/libselinuxjava-feature
-#svn export %{svnbase}/libselinuxjava-plugin/ ${RPM_SOURCE_DIR}/libselinuxjava-plugin
-
-#rm -rf ${RPM_BUILD_DIR}
-#mkdir -p ${RPM_BUILD_DIR}/framework-plugin
-#cp -R ${RPM_SOURCE_DIR}/framework-plugin/* ${RPM_BUILD_DIR}/framework-plugin
-#mkdir -p ${RPM_BUILD_DIR}/framework-help
-#cp -R ${RPM_SOURCE_DIR}/framework-help/* ${RPM_BUILD_DIR}/framework-help
-
-#mkdir -p ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava
-#cp -R ${RPM_SOURCE_DIR}/libselinux.linux.%{arch}/* ${RPM_BUILD_DIR}/libselinux.linux.%{arch}
-#mkdir -p ${RPM_BUILD_DIR}/libselinuxjava-plugin
-#cp -R ${RPM_SOURCE_DIR}/libselinuxjava-plugin/* ${RPM_BUILD_DIR}/libselinuxjava-plugin
-
-%build
@@ -127 +88 @@
-LSEL_PLUGIN_VER=`grep Bundle-Version libselinuxjava-plugin/META-INF/MANIFEST.MF | cut -d : -f 2 | tr -d " "`
-LSEL_FRAGMENT_VER=`grep Bundle-Version libselinux.linux.%{arch}/META-INF/MANIFEST.MF | cut -d : -f 2 | tr -d " "`
-
-
+
-LSEL_PLUGIN_DIR=%{eclipse_base}/plugins/com.tresys.libselinuxjava_${LSEL_PLUGIN_VER}
-LSEL_FRAGMENT_DIR=%{eclipse_lib_base}/plugins/com.tresys.libselinux.%{_os}.%{arch}_${LSEL_FRAGMENT_VER}

trunk/build/buildrpm.sh

@@ -49 +49 @@
-tar -czf ${TOPDIR}/SOURCES/eclipse-cdsframework-${VERSION}.tar.gz *
-
-
+
+