rpms/eclipse-checkstyle/devel eclipse-checkstyle.spec,1.7,1.8

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-checkstyle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23859/devel

Modified Files:
	eclipse-checkstyle.spec 
Log Message:
- Fix build with Eclipse 3.5.
- Remove gcj_support.


Index: eclipse-checkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-checkstyle/devel/eclipse-checkstyle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- eclipse-checkstyle.spec	24 Feb 2009 13:38:10 -0000	1.7
+++ eclipse-checkstyle.spec	21 Jul 2009 19:01:50 -0000	1.8
@@ -1,16 +1,17 @@
-%define eclipse_base %{_libdir}/eclipse
-%define cs_ver 4.1
-%define eclipse_ver 3.4
-%define gcj_support 1
+%global eclipse_base %{_libdir}/eclipse
+%global install_loc %{_datadir}/eclipse/dropins/checkstyle
+%global cs_ver 4.1
+%global eclipse_ver 3.5
 
 Summary:   Checkstyle plugin for Eclipse
 Name:      eclipse-checkstyle
 Version:   4.0.1
-Release:   12%{?dist}
+Release:   13%{?dist}
 License:   LGPLv2+
 Group:     Development/Tools
 URL:       http://eclipse-cs.sourceforge.net
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch: noarch
 
 Source0: CheckstylePlugin-v4_0_1.tar.bz2
 Source10: checkout_and_build_tarball.sh
@@ -32,13 +33,7 @@ BuildRequires: eclipse-pde >= 1:%{eclips
 BuildRequires: eclipse-cvs-client
 BuildRequires: checkstyle = 0:%{cs_ver}
 BuildRequires: checkstyle-optional = 0:%{cs_ver}
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel >= 1.0.33
-Requires(post):         java-gcj-compat >= 1.0.33
-Requires(postun):       java-gcj-compat >= 1.0.33
-%else
 BuildRequires:          java-devel >= 1.4.2
-%endif
 
 %description
 The Eclipse Checkstyle plugin integrates the Checkstyle Java code
@@ -72,7 +67,7 @@ for jar in \
 %{eclipse_base}/plugins/org.eclipse.core.commands_%{eclipse_ver}.*.jar \
 %{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.core.runtime*.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 \
@@ -88,8 +83,8 @@ for jar in \
 %{eclipse_base}/plugins/org.eclipse.ui.workbench_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.ui.workbench.texteditor_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.equinox.common_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.equinox.registry_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.core.jobs_%{eclipse_ver}.*.jar
+%{eclipse_base}/plugins/org.eclipse.equinox.registry*.jar \
+%{eclipse_base}/plugins/org.eclipse.core.jobs_*.jar
 do
   CLASSPATH=$CLASSPATH:${jar}
 done
@@ -108,57 +103,40 @@ popd
 
 %install
 rm -rf %{buildroot}
-installDir=%{buildroot}/%{eclipse_base}/dropins/checkstyle
-install -d -m755 $installDir/features/com.atlassw.tools.eclipse.checkstyle_%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
 BUILD_DIR=`pwd`/CheckstylePlugin
 
 # install feature
-pushd $installDir/features/com.atlassw.tools.eclipse.checkstyle_%{version}
+pushd $RPM_BUILD_ROOT%{install_loc}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
    jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-feature.jar
 popd
 
 # install plugin
-pushd $installDir
+pushd $RPM_BUILD_ROOT%{install_loc}
     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 \
-    $installDir/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
+    $RPM_BUILD_ROOT%{install_loc}/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
     checkstyle-%{cs_ver} \
     checkstyle-optional-%{cs_ver} \
     commons-beanutils-core \
     commons-logging antlr
 popd
 
-%if %{gcj_support}
-  %{_bindir}/aot-compile-rpm
-%endif
-
 %clean 
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root)
 %doc CheckstylePlugin/license/LICENSE.*
-%{eclipse_base}/dropins/checkstyle
-
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
+%{install_loc}
 
 %changelog
+* Tue Jul 21 2009 Alexander Kurtakov <akurtako at redhat.com> 4.0.1-13
+- Fix build with Eclipse 3.5.
+- Remove gcj_support.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild