Author: arekm Date: Sat Jan 30 22:24:41 2010 GMT Module: packages Tag: DEVEL ---- Log message: - try to enable kde4
---- Files affected: packages/openoffice.org: openoffice.org.spec (1.843.2.2 -> 1.843.2.3) ---- Diffs: ================================================================ Index: packages/openoffice.org/openoffice.org.spec diff -u packages/openoffice.org/openoffice.org.spec:1.843.2.2 packages/openoffice.org/openoffice.org.spec:1.843.2.3 --- packages/openoffice.org/openoffice.org.spec:1.843.2.2 Sat Jan 30 20:22:52 2010 +++ packages/openoffice.org/openoffice.org.spec Sat Jan 30 23:24:36 2010 @@ -37,7 +37,8 @@ # Conditional build: %bcond_with gnomevfs # GNOME VFS and Evolution 2 support %bcond_without java # without Java support (disables help support) -%bcond_without kde # KDE L&F packages +%bcond_with kde # KDE L&F packages +%bcond_without kde4 # KDE4 L&F packages %bcond_with mono # enable compilation of mono bindings %bcond_without mozilla # without mozilla components %bcond_without i18n # do not create i18n packages @@ -185,6 +186,9 @@ BuildConflicts: kde4-kdelibs-devel BuildConflicts: kde4-kdepimlibs-devel %endif +%if %{with kde4} +# BuildRequires: FIXME +%endif BuildRequires: libart_lgpl-devel BuildRequires: libbonobo-devel >= 2.0 %{?with_system_libhnj:BuildRequires: libhnj-devel} @@ -2559,6 +2563,8 @@ --disable-gnome-vfs \ --enable-gio \ %endif + %{?with_kde:--enable-kde --disable-kde4} \ + %{?with_kde4:--enable-kde4 --disable-kde} \ --with-docdir=%{_docdir}/%{name}-%{version} \ --with-python=%{__python} \ --without-stlport \ @@ -3827,6 +3833,12 @@ %attr(755,root,root) %{ooobasisdir}/program/libvclplug_kde*.so %endif +%if %{with kde4} +%files libs-kde +%defattr(644,root,root,755) +# FIXME +%endif + %files libs-gtk %defattr(644,root,root,755) %attr(755,root,root) %{ooobasisdir}/program/fps_gnome.uno.so @@ -4593,6 +4605,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.843.2.3 2010/01/30 22:24:36 arekm +- try to enable kde4 + Revision 1.843.2.2 2010/01/30 19:22:52 megabajt - removed obsolete patches - use bash as build shell (build fails with tcsh) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.843.2.2&r2=1.843.2.3&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit