rpms/eclipse-setools/devel eclipse-setools.spec,1.4,1.5

[David Sugar (dsugar)]

Author: dsugar

Update of /cvs/pkgs/rpms/eclipse-setools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27002

Modified Files:
	eclipse-setools.spec 
Log Message:
Changes to support Eclipse 3.4 on F10



Index: eclipse-setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-setools/devel/eclipse-setools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-setools.spec	13 Feb 2008 21:01:31 -0000	1.4
+++ eclipse-setools.spec	31 Jul 2008 20:30:12 -0000	1.5
@@ -10,8 +10,8 @@
 BuildRequires: setools-libs-java >= %{require_setools_major_ver}%{require_setools_fix_ver}
 
 %define eclipse_name		eclipse
-%define eclipse_base		%{_datadir}/%{eclipse_name}
-%define eclipse_lib_base	%{_libdir}/%{eclipse_name}
+%define eclipse_base		%{_libdir}/%{eclipse_name}/dropins/setools
+%define eclipse_lib_base	%{_libdir}/%{eclipse_name}/dropins/setools
 %define svnbase			http://oss.tresys.com/repos/slide/trunk/
 
 Summary: Eclipse plugin wrapper for SETools Java policy analysis tools for SELinux
@@ -34,7 +34,7 @@
 #Release: 0.2.svn1998%{?dist}
 
 Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz
-Release: 1%{?dist}
+Release: 2%{?dist}
 %ifarch i386
 %define arch	x86
 %else
@@ -84,7 +84,7 @@
 
 install -dp -m755 ${RPM_BUILD_ROOT}${PLUGIN_DIR}/META-INF
 #ln -s /usr/share/setools-3.3 ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/setools
-ln -s ../../../setools-%{require_setools_major_ver} ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/setools
+ln -s %{_datadir}/setools-%{require_setools_major_ver} ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/setools
 
 install -dp -m755 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib
 install -dp -m755 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/META-INF
@@ -98,10 +98,10 @@
 install -p -m644 ${RPM_BUILD_DIR}/${FRAGMENT_SRC}/build.properties ${RPM_BUILD_ROOT}${FRAGMENT_DIR}
 install -p -m644 ${RPM_BUILD_DIR}/${FRAGMENT_SRC}/META-INF/MANIFEST.MF ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/META-INF
 #cp -pd ${RPM_BUILD_DIR}/${FRAGMENT_SRC}/lib/* ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib
-ln -s ../../../../libjapol.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjapol.so
-ln -s ../../../../libjpoldiff.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjpoldiff.so
-ln -s ../../../../libjqpol.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjqpol.so
-ln -s ../../../../libjseaudit.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjseaudit.so
+ln -s %{_libdir}/libjapol.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjapol.so
+ln -s %{_libdir}/libjpoldiff.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjpoldiff.so
+ln -s %{_libdir}/libjqpol.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjqpol.so
+ln -s %{_libdir}/libjseaudit.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjseaudit.so
 
 install -p -m644 ${RPM_BUILD_DIR}/eclipse-setools/setools-feature/feature.xml ${RPM_BUILD_ROOT}${FEATURE_DIR}
 
@@ -122,11 +122,15 @@
 
 %files
 %defattr(-,root,root,-)
-%{eclipse_base}/plugins/com.tresys.setools*/
-%{eclipse_base}/features/com.tresys.setools*/
-%{eclipse_lib_base}/plugins/com.tresys.setools*/
+#%{eclipse_base}/plugins/com.tresys.setools*/
+#%{eclipse_base}/features/com.tresys.setools*/
+#%{eclipse_lib_base}/plugins/com.tresys.setools*/
+%{eclipse_base}/*
 
 %changelog
+* Thu Jul 31 2008 Dave Sugar <dsugar at tresys.com> - 3.3.2.4-2
+- update for F10 layout changes for Eclipse 3.4 
+
 * Wed Feb 13 2008 Dave Sugar <dsugar at tresys.com> - 3.3.2.4-1
 - change error handling to support eclipse 3.2