packages: hplip/hplip.spec - rel 2 - udev obsoletes hal

[baggins]

Author: baggins                      Date: Thu Jul 28 11:08:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- udev obsoletes hal

---- Files affected:
packages/hplip:
   hplip.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: packages/hplip/hplip.spec
diff -u packages/hplip/hplip.spec:1.85 packages/hplip/hplip.spec:1.86
--- packages/hplip/hplip.spec:1.85	Mon Jun 20 14:45:52 2011
+++ packages/hplip/hplip.spec	Thu Jul 28 13:07:58 2011
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP
 Name:		hplip
 Version:	3.11.5
-Release:	1
+Release:	2
 License:	BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest)
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
@@ -39,6 +39,7 @@
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	python-modules
+Obsoletes:	hal-hplip
 Obsoletes:	hpijs
 Obsoletes:	hplip-daemon
 Obsoletes:	python-hplip
@@ -149,18 +150,6 @@
 Ten pakiet umożliwia wysyłanie faksów z poziomu CUPS-a poprzez
 urządzenia HP AiO.
 
-%package -n hal-hplip
-Summary:	HAL device information for HPLIP supported devices
-Summary(pl.UTF-8):	Informacje o urządzeniach HAL dla urządzeń obsługiwanych przez HPLIP
-Group:		Applications/Printing
-Requires:	%{name} = %{version}-%{release}
-
-%description -n hal-hplip
-HAL device information for HPLIP supported devices
-
-%description -n hal-hplip -l pl.UTF-8
-Informacje o urządzeniach HAL dla urządzeń obsługiwanych przez HPLIP.
-
 %prep
 %setup -q
 %undos Makefile.am
@@ -215,6 +204,9 @@
 rm $RPM_BUILD_ROOT%{cups_filterdir}/pstotiff
 %endif
 
+# use udev, hal's dead
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/hal
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -376,16 +368,16 @@
 %{cups_mimedir}/pstotiff.convs
 %endif
 
-%files -n hal-hplip
-%defattr(644,root,root,755)
-%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2011/07/28 11:07:58  baggins
+- rel 2
+- udev obsoletes hal
+
 Revision 1.85  2011/06/20 12:45:52  glen
 - add dbus and fax bconds
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip.spec?r1=1.85&r2=1.86&f=u