rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec,1.19,1.20

[Alphonse Van Assche]

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12585

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
* Thu Oct 7 2008 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.4.0-4
- Remove gcj compilation
- Add %{install_loc}



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- eclipse-rpm-editor.spec	3 Oct 2008 14:22:00 -0000	1.19
+++ eclipse-rpm-editor.spec	7 Oct 2008 21:54:42 -0000	1.20
@@ -1,10 +1,10 @@
-%define gcj_support         1
 %define eclipse_base        %{_libdir}/eclipse
+%define install_loc         %{_datadir}/eclipse/dropins
 %define svn_rev             18653
 
 Name:           eclipse-rpm-editor
 Version:        0.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -15,14 +15,7 @@
 Source1:        fetch-specfile-editor.sh
 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
+BuildRequires: java-devel >= 1.5.0
 BuildRequires: eclipse-pde >= 1:3.3.0
 BuildRequires: eclipse-changelog >= 2.5.1
 Requires: eclipse-platform >= 3.3.1 
@@ -30,13 +23,9 @@
 Requires: rpmlint >= 0.81
 Requires: rpmdevtools 
 
-# These plugins are really noarch but they the changelog plugin need cdt which 
+# These plugins are really noarch but the changelog plugin need cdt which 
 # we only build on these architectures.
-%if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc ia64
-%else
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-%endif
 
 %description
 The Eclipse Specfile Editor package contains Eclipse plugins that are
@@ -49,47 +38,28 @@
 %{eclipse_base}/buildscripts/pdebuild -f  org.eclipse.linuxtools.rpm.ui.editor \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
  -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
- -d changelog
-
+ -d changelog ;
 
 %install
 rm -rf %{buildroot}
-installDir=%{buildroot}%{eclipse_base}/dropins/rpm-editor
+installDir=%{buildroot}%{eclipse_base}%{install_loc}
 install -d -m 755 $installDir
 unzip -q -d $installDir \
  build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip
 
-%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 org.eclipse.linuxtools.rpm.ui.editor-feature/*.html
-%{eclipse_base}/dropins/rpm-editor
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
-%endif
+%{install_loc}/rpm-editor
 
 %changelog
+* Thu Oct 7 2008 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.4.0-4
+- Remove gcj compilation
+- Add %%{install_loc}
+
 * Fri Oct 03 2008 Alexander Kurtakov <akurtako at redhat.com> 0.4.0-3
 - Rebuild for #465109.