Author: qboosh Date: Sat Dec 23 18:10:03 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added kde bcond (untested)
---- Files affected:
SPECS:
openoffice.org.spec (1.627 -> 1.628)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.627 SPECS/openoffice.org.spec:1.628
--- SPECS/openoffice.org.spec:1.627 Sat Dec 23 19:06:08 2006
+++ SPECS/openoffice.org.spec Sat Dec 23 19:09:58 2006
@@ -38,6 +38,7 @@
# Conditional build:
%bcond_without 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 mono # enable compilation of mono bindings
%bcond_without mozilla # without mozilla
@@ -139,7 +140,9 @@
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
BuildRequires: gtk+2-devel
BuildRequires: icu
+%if %{with kde}
BuildRequires: kdelibs-devel
+%endif
BuildRequires: libart_lgpl-devel
%if %{with system_libhnj}
BuildRequires: libhnj-devel
@@ -2171,7 +2174,11 @@
--with-about-bitmaps="\$SRCDIR/openabout_pld.png" \
--with-distro="${DISTRO}" \
--enable-gtk \
+%if %{with kde}
--enable-kde \
+%else
+ --disable-kde \
+%endif
--without-binsuffix \
--with-installed-ooo-dirname=%{name} \
--with-lang=ALL \
@@ -2597,18 +2604,21 @@
#%dir %{_libdir}/%{name}/program/filter
%attr(755,root,root) %{_libdir}/%{name}/program/*.so
-%exclude %{_libdir}/%{name}/program/kdebe1.uno.so
%exclude %{_libdir}/%{name}/program/libvclplug_gtk*.so
+%exclude %{_libdir}/%{name}/program/fps_gnome.uno.so
+#%exclude %{_libdir}/%{name}/program/libfps_gnome.so
+%if %{with kde}
+%exclude %{_libdir}/%{name}/program/kdebe1.uno.so
%exclude %{_libdir}/%{name}/program/libvclplug_kde*.so
%exclude %{_libdir}/%{name}/program/libfps_kde.so
-%exclude %{_libdir}/%{name}/program/fps_gnome.uno.so
%exclude %{_libdir}/%{name}/program/libkabdrv1.so
-#%exclude %{_libdir}/%{name}/program/libfps_gnome.so
+%endif
%attr(755,root,root) %{_libdir}/%{name}/program/*.so.*
#%attr(755,root,root) %{_libdir}/%{name}/program/filter/*.so
%{_fontsdir}/TTF/*.ttf
+%if %{with kde}
%files libs-kde
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/program/kdebe1.uno.so
@@ -2618,6 +2628,7 @@
%attr(755,root,root) %{_libdir}/%{name}/program/libkabdrv1.so
%attr(755,root,root) %{_libdir}/%{name}/program/kde-open-url
#%dir %{_libdir}/%{name}/program/resource.kde
+%endif
%files libs-gtk
%defattr(644,root,root,755)
@@ -2636,6 +2647,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.628 2006/12/23 18:09:58 qboosh
+- added kde bcond (untested)
+
Revision 1.627 2006/12/23 18:06:08 qboosh
- BR reorders, ac/am versions
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.627&r2=1.628&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
