rpms/eclipse-checkstyle/devel eclipse-checkstyle.spec,1.5,1.6

[Rob Myers (rmyers)]

Author: rmyers

Update of /cvs/extras/rpms/eclipse-checkstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2581

Modified Files:
	eclipse-checkstyle.spec 
Log Message:
Update for Eclipse SDK 3.4


Index: eclipse-checkstyle.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-checkstyle/devel/eclipse-checkstyle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-checkstyle.spec	19 Feb 2008 21:48:47 -0000	1.5
+++ eclipse-checkstyle.spec	11 Aug 2008 20:32:56 -0000	1.6
@@ -1,12 +1,12 @@
-%define eclipse_base %{_datadir}/eclipse
+%define eclipse_base %{_libdir}/eclipse
 %define cs_ver 4.1
-%define eclipse_ver 3.3
+%define eclipse_ver 3.4
 %define gcj_support 1
 
 Summary:   Checkstyle plugin for Eclipse
 Name:      eclipse-checkstyle
 Version:   4.0.1
-Release:   10%{?dist}
+Release:   11%{?dist}
 License:   LGPLv2+
 Group:     Development/Tools
 URL:       http://eclipse-cs.sourceforge.net
@@ -73,14 +73,14 @@
 %{eclipse_base}/plugins/org.eclipse.core.filebuffers_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.core.resources_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.core.runtime_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.jdt.core_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.jdt.ui_%{eclipse_ver}.*.jar \
+%{eclipse_base}/dropins/jdt/plugins/org.eclipse.jdt.core_%{eclipse_ver}.*.jar \
+%{eclipse_base}/dropins/jdt/plugins/org.eclipse.jdt.ui_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.jface_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.jface.text_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.osgi_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.swt_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.team.core_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.team.cvs.core_%{eclipse_ver}.*.jar \
+%{eclipse_base}/plugins/org.eclipse.team.cvs.core_*.jar \
 %{eclipse_base}/plugins/org.eclipse.text_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.ui_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.ui.editors_%{eclipse_ver}.*.jar \
@@ -108,20 +108,21 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m755 %{buildroot}/%{eclipse_base}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
+installDir=%{buildroot}/%{eclipse_base}/dropins/checkstyle
+install -d -m755 $installDir/features/com.atlassw.tools.eclipse.checkstyle_%{version}
 BUILD_DIR=`pwd`/CheckstylePlugin
 
 # install feature
-pushd %{buildroot}/%{eclipse_base}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
+pushd $installDir/features/com.atlassw.tools.eclipse.checkstyle_%{version}
    jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-feature.jar
 popd
 
 # install plugin
-pushd %{buildroot}/%{eclipse_base}
+pushd $installDir
     jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-bin.zip
     find . -type f -name '*src.zip' -print | xargs -t rm -f
     build-jar-repository \
-    %{buildroot}/%{eclipse_base}/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
+    $installDir/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
     checkstyle-%{cs_ver} \
     checkstyle-optional-%{cs_ver} \
     commons-beanutils-core \
@@ -151,14 +152,16 @@
 %files
 %defattr(-,root,root)
 %doc CheckstylePlugin/license/LICENSE.*
-%{eclipse_base}/features/*
-%{eclipse_base}/plugins/*
+%{eclipse_base}/dropins/checkstyle
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 4.0.1-11
+- Update for Eclipse SDK 3.4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.0.1-10
 - Autorebuild for GCC 4.3