- updated to 3.0.0rc1, only ix86 tho, i dont care much about other archs

Changed files:
    eclipse-plugin-cdt.spec -> 1.11

diff --git a/eclipse-plugin-cdt.spec b/eclipse-plugin-cdt.spec
index 90facd853d910447732caff247fec5c7d91db262..6a06962d651f86a5ee68f92d8d2f86e236a6e9b4 100644 (file)
--- a/eclipse-plugin-cdt.spec
+++ b/eclipse-plugin-cdt.spec
@@ -1,18 +1,55 @@
+%bcond_with    incall  #include all tarballs
+%define                need_x86        0
+%define                need_ppc        0
+%define                need_ia64       0
+%define                need_x8664      0
+
+%if %{with incall}
+%define                need_x86        1
+%define                need_ppc        1
+%define                need_x64        1
+%define                need_x8664      1
+%else
+%ifarch %{ix86}
+%define                need_x86        1
+%endif
+%ifarch ppc
+%define                need_ppc        1
+%endif
+%ifarch ia64
+%define                need_ia64       1
+%endif
+%ifarch %{x8664}
+%define                need_x8664      1
+%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      2.1
-%define                _ver_minor      1
+%define                _ver_major      3.0
+%define                _ver_minor      0
 Version:       %{_ver_major}.%{_ver_minor}
-Release:       1
+Release:       0.%{_rc}.1
 License:       CPL v1.0
 Group:         Development/Languages
-Source0:       http://download.eclipse.org/tools/cdt/releases/new/zips/%{version}/org.eclipse.cdt-%{version}-linux.x86.zip
-# Source0-md5: 75fcb2f4506ca474e4147210100a046b
-Source1:       http://download.eclipse.org/tools/cdt/releases/new/zips/%{version}/org.eclipse.cdt-%{version}-linux.ppc.zip
+%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
+%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: f16a8cbe6de0989c2adca4723a8d8af6
-Source2:       http://download.eclipse.org/tools/cdt/releases/new/zips/%{version}/org.eclipse.cdt-%{version}-linux.ia64.zip
+%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
+%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: 0e078e332170794b3623d8e5078c1829
+%endif
 URL:           http://www.eclipse.org/cdt/
 BuildRequires: unzip
 Requires:      eclipse >= 3.0
@@ -41,16 +78,22 @@ o nowe elementy wspomagaj
 %ifarch ia64
 %setup -q -c -T -b2
 %endif
+%ifarch %{x8664}
+%setup -q -c -T -b3
+%endif
 
 %build
 %ifnarch %{ix86}
-rm -r eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/x86
+rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/x86
 %endif
 %ifnarch ppc
-rm -r eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/ppc
+rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/ppc
 %endif
 %ifnarch ia64
-rm -r eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/ia64
+rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/ia64
+%endif
+%ifnarch %{x8664}
+rm -rf eclipse/plugins/org.eclipse.cdt.core.linux_%{_ver_major}.%{_ver_minor}/os/linux/x86_64
 %endif
 
 %install
@@ -69,13 +112,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_eclipsedir}/plugins/org.eclipse.cdt_*.*.*
 %{_eclipsedir}/plugins/org.eclipse.cdt.core_*.*.*
 
-%dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*
-%dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*/os
-%dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*/os/linux
-%dir %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_eclipsedir}/plugins/org.eclipse.cdt.core.linux_*.*.*/os/linux/%{_eclipse_arch}/*.so
+%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
 %{_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_*.*.*
@@ -86,5 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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_*.*.*