X-Git-Url: http://git.pld-linux.org/?p=packages%2Feclipse-plugin-cdt.git;a=blobdiff_plain;f=eclipse-plugin-cdt.spec;h=a78df39641f4d80d3cb2915f622edd5c25b90255;hp=d8edb6e27a9a1093880c412d1305e528088855d9;hb=357c5e6da1a23a722d079074c510b1fc948b6273;hpb=ccc7e2e44456524b26e1be72eb50b8a538106e32

diff --git a/eclipse-plugin-cdt.spec b/eclipse-plugin-cdt.spec
index d8edb6e..a78df39 100644
--- a/eclipse-plugin-cdt.spec
+++ b/eclipse-plugin-cdt.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without	incall	# don't include all tarballs in .src.rpm
 #
+%define		plugin_name	cdt
 %define		need_x86	0
 %define		need_ppc	0
 %define		need_ia64	0
@@ -28,38 +29,23 @@
 %endif
 
 Summary:	CDT - a set of plugins for Eclipse that implement a C/C++ IDE
-Summary(pl.UTF-8):   CDT - zestaw wtyczek do środowiska Eclipse implementujący IDE C/C++
-Name:		eclipse-plugin-cdt
-%define		_ver_major	3.1
-%define		_ver_minor	0
+Summary(pl.UTF-8):	CDT - zestaw wtyczek do środowiska Eclipse implementujący IDE C/C++
+Name:		eclipse-plugin-%{plugin_name}
+%define		_ver_major	7.0
+%define		_ver_minor	1
 Version:	%{_ver_major}.%{_ver_minor}
 Release:	1
 License:	CPL v1.0
 Group:		Development/Languages
-%if %{need_x86}
-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/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/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/releases/callisto/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz
-# Source3-md5:	89d60a47d475dc280c73047ef415494f
-%endif
+Source0:	http://download.eclipse.org/tools/cdt/releases/helios/dist/cdt-master-%{version}.zip
+# Source0-md5:	c84f16f67b197b4ea8e8a62a9e1d6cea
 URL:		http://www.eclipse.org/cdt/
 BuildRequires:	unzip
-Requires:	eclipse >= 3.0
+Requires:	eclipse >= 3.6
 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/')
-%define		_eclipsedir  	%{_libdir}/eclipse
+%define		_plugindir	%{_libdir}/eclipse/dropins/%{plugin_name}
 
 %description
 The CDT project adds a C/C++ Perspective to the Eclipse Workbench that
@@ -71,71 +57,44 @@ Projekt CDT rozszerza zintegrowane środowisko programistyczne Eclipse
 o nowe elementy wspomagające tworzenie aplikacji w językach C i C++.
 
 %prep
-%ifarch %{ix86}
-%setup -q -c -T -b0
-%endif
-%ifarch ppc
-%setup -q -c -T -b1
-%endif
-%ifarch ia64
-%setup -q -c -T -b2
-%endif
-%ifarch %{x8664}
-%setup -q -c -T -b3
-%endif
+%setup -q -c
 
 %build
+rm -rf plugins/org.eclipse.cdt.*aix*_%{_ver_major}.*
+rm -rf plugins/org.eclipse.cdt.*macosx*_%{_ver_major}.*
+rm -rf plugins/org.eclipse.cdt.*qnx*_%{_ver_major}.*
+rm -rf plugins/org.eclipse.cdt.*solaris*_%{_ver_major}.*
+rm -rf plugins/org.eclipse.cdt.*win32*_%{_ver_major}.*
 %ifnarch %{ix86}
-rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/x86
+rm -rf plugins/org.eclipse.cdt.*.x86_%{_ver_major}.*
 %endif
 %ifnarch ppc
-rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/ppc
+rm -rf plugins/org.eclipse.cdt.*.ppc_%{_ver_major}.*
 %endif
 %ifnarch ia64
-rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/ia64
+rm -rf plugins/org.eclipse.cdt.*.ia64_%{_ver_major}.*
 %endif
 %ifnarch %{x8664}
-rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/x86_64
+rm -rf plugins/org.eclipse.cdt.*.x86_64_%{_ver_major}.*
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_eclipsedir}/{features,plugins}
+install -d $RPM_BUILD_ROOT%{_plugindir}/{features,plugins}
 
-cp -r * $RPM_BUILD_ROOT%{_libdir}
+cp -r * $RPM_BUILD_ROOT%{_plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_eclipsedir}/features/*
-%dir %{_eclipsedir}/plugins
-%{_eclipsedir}/plugins/org.eclipse.cdt_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.core_*.*.*
-
-%dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux.%{_eclipse_arch}_*.*.*
-%dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux.%{_eclipse_arch}_*.*.*/os
-%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
-%{_eclipsedir}/plugins/org.eclipse.cdt.core.linux.%{_eclipse_arch}_*.*.*/*.xml
-%{_eclipsedir}/plugins/org.eclipse.cdt.core.linux.%{_eclipse_arch}_*.*.*/*.html
-
-%{_eclipsedir}/plugins/org.eclipse.cdt.debug.core_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.debug.mi.core_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.debug.mi.ui_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.debug.ui_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.doc.user_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.launch_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.make.core_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.make.ui_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.managedbuilder.core_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.managedbuilder.ui_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.refactoring_*.*.*
-%{_eclipsedir}/plugins/org.eclipse.cdt.ui_*.*.*
+%dir %{_plugindir}
+%dir %{_plugindir}/features
+%dir %{_plugindir}/plugins
+%{_plugindir}/features/*.jar
+%{_plugindir}/plugins/net.sourceforge.lpg*.jar
+%{_plugindir}/plugins/org.eclipse.ant.*.jar
+%{_plugindir}/plugins/org.eclipse.cdt*.jar
+%{_plugindir}/plugins/org.eclipse.test*.jar
+%{_plugindir}/plugins/org.eclipse.tm.tcf*.jar