SPECS (DEVEL): gaim.spec - fixed broken dbus build, added dbus bcond
glen
glen at pld-linux.org
Tue Jan 3 15:27:49 CET 2006
Author: glen Date: Tue Jan 3 14:27:49 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- fixed broken dbus build, added dbus bcond
---- Files affected:
SPECS:
gaim.spec (1.154.2.5 -> 1.154.2.6)
---- Diffs:
================================================================
Index: SPECS/gaim.spec
diff -u SPECS/gaim.spec:1.154.2.5 SPECS/gaim.spec:1.154.2.6
--- SPECS/gaim.spec:1.154.2.5 Tue Jan 3 14:35:24 2006
+++ SPECS/gaim.spec Tue Jan 3 15:27:44 2006
@@ -8,6 +8,7 @@
%bcond_without doc # do not generate and include documentation
%bcond_without evolution # compile without the Gaim-Evolution plugin
%bcond_without gtkspell # without gtkspell support
+%bcond_without dbus # without dbus (for gaim-remote and others)
#
%define _pre beta1
%include /usr/lib/rpm/macros.perl
@@ -18,7 +19,7 @@
Summary(de): Gaim ist ein Instant Messenger
Name: gaim
Version: 2.0.0
-Release: 0.%{_pre}.1
+Release: 0.%{_pre}.2
Epoch: 1
License: GPL
Group: Applications/Communications
@@ -33,7 +34,7 @@
BuildRequires: audiofile-devel
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: dbus-glib-devel >= 0.35
+%{?with_dbus:BuildRequires: dbus-glib-devel >= 0.35}
%{?with_evolution:BuildRequires: evolution-data-server-devel >= 0.0.95}
BuildRequires: gettext-devel
BuildRequires: gettext-autopoint
@@ -209,6 +210,7 @@
--disable-nas \
--enable-nss=no \
--with-perl-lib=vendor \
+ %{?with_dbus:--enable-dbus --with-dbus-session-dir=/usr/share/dbus-1} \
%{!?with_evolution:--disable-gevolution} \
%{!?with_gtkspell:--disable-gtkspell}
@@ -224,6 +226,7 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/*.la
%find_lang %{name} --with-gnome --all-name
+rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Gaim/.packlist}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -253,7 +256,6 @@
%attr(755,root,root) %{_libdir}/gaim/libsimple.so
%attr(755,root,root) %{_libdir}/gaim/libyahoo.so
%attr(755,root,root) %{_libdir}/gaim/libzephyr.so
-%attr(755,root,root) %{_libdir}/gaim/musicmessaging.so
%attr(755,root,root) %{_libdir}/gaim/notify.so
%attr(755,root,root) %{_libdir}/gaim/relnot.so
%attr(755,root,root) %{_libdir}/gaim/spellchk.so
@@ -263,6 +265,9 @@
%attr(755,root,root) %{_libdir}/gaim/statenotify.so
%attr(755,root,root) %{_libdir}/gaim/ticker.so
%attr(755,root,root) %{_libdir}/gaim/timestamp.so
+%if %{with dbus}
+%attr(755,root,root) %{_libdir}/gaim/musicmessaging.so
+%endif
%{_datadir}/sounds/%{name}
%{_mandir}/man?/*
@@ -271,13 +276,17 @@
%files libs
%defattr(644,root,root,755)
+%if %{with dbus}
%attr(755,root,root) %{_libdir}/libgaim-client.so.*.*.*
+%endif
%files devel
%defattr(644,root,root,755)
+%if %{with dbus}
%attr(755,root,root) %{_libdir}/libgaim-client.so
-%{_aclocaldir}/*.m4
%{_libdir}/libgaim-client.la
+%endif
+%{_aclocaldir}/*.m4
%dir %{_includedir}/gaim
%{_includedir}/gaim/*.h
%{_pkgconfigdir}/*
@@ -302,9 +311,11 @@
%attr(755,root,root) %{_libdir}/gaim/gevolution.so
%endif
+%if %{with dbus}
%files plugin-remote
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gaim-remote.py
+%endif
%if %{with doc}
%files doc
@@ -318,6 +329,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.154.2.6 2006/01/03 14:27:44 glen
+- fixed broken dbus build, added dbus bcond
+
Revision 1.154.2.5 2006/01/03 13:35:24 glen
- BR gettext-autopoint
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gaim.spec?r1=1.154.2.5&r2=1.154.2.6&f=u
More information about the pld-cvs-commit
mailing list