Author: glen Date: Mon Jun 20 12:45:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- add dbus and fax bconds
---- Files affected:
packages/hplip:
hplip.spec (1.84 -> 1.85)
---- Diffs:
================================================================
Index: packages/hplip/hplip.spec
diff -u packages/hplip/hplip.spec:1.84 packages/hplip/hplip.spec:1.85
--- packages/hplip/hplip.spec:1.84 Mon Jun 13 21:15:42 2011
+++ packages/hplip/hplip.spec Mon Jun 20 14:45:52 2011
@@ -1,4 +1,13 @@
# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without dbus # build dbus
+%bcond_without fax # build fax, depends on dbus
+
+%if %{without dbus}
+%undefine with_fax
+%endif
+
Summary: Hewlett-Packard Linux Imaging and Printing suite - printing and scanning using HP devices
Summary(pl.UTF-8): Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP
Name: hplip
@@ -14,7 +23,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cups-devel
-BuildRequires: dbus-devel >= 1.0.0
+%{?with_dbus:BuildRequires: dbus-devel >= 1.0.0}
BuildRequires: libjpeg-devel
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
@@ -40,10 +49,10 @@
%define _ulibdir %{_prefix}/lib
-%define cups_datadir %(cups-config --datadir)
+%define cups_datadir %(cups-config --datadir 2>/dev/null || echo ERROR)
%define cups_mimedir %{cups_datadir}/mime
-%define cups_ppddir %{cups_datadir}/model
-%define cups_serverdir %(cups-config --serverbin)
+%define cups_ppddir %{cups_datadir}/model
+%define cups_serverdir %(cups-config --serverbin 2>/dev/null || echo ERROR)
%define cups_backenddir %{cups_serverdir}/backend
%define cups_filterdir %{cups_serverdir}/filter
@@ -168,6 +177,8 @@
%{__automake}
CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti"
%configure \
+ %{!?with_dbus:--disable-dbus-build} \
+ %{!?with_fax:--disable-fax-build} \
--enable-cups-drv-install \
--enable-cups-ppd-install \
--enable-foomatic-drv-install \
@@ -200,6 +211,10 @@
# handled by post script
%{__rm} $RPM_BUILD_ROOT/etc/sane.d/dll.conf
+%if %{without fax}
+rm $RPM_BUILD_ROOT%{cups_filterdir}/pstotiff
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -271,7 +286,9 @@
%{_datadir}/hplip/data/pcl
%{_datadir}/hplip/data/ps
# fax subpackage ?
+%if %{with fax}
%{_datadir}/hplip/fax
+%endif
%{_datadir}/hplip/installer
%{_datadir}/hplip/pcard
%{_datadir}/hplip/prnt
@@ -333,7 +350,9 @@
%files ppd
%defattr(644,root,root,755)
+%if %{with fax}
%{cups_ppddir}/HP-Fax*.ppd.gz
+%endif
%{cups_ppddir}/apollo-*.ppd.gz
%{cups_ppddir}/hp-*.ppd.gz
@@ -347,6 +366,7 @@
%attr(755,root,root) %{cups_filterdir}/hpps
%{cups_datadir}/drv/hp
+%if %{with fax}
%files -n cups-backend-hpfax
%defattr(644,root,root,755)
%attr(755,root,root) %{cups_backenddir}/hpfax
@@ -354,6 +374,7 @@
%attr(755,root,root) %{cups_filterdir}/pstotiff
%{cups_mimedir}/pstotiff.types
%{cups_mimedir}/pstotiff.convs
+%endif
%files -n hal-hplip
%defattr(644,root,root,755)
@@ -365,6 +386,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.85 2011/06/20 12:45:52 glen
+- add dbus and fax bconds
+
Revision 1.84 2011/06/13 19:15:42 qboosh
- general cleanup, including double packaging of some files
- remaining pl
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip.spec?r1=1.84&r2=1.85&f=u