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

[Alphonse Van Assche]

Author: alcapcom

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

Modified Files:
	eclipse-quickrex.spec 
Log Message:
* Sat Oct 11 2008 Alphonse Van Assche <alcapcom at fedoraproject.org> 3.5.0-9
- Remove gcj compilation
- Add %{install_loc}



Index: eclipse-quickrex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-quickrex/devel/eclipse-quickrex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-quickrex.spec	2 Aug 2008 17:40:20 -0000	1.7
+++ eclipse-quickrex.spec	18 Oct 2008 10:19:34 -0000	1.8
@@ -1,13 +1,13 @@
-%define gcj_support         1
 %define eclipse_base        %{_libdir}/eclipse
+%define install_loc         %{_datadir}/eclipse/dropins
 %define upstream_name       QuickREx
-%define cvs_tag             QuickREx_3_5_0
+%define cvs_tag             %{upstream_name}_3_5_0
 %define oro_jar             jakarta-oro-2.0.8.jar
 %define regexp_jar          jakarta-regexp-1.4.jar
 
 Name:           eclipse-quickrex
 Version:        3.5.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        %{upstream_name} is a regular-expression test Eclipse Plug-In
 
 Group:          Development/Tools
@@ -25,17 +25,8 @@
 Patch0:         quickrex-disable-jregex-capability.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    gcc-java
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
 BuildRequires:    java-devel >= 1.5.0
-%endif
-%if ! %{gcj_support}
 BuildArch: noarch
-%endif
 
 BuildRequires: eclipse-pde >= 1:3.2.0
 Requires: eclipse-platform >= 3.2.1 
@@ -72,7 +63,7 @@
 
 %install
 rm -rf %{buildroot}
-installDir=%{buildroot}%{eclipse_base}/dropins/quickrex
+installDir=%{buildroot}%{install_loc}/quickrex
 install -d -m 755 $installDir
 unzip -q -d $installDir \
  build/rpmBuild/de.babe.eclipse.plugins.QuickREx.zip
@@ -85,37 +76,19 @@
 ln -s %{_javadir}/regexp.jar %{regexp_jar}
 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 Plug-In/html
-%{eclipse_base}/dropins/quickrex
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/%{upstream_name}.*
-%endif
+%{install_loc}/quickrex
 
 %changelog
+* Sat Oct 11 2008 Alphonse Van Assche <alcapcom at fedoraproject.org> 3.5.0-9
+- Remove gcj compilation
+- Add %%{install_loc}
+
 * Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 3.5.0-8
 - Update to build against Eclipse SDK 3.4