SPECS: eclipse-swt.spec - build with cairo - rel 4

[cactus]

Author: cactus                       Date: Thu Oct 16 22:38:02 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build with cairo
- rel 4

---- Files affected:
SPECS:
   eclipse-swt.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/eclipse-swt.spec
diff -u SPECS/eclipse-swt.spec:1.21 SPECS/eclipse-swt.spec:1.22
--- SPECS/eclipse-swt.spec:1.21	Wed Jul 30 18:14:12 2008
+++ SPECS/eclipse-swt.spec	Fri Oct 17 00:37:57 2008
@@ -6,7 +6,7 @@
 %bcond_without	gnome		# build without GNOME
 %bcond_without	xulrunner	# build without xulrunner
 %bcond_without	glx		# build without GLX
-%bcond_with	cairo		# build with cairo
+%bcond_without	cairo		# build without cairo
 
 %define	buildid		200710231652
 
@@ -32,7 +32,7 @@
 Summary(pl.UTF-8):	SWT - zestaw widgetów dla Javy
 Name:		eclipse-swt
 Version:	3.3.1.1
-Release:	3
+Release:	4
 License:	CPL v1.0
 Group:		Libraries
 Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{version}-%{buildid}/eclipse-sourceBuild-srcIncluded-%{version}.zip
@@ -108,10 +108,6 @@
 	ln -sf ${dir#%{_libdir}/swt/}/$lib $RPM_BUILD_ROOT%{_libdir}/swt
 done
 
-%if %{with cairo}
-install swt/libcairo.so* $RPM_BUILD_ROOT%{_libdir}/swt
-%endif
-
 install swt/*.html $RPM_BUILD_ROOT%{_libdir}/swt
 cp -a swt/about_files $RPM_BUILD_ROOT%{_libdir}/swt
 
@@ -131,6 +127,7 @@
 %{_libdir}/swt/about.html
 %{_libdir}/swt/libswt-*-*.so
 %attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-atk-gtk-*.so
+%{?with_cairo:%attr(755,root,root) %{_libdir}/swt/%{swtgtkdir}_*.*.*/os/linux/%{eclipse_arch}/libswt-cairo-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
@@ -143,6 +140,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2008/10/16 22:37:57  cactus
+- build with cairo
+- rel 4
+
 Revision 1.21  2008/07/30 16:14:12  hawk
 - fix building with xulrunner 1.9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eclipse-swt.spec?r1=1.21&r2=1.22&f=u