rpms/eclipse-pydev/devel eclipse-pydev.spec,1.12,1.13
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Oct 17 17:29:10 UTC 2008
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18468/devel
Modified Files:
eclipse-pydev.spec
Log Message:
- Drop gcj support.
- Split mylyn support to subpackage to correct dependencies.
- Drop eclipse-mylyn-ide BR - it is merged into eclipse-mylyn.
Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eclipse-pydev.spec 14 Oct 2008 16:35:29 -0000 1.12
+++ eclipse-pydev.spec 17 Oct 2008 17:28:40 -0000 1.13
@@ -1,7 +1,6 @@
Epoch: 1
%define eclipse_base %{_libdir}/eclipse
-%define gcj_support 1
%define major 1
%define minor 3
@@ -9,7 +8,7 @@
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
Version: %{major}.%{minor}.%{maint}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL
URL: http://pydev.sourceforge.net
Group: Development/Tools
@@ -18,14 +17,7 @@
Source1: org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
Source2: fetch-pydev-mylyn.sh
-%if %{gcj_support}
-BuildRequires: gcc-java >= 4.1.2
-BuildRequires: java-1.5.0-gcj-devel >= 1.5.0
-Requires(post): java-1.5.0-gcj >= 1.5.0
-Requires(postun): java-1.5.0-gcj >= 1.5.0
-%else
BuildRequires: java-devel >= 1.5.0
-%endif
Requires: eclipse-jdt
Requires: python
@@ -37,23 +29,30 @@
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
%ifnarch ppc64
BuildRequires: eclipse-mylyn
-BuildRequires: eclipse-mylyn-ide
%endif
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: junit >= 3.8.1
BuildRequires: commons-codec >= 1.3
BuildRequires: jython >= 2.2
-%if %{gcj_support}
-%else
BuildArch: noarch
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
The eclipse-pydev package contains Eclipse plugins for
Python development.
+%ifnarch ppc64
+%package mylyn
+Summary: Pydev Mylyn Focused UI
+Requires: eclipse-mylyn
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Group: Development/Tools
+
+%description mylyn
+Mylyn Task-Focused UI extensions for Pydev.
+%endif
+
%prep
%setup -q -c
@@ -149,10 +148,6 @@
org.python.pydev.jython_%{version}/jython.jar
popd
-%if %{gcj_support}
-aot-compile-rpm
-%endif
-
# rename cgi.py's shebang from /usr/local/bin/python to /usr/bin/env python
sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{_datadir}/eclipse/dropins/pydev/eclipse/plugins/org.python.pydev.jython_1.3.20/Lib/cgi.py
# convert .py$ files from mode 0644 to mode 0755
@@ -165,26 +160,23 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
-%if %{gcj_support}
-%post -p /usr/bin/rebuild-gcj-db
-
-%postun -p /usr/bin/rebuild-gcj-db
-%endif
-
%files
%defattr(-,root,root,-)
%{_datadir}/eclipse/dropins/pydev
# no xmlrpc3 -> no mylyn on ppc64 due to:
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
+
%ifnarch ppc64
+%files mylyn
%{_datadir}/eclipse/dropins/pydev-mylyn
%endif
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
-
%changelog
+* Fri Oct 17 2008 Alexander Kurtakov <akurtako at redhat.com> 1:1.3.20-2
+- Drop gcj support.
+- Split mydev support to subpackage to correct dependencies.
+- Drop eclipse-mylyn-ide BR - it is merged into eclipse-mylyn.
+
* Tue Oct 14 2008 Michal Nowak <mnowak at redhat.com> 1:1.3.20-1
- bump to 1.3.20
- created general versioning scheme for version tag & tarball URI)
More information about the fedora-extras-commits
mailing list