X-Git-Url: https://git.pld-linux.org/?p=packages%2Feclipse-plugin-cdt.git;a=blobdiff_plain;f=eclipse-plugin-cdt.spec;h=b2cba9c9d6ccc30552a050c5b5389fcfb8d4dbf7;hp=6a3fb60d7bd9e58e7ff0878d14418c76ce652bf6;hb=b765e41b216cd51814f148ac2274dd48491960f3;hpb=447a9cb8a9cc7bf16bfb8aff1c19ea525641378e

diff --git a/eclipse-plugin-cdt.spec b/eclipse-plugin-cdt.spec
index 6a3fb60..b2cba9c 100644
--- a/eclipse-plugin-cdt.spec
+++ b/eclipse-plugin-cdt.spec
@@ -1,4 +1,7 @@
-%bcond_with	incall	#include all tarballs
+#
+# Conditional build:
+%bcond_without	incall	# don't include all tarballs in .src.rpm
+#
 %define		need_x86	0
 %define		need_ppc	0
 %define		need_ia64	0
@@ -7,7 +10,7 @@
 %if %{with incall}
 %define		need_x86	1
 %define		need_ppc	1
-%define		need_x64	1
+%define		need_ia64	1
 %define		need_x8664	1
 %else
 %ifarch %{ix86}
@@ -24,36 +27,35 @@
 %endif
 %endif
 
-%define		_rc	RC1
 Summary:	CDT - a set of plugins for Eclipse that implement a C/C++ IDE
 Summary(pl):	CDT - zestaw wtyczek do ¶rodowiska Eclipse implementuj±cy IDE C/C++
 Name:		eclipse-plugin-cdt
-%define		_ver_major	3.0
+%define		_ver_major	3.1
 %define		_ver_minor	0
 Version:	%{_ver_major}.%{_ver_minor}
-Release:	0.%{_rc}.1
+Release:	1
 License:	CPL v1.0
 Group:		Development/Languages
 %if %{need_x86}
-Source0:	http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86.tar.gz
-# Source0-md5:	454b6e0279c83fd209d6ac839a459134
+Source0:	http://download.eclipse.org/tools/cdt/releases/callisto/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86.tar.gz
+# Source0-md5:	ae156f85d92528ad8f3175878fc7278c
 %endif
 %if %{need_ppc}
-Source1:	http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ppc.tar.gz
-# Source1-md5:	1e5e716bf6f0bfd56139c706d344142a
+Source1:	http://download.eclipse.org/tools/cdt/releases/callisto/dist/%{version}/org.eclipse.cdt-%{version}-linux.ppc.tar.gz
+# Source1-md5:	fd7d27d16a9bf70df1d39b8f25a57bf9
 %endif
 %if %{need_ia64}
-Source2:	http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ia64.tar.gz
-# Source2-md5:	0e078e332170794b3623d8e5078c1829
+Source2:	http://download.eclipse.org/tools/cdt/releases/callisto/dist/%{version}/org.eclipse.cdt-%{version}-linux.ia64.tar.gz
+# Source2-md5:	87c70904c07f03b4ddb1281fe951eb39
 %endif
 %if %{need_x8664}
-Source3:	http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86_64.tar.gz
-# Source3-md5:	7d8e6c97e9a8055b0823292064f71dbd
+Source3:	http://download.eclipse.org/tools/cdt/releases/callisto/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz
+# Source3-md5:	89d60a47d475dc280c73047ef415494f
 %endif
 URL:		http://www.eclipse.org/cdt/
 BuildRequires:	unzip
 Requires:	eclipse >= 3.0
-ExclusiveArch:	%{ix86} ppc ia64
+ExclusiveArch:	%{ix86} %{x8664} ia64 ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_eclipse_arch	%(echo %{_target_cpu} | sed 's/i.86/x86/;s/athlon/x86/;s/pentium./x86/')
@@ -117,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux.%{_eclipse_arch}_*.*.*/os/linux
 %dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux.%{_eclipse_arch}_*.*.*/os/linux/%{_eclipse_arch}
 %attr(755,root,root) %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux.%{_eclipse_arch}_*.*.*/os/linux/%{_eclipse_arch}/*.so
+%dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*
 %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*/*.jar
 %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*/*.xml
 %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*/*.html