SPECS: hal.spec - moved gphoto files to hal-gphoto.spec - release 2

[qboosh]

Author: qboosh                       Date: Sat May 26 15:39:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- moved gphoto files to hal-gphoto.spec
- release 2

---- Files affected:
SPECS:
   hal.spec (1.135 -> 1.136) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.135 SPECS/hal.spec:1.136
--- SPECS/hal.spec:1.135	Thu May 24 19:41:36 2007
+++ SPECS/hal.spec	Sat May 26 17:39:31 2007
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# TODO: move -gphoto to hal-gphoto.spec? (it's fully independent)
 #
 # Conditional build:
 %bcond_without	doc		# disable documentation building
@@ -8,7 +7,7 @@
 Summary(pl.UTF-8):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.9
-Release:	1
+Release:	2
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
@@ -16,9 +15,7 @@
 Source1:	%{name}daemon.init
 Source2:	%{name}d.sysconfig
 Source3:	%{name}-device-manager.desktop
-Source4:	%{name}-libgphoto2.fdi
-Source5:	%{name}-libgphoto_udev.rules
-Source6:	%{name}-storage-policy-fixed-drives.fdi
+Source4:	%{name}-storage-policy-fixed-drives.fdi
 Patch0:		%{name}-device_manager.patch
 Patch1:		%{name}-tools.patch
 Patch2:		%{name}-parted.patch
@@ -140,25 +137,6 @@
 %description device-manager -l pl.UTF-8
 Program dla GNOME wyświetlający urządzenia wykryte przez HAL.
 
-%package gphoto
-Summary:	Userspace support for digital cameras
-Summary(pl.UTF-8):	Wsparcie dla kamer cyfrowych w przestrzeni użytkownika
-Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
-Requires:	libusb >= 0.1.10a
-Requires:	udev >= 1:089
-Provides:	udev-digicam
-Obsoletes:	hotplug-digicam
-Obsoletes:	udev-digicam
-
-%description gphoto
-Set of Udev rules and HAL device information file to handle digital
-cameras in userspace.
-
-%description gphoto -l pl.UTF-8
-Zestaw reguł Udev i plik z informacjami o urządzeniach HALa do obsługi
-kamer cyfrowych w przestrzeni użytkownika.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -205,12 +183,8 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/hald
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 
-# hal-gphoto
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/fdi/information/10freedesktop/10-gphoto.fdi
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/52-udev-gphoto.rules
-
 # policy file to ignore fixed disks.
-install %{SOURCE6} \
+install %{SOURCE4} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi
 
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d
@@ -240,15 +214,6 @@
 %postun	libs -p /sbin/ldconfig
 
 
-%post gphoto
-%service -q haldaemon restart
-%banner %{name} -e << EOF
-WARNING!
- hal-gphoto NO LONGER uses special "digicam" group.
- Please add yourself to more common "usb" group instead.
-
-EOF
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README doc/TODO
@@ -321,17 +286,16 @@
 %{_datadir}/%{name}/device-manager/*.glade
 %{_desktopdir}/*.desktop
 
-%files gphoto
-%defattr(644,root,root,755)
-%{_sysconfdir}/udev/rules.d/52-udev-gphoto.rules
-%{_datadir}/%{name}/fdi/information/10freedesktop/10-gphoto.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.136  2007/05/26 15:39:31  qboosh
+- moved gphoto files to hal-gphoto.spec
+- release 2
+
 Revision 1.135  2007/05/24 17:41:36  qboosh
 - added parted patch to kill -luuid from libhal linking and allow parted 1.8.7
 - removed duplicate of gphoto rules from base package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.135&r2=1.136&f=u