SPECS: eclipse-swt.spec - builds (--without cairo)

[adamg]

Author: adamg                        Date: Mon Oct 31 18:59:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds (--without cairo)

---- Files affected:
SPECS:
   eclipse-swt.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/eclipse-swt.spec
diff -u SPECS/eclipse-swt.spec:1.3 SPECS/eclipse-swt.spec:1.4
--- SPECS/eclipse-swt.spec:1.3	Fri Jul  1 23:03:10 2005
+++ SPECS/eclipse-swt.spec	Mon Oct 31 19:59:47 2005
@@ -80,7 +80,6 @@
 ant src.zip
 
 %build
-%if 0
 rm -rf swt
 mkdir swt 
 cd swt
@@ -92,11 +91,10 @@
 %if %{without gnome}
 patch -p0 < %{PATCH2}
 %endif
-%endif 
+
 JAVA_HOME=%{_libdir}/java
 export JAVA_HOME
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-cd swt
 %{__make} -f make_linux.mak all \
     CC="%{__cc}" \
     CXX="%{__cxx}" \
@@ -120,7 +118,6 @@
 #cp library/* .
 #{__make} -f make_linux.mak make_mozilla \
 #    OPT="%{rpmcflags}"
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -151,7 +148,7 @@
 %attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-atk-gtk-*.so
 %attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-awt-gtk-*.so
 %if %{with gnome}
-%attr(755,root,root) %{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gnome-gtk-*.so
+%attr(755,root,root) %{_libdir}/swt/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gnome-gtk-*.so
 %endif
 %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-kde-gtk*.so
@@ -164,6 +161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/10/31 18:59:47  adamg
+- builds (--without cairo)
+
 Revision 1.3  2005/07/01 21:03:10  qboosh
 - pl, missing dir, some cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eclipse-swt.spec?r1=1.3&r2=1.4&f=u