diff --git a/.cvsignore b/.cvsignore index b8e8411..7cde068 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ org.python.pydev.feature-src-1_4_2.zip org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2 +org.python.pydev.feature-1.4.3.2627-sources.zip diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec index 62e22d8..563f23c 100644 --- a/eclipse-pydev.spec +++ b/eclipse-pydev.spec @@ -1,5 +1,6 @@ # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo -%define debug_package %{nil} +%global debug_package %{nil} +%global qualifier 2627 Epoch: 1 @@ -8,17 +9,17 @@ Epoch: 1 %define major 1 %define minor 4 -%define maint 2 +%define maint 3 Summary: Eclipse Python development plug-in Name: eclipse-pydev Version: %{major}.%{minor}.%{maint} -Release: 2%{?dist} +Release: 1%{?dist} License: EPL URL: http://pydev.sourceforge.net Group: Development/Tools -Source0: http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-%{major}_%{minor}_%{maint}.zip +Source0: http://downloads.sourceforge.net/pydev/org.python.pydev.feature-%{version}.%{qualifier}-sources.zip Source1: org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2 Source2: fetch-pydev-mylyn.sh @@ -138,11 +139,9 @@ rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgra %build %{eclipse_base}/buildscripts/pdebuild \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ -f org.python.pydev.feature %{eclipse_base}/buildscripts/pdebuild \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ -d mylyn \ -f org.python.pydev.mylyn.feature @@ -160,41 +159,41 @@ unzip -q -d ${installDir}-mylyn build/rpmBuild/org.python.pydev.mylyn.feature.zi # deal with linked deps pushd $installDir/eclipse/plugins -rm -rf org.python.pydev.core_%{version}/commons-codec.jar +rm -rf org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar ln -sf %{_javadir}/jakarta-commons-codec.jar \ - org.python.pydev.core_%{version}/commons-codec.jar + org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar -mkdir org.python.pydev.core_%{version}/lib +mkdir org.python.pydev.core_%{version}.%{qualifier}/lib ln -sf %{_javadir}/junit.jar \ - org.python.pydev.core_%{version}/lib/junit.jar + org.python.pydev.core_%{version}.%{qualifier}/lib/junit.jar -rm -rf org.python.pydev.debug_%{version}/commons-logging-1.1.jar +rm -rf org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar ln -sf %{_javadir}/jakarta-commons-logging.jar \ - org.python.pydev.debug_%{version}/commons-logging-1.1.jar + org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar -rm -rf org.python.pydev.debug_%{version}/ws-commons-util-1.0.2.jar +rm -rf org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar ln -sf %{_javadir}/ws-commons-util.jar \ - org.python.pydev.debug_%{version}/ws-commons-util-1.0.2.jar + org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar -rm -f org.python.pydev.debug_%{version}/xmlrpc-client-3.1.jar +rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar ln -sf %{_javadir}/xmlrpc3-client.jar \ - org.python.pydev.debug_%{version}/xmlrpc-client-3.1.jar + org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar -rm -f org.python.pydev.debug_%{version}/xmlrpc-common-3.1.jar +rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar ln -sf %{_javadir}/xmlrpc3-common.jar \ - org.python.pydev.debug_%{version}/xmlrpc-common-3.1.jar + org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar -rm -f org.python.pydev.debug_%{version}/xmlrpc-server-3.1.jar +rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar ln -sf %{_javadir}/xmlrpc3-server.jar \ - org.python.pydev.debug_%{version}/xmlrpc-server-3.1.jar + org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar -rm -rf org.python.pydev.jython_%{version}/jython.jar +rm -rf org.python.pydev.jython_%{version}.%{qualifier}/jython.jar ln -sf %{_javadir}/jython.jar \ - org.python.pydev.jython_%{version}/jython.jar + org.python.pydev.jython_%{version}.%{qualifier}/jython.jar popd # 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}%{install_loc}/pydev/eclipse/plugins/org.python.pydev.jython_%{version}/Lib/cgi.py +sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{install_loc}/pydev/eclipse/plugins/org.python.pydev.jython_%{version}.%{qualifier}/Lib/cgi.py # convert .py$ files from mode 0644 to mode 0755 chmod 0755 `find ${RPM_BUILD_ROOT} -name '*\.py' -perm 0644 | xargs` @@ -214,6 +213,11 @@ rm -rf ${RPM_BUILD_ROOT} %{install_loc}/pydev-mylyn %changelog +* Fri Feb 20 2009 Alexander Kurtakov 1:1.4.3-1 +- Update to 1.4.3. +- Adapt to upstream usage of qualifier. +- Use %%global instead of %%define. + * Sat Jan 31 2009 Michal Nowak 1:1.4.2-2 - %%defattr(-,root,root,-) for mylyn sub-package - Disable building -debuginfo due to psyco problems; resolves: rhbz#483357 diff --git a/sources b/sources index 4881dea..dda0c85 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -22b7dbf332b2c53372154f5ba651a41a org.python.pydev.feature-src-1_4_2.zip 3a42402df10a42af0a8d648711c36239 org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2 +95b7969a1411cf82520f8c78549bc96f org.python.pydev.feature-1.4.3.2627-sources.zip