packages: pmount/pmount.spec - kill HAL with bcond

baggins baggins at pld-linux.org
Tue Feb 22 17:11:47 CET 2011


Author: baggins                      Date: Tue Feb 22 16:11:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- kill HAL with bcond

---- Files affected:
packages/pmount:
   pmount.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/pmount/pmount.spec
diff -u packages/pmount/pmount.spec:1.21 packages/pmount/pmount.spec:1.22
--- packages/pmount/pmount.spec:1.21	Wed May 19 19:26:51 2010
+++ packages/pmount/pmount.spec	Tue Feb 22 17:11:42 2011
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	hal		# build pmount-hal (HAL is deprecated)
+#
 Summary:	Programs for mounting and unmounting filesystems as normal user
 Summary(pl.UTF-8):	Programy do montowania i odmontowywania systemów plików jako zwykły użytkownik
 Name:		pmount
@@ -14,13 +18,13 @@
 BuildRequires:	automake >= 2.52
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel
-BuildRequires:	hal-devel >= 0.5.2
+%{?with_hal:BuildRequires:	hal-devel >= 0.5.2}
 BuildRequires:	intltool >= 0.21
 BuildRequires:	libblkid-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	sysfsutils-devel >= 1.3.0-3
-Requires:	hal >= 0.5.2
+%{?with_hal:Requires:	hal >= 0.5.2}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,7 +47,9 @@
 %{__aclocal}
 %{__automake}
 %{__autoconf}
-%configure
+%configure \
+	%{__enable_disable hal hal}
+
 %{__make}
 
 %install
@@ -63,7 +69,7 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/pmount.allow
 %attr(4755,root,root) %{_bindir}/pmount
 %attr(4755,root,root) %{_bindir}/pumount
-%attr(755,root,root) %{_bindir}/pmount-hal
+%{?with_hal:%attr(755,root,root) %{_bindir}/pmount-hal}
 %{_mandir}/man1/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -72,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/02/22 16:11:42  baggins
+- kill HAL with bcond
+
 Revision 1.21  2010/05/19 17:26:51  sparky
 - BR: libblkid-devel
 
================================================================

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



More information about the pld-cvs-commit mailing list