rpms/gphoto2/devel gphoto2.spec,1.54,1.55

[fedora-cvs-commits redhat com]

Author: rvokal

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

Modified Files:
	gphoto2.spec 
Log Message:
- spec file tweak, become self-building again


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gphoto2.spec	11 Feb 2006 03:20:24 -0000	1.54
+++ gphoto2.spec	1 Mar 2006 15:59:25 -0000	1.55
@@ -5,7 +5,7 @@
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 5.2
+Release: 5.4
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -117,14 +117,15 @@
 pushd %{libpkg}-%{libver}
 
 export tagname=CC
+export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
 
-install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
-
-#LIBDIR=%{buildroot}%{_libdir} %{SOURCE2} > %{buildroot}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-export LIBDIR=$RPM_BUILD_ROOT/%{_libdir} 
-export CAMLIBS=$RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/%{libver}
-$RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/print-usb-usermap --fdi > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+    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}
+    ./print-usb-usermap --fdi > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+    popd
 popd
 
 install -d -m755 %{buildroot}/usr/share/hal/fdi/policy/20thirdparty/
@@ -134,7 +135,6 @@
 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
 
 mv -f %{buildroot}%{_docdir}/%{name} installed-doc
@@ -212,6 +212,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Wed Mar 01 2006 Radek Vokál <rvokal redhat com> 2.1.99-5.4
+- spec file tweak, become self-building again
+
 * Fri Feb 10 2006 Jesse Keating <jkeating redhat com> - 2.1.99-5.2
 - bump again for double-long bug on ppc(64)