rpms/gphoto2/devel gphoto2.spec, 1.79, 1.80 90-gphoto-camera-policy.fdi, 1.4, NONE gen-libgphoto-hal-fdi, 1.2, NONE gphoto-set-procperm, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23333

Modified Files:
	gphoto2.spec 
Removed Files:
	90-gphoto-camera-policy.fdi gen-libgphoto-hal-fdi 
	gphoto-set-procperm 
Log Message:
- ACL handling is now moved into HAL (#229230)



Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gphoto2.spec	18 Jan 2007 15:39:54 -0000	1.79
+++ gphoto2.spec	19 Feb 2007 19:02:27 -0000	1.80
@@ -8,14 +8,12 @@
 %define libpkg libgphoto2
 %define libver 2.3.1
 Version: %{pkgver}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
-Source3: 90-gphoto-camera-policy.fdi
-Source4: gphoto-set-procperm
 Patch1: gphoto2-pkgcfg.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
@@ -116,26 +114,12 @@
 rm -rf "${RPM_BUILD_ROOT}"
 
 pushd %{libpkg}-%{libver}
-    export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-    make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
-
-    pushd packaging/linux-hotplug/
-    install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
-    export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
-    export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver}
-# get the correct lib
-    export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-    $RPM_BUILD_ROOT%{_libdir}/%{libpkg}/print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-    popd
+	export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+	make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
 popd
 
-install -d -m755 %{buildroot}/usr/share/hal/fdi/policy/20thirdparty/
-install -m755 %{SOURCE3} %{buildroot}/usr/share/hal/fdi/policy/20thirdparty/90-gphoto-camera-policy.fdi
-
 make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
 
-install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/
-install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm
 install -m644 gphoto2.pc gphoto2-port.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
@@ -170,9 +154,6 @@
 %{_libdir}/libgphoto2/*/*.so
 %{_libdir}/*.so.*
 %{_mandir}/man1/gphoto2.1*
-%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-%{_datadir}/hal/fdi/policy/20thirdparty/90-gphoto-camera-policy.fdi
-%{_libexecdir}/gphoto-set-procperm
 %{_libdir}/udev/check-ptp-camera
 
 ####################################
@@ -204,6 +185,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Mon Feb 19 2007 Jindrich Novy <jnovy at redhat.com> 2.3.1-4
+- ACL handling is now moved into HAL (#229230)
+
 * Thu Jan 18 2007 Jindrich Novy <jnovy at redhat.com> 2.3.1-3
 - gphoto2-devel requires libusb-devel (#222015)
 


--- 90-gphoto-camera-policy.fdi DELETED ---


--- gen-libgphoto-hal-fdi DELETED ---


--- gphoto-set-procperm DELETED ---