rpms/eclipse-gef/devel eclipse-gef.spec,1.17,1.18

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	eclipse-gef.spec 
Log Message:
- Fix directory ownership.
- Drop gcj support.


Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- eclipse-gef.spec	23 Mar 2009 16:43:05 -0000	1.17
+++ eclipse-gef.spec	7 Apr 2009 12:28:59 -0000	1.18
@@ -1,10 +1,9 @@
 %define eclipse_base     %{_libdir}/eclipse
 %define eclipse_dropin   %{_datadir}/eclipse/dropins/gef
-%define gcj_support      1
 
 Name:      eclipse-gef
 Version:   3.4.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Graphical Editing Framework (GEF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -18,14 +17,7 @@
 
 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
 BuildArch:        noarch
-%endif
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:3.4.2
@@ -86,25 +78,15 @@
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -d %{buildroot}%{eclipse_dropin} build/rpmBuild/org.eclipse.gef.all.zip
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%post sdk -p %{_bindir}/rebuild-gcj-db
-%post examples -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%postun sdk -p %{_bindir}/rebuild-gcj-db
-%postun examples -p %{_bindir}/rebuild-gcj-db
-%endif
-
 %files
 %defattr(-,root,root,-)
 %dir %{eclipse_dropin}
+%dir %{eclipse_dropin}/eclipse
+%dir %{eclipse_dropin}/eclipse/features
+%dir %{eclipse_dropin}/eclipse/plugins
 %doc %{eclipse_dropin}/eclipse/epl-v10.html
 %doc %{eclipse_dropin}/eclipse/notice.html
 %doc %{eclipse_dropin}/eclipse/readme
@@ -117,14 +99,6 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.core_*
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.layouts_*
 
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.gef_*
-%{_libdir}/gcj/%{name}/org.eclipse.draw2d_*
-%{_libdir}/gcj/%{name}/org.eclipse.zest.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.zest.layouts_*
-%endif
-
 %files sdk
 %defattr(-,root,root,-)
 %doc %{eclipse_dropin}/eclipse/epl-v10.html
@@ -143,10 +117,6 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.draw2d.source_*
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.source_*
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.ui.pde_*
-%endif
-
 %files examples
 %defattr(-,root,root,-)
 %doc %{eclipse_dropin}/eclipse/epl-v10.html
@@ -160,14 +130,11 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.source_*
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.text_*
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.flow_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.logic_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.shapes_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.text_*
-%endif
-
 %changelog
+* Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 3.4.2-3
+- Fix directory ownership.
+- Drop gcj support.
+
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 3.4.2-2
 - Rebuild to not ship p2 context.xml.
 - Remove context.xml from %%files section.