- should be df-friendly now

- unified a little, reduced macros (_o_v_e_r)_underscoring

Changed files:
    eclipse-swt.spec -> 1.14

diff --git a/eclipse-swt.spec b/eclipse-swt.spec
index 14b5d68f329f8e7c06573b733c091abfae613f56..ac0a2b5e7acf857900789cbcab50ebb683008009 100644 (file)
--- a/eclipse-swt.spec
+++ b/eclipse-swt.spec
@@ -2,52 +2,47 @@
 # - build instructions: http://www.eclipse.org/swt/faq.php#howbuilddll
 #
 # Conditional build:
-%bcond_without gnome           # build without gnome
-%bcond_without xulrunner               # build without xulrunner
-%bcond_without glx             # build without glx
+%bcond_without gnome           # build without GNOME
+%bcond_without xulrunner       # build without xulrunner
+%bcond_without glx             # build without GLX
 %bcond_with    cairo           # build with cairo
 #
-%define   _buildid  200706251500
-#define   _mver   M6
-%define   _ver_major  3.3
-%define   _ver_minor  0
-%define   _ver_swt    3346
-%define   _ver    %{_ver_major}.%{_ver_minor}
+%define        buildid  200706251500
+#define        mver   M6
+%define        ver_major  3.3
+%define        ver_minor  0
+%define        ver_swt    3346
 
 %ifarch %{x8664}
-%define _swtsrcdir  plugins/org.eclipse.swt.gtk.linux.x86_64
-%define _swtgtkdir  plugins/org.eclipse.swt.gtk.linux.x86_64
+%define        swtsrcdir       plugins/org.eclipse.swt.gtk.linux.x86_64
+%define        swtgtkdir       plugins/org.eclipse.swt.gtk.linux.x86_64
 %endif
 
 %ifarch ppc
-%define _swtsrcdir  plugins/org.eclipse.swt.gtk.linux.ppc
-%define _swtgtkdir  plugins/org.eclipse.swt.gtk.linux.ppc
+%define swtsrcdir      plugins/org.eclipse.swt.gtk.linux.ppc
+%define swtgtkdir      plugins/org.eclipse.swt.gtk.linux.ppc
 %endif
 
 %ifarch %{ix86}
-%define _swtsrcdir  plugins/org.eclipse.swt.gtk.linux.x86
-%define _swtgtkdir  plugins/org.eclipse.swt.gtk.linux.x86
+%define swtsrcdir      plugins/org.eclipse.swt.gtk.linux.x86
+%define swtgtkdir      plugins/org.eclipse.swt.gtk.linux.x86
 %endif
 
-%define   _eclipse_arch %(echo %{_target_cpu} | sed 's/i.86/x86/;s/athlon/x86/;s/pentium./x86/')
-%define   no_install_post_chrpath   1
-%ifarch %{x8664}
-%define         _noautostrip  .*\\.so
-%endif
+%define        eclipse_arch    %(echo %{_target_cpu} | sed 's/i.86/x86/;s/athlon/x86/;s/pentium./x86/')
 
 Summary:       SWT - a widget toolkit for Java
 Summary(pl.UTF-8):     SWT - zestaw widgetów dla Javy
 Name:          eclipse-swt
-Version:       %{_ver_major}
-#Release:      0.%{_mver}_%{_buildid}.1
+Version:       %{ver_major}
+#Release:      0.%{mver}_%{buildid}.1
 Release:       1
 License:       CPL v1.0
 Group:         Libraries
-#Source0:      http://download.eclipse.org/downloads/drops/S-%{_ver_major}%{_mver}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}%{_mver}.zip
+#Source0:      http://download.eclipse.org/downloads/drops/S-%{ver_major}%{mver}-%{buildid}/eclipse-sourceBuild-srcIncluded-%{ver_major}%{mver}.zip
+Source0:       http://download.eclipse.org/eclipse/downloads/drops/R-%{ver_major}-%{buildid}/eclipse-sourceBuild-srcIncluded-%{version}.zip
 # Source0-md5: 91c688221479986dbdd7d1a0771f04cc
-Source0:       http://download.eclipse.org/eclipse/downloads/drops/R-%{_ver_major}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{version}.zip
 Patch0:                %{name}-NULL.patch
-URL:           http://www.eclipse.org/swt
+URL:           http://www.eclipse.org/swt/
 %{?with_glx:BuildRequires:     OpenGL-devel}
 BuildRequires: ant >= 1.6.1
 BuildRequires: atk-devel
@@ -66,6 +61,11 @@ Requires:    jdk >= 1.4
 ExclusiveArch: %{ix86} %{x8664} ppc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                no_install_post_chrpath 1
+%ifarch %{x8664}
+%define                _noautostrip    .*\\.so
+%endif
+
 %description
 SWT is a widget toolkit for Java designed to provide efficient,
 portable access to the user-interface facilities of the operating
@@ -78,10 +78,10 @@ systemach operacyjnych, na których został zaimplementowany.
 
 %prep
 %setup -q -c
-%ant -f %{_swtsrcdir}/build.xml src.zip
+%ant -f %{swtsrcdir}/build.xml src.zip
 mkdir swt
 cd swt
-%{__unzip} -qq -o ../%{_swtsrcdir}/src.zip
+%{__unzip} -qq -o ../%{swtsrcdir}/src.zip
 %patch0 -p0
 
 %build
@@ -97,14 +97,14 @@ cd swt
        XTEST_LIB_PATH=%{_prefix}/X11R6/%{_lib} \
        OPT="%{rpmcflags}"
 
-%ant -f %{_swtsrcdir}/build.xml build.jars
+%ant -f %{swtsrcdir}/build.xml build.jars
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-install %{_swtsrcdir}/swt.jar $RPM_BUILD_ROOT%{_javadir}
+install %{swtsrcdir}/swt.jar $RPM_BUILD_ROOT%{_javadir}
 
-dir=%{_libdir}/swt/%{_swtgtkdir}_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
+dir=%{_libdir}/swt/%{swtgtkdir}_%{ver_major}.%{ver_minor}/os/linux/%{eclipse_arch}
 install -d $RPM_BUILD_ROOT$dir
 for a in swt/libswt-*.so; do
        install $a $RPM_BUILD_ROOT$dir
@@ -125,17 +125,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %dir %{_libdir}/swt
-%dir %{_libdir}/swt/%{_swtgtkdir}_*.*.*
-%dir %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os
-%dir %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux
-%dir %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}
+%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*
+%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*/os
+%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux
+%dir %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}
 %{_javadir}/swt.jar
 %{_libdir}/swt/about_files
 %{_libdir}/swt/about.html
-%{_libdir}/swt/libswt-*-%{_ver_swt}.so
-%attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-atk-gtk-*.so
-%{?with_glx:%attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-glx-gtk-*.so}
-%{?with_gnome:%attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gnome-gtk-*.so}
-%attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gtk-*.so
-%attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-pi-gtk-*.so
-%{?with_xulrunner:%attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-xulrunner-gtk-*.so}
+%{_libdir}/swt/libswt-*-%{ver_swt}.so
+%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-atk-gtk-*.so
+%{?with_glx:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-glx-gtk-*.so}
+%{?with_gnome:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-gnome-gtk-*.so}
+%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-gtk-*.so
+%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-pi-gtk-*.so
+%{?with_xulrunner:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-xulrunner-gtk-*.so}