rpms/gphoto2/devel gphoto2.spec,1.46,1.47

Fri Jan 13 11:47:19 UTC 2006

Author: rvokal

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

Modified Files:
	gphoto2.spec 
Log Message:
 - spec file clean-up
 - use ./print-usb-map instead




Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47

--- gphoto2.spec	5 Jan 2006 14:21:31 -0000	1.46
+++ gphoto2.spec	13 Jan 2006 11:47:14 -0000	1.47
@@ -5,13 +5,13 @@
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 1
+Release: 2
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
-Source2: gen-libgphoto-hal-fdi
+#Source2: gen-libgphoto-hal-fdi
 Source3: 90-gphoto-camera-policy.fdi
 Source4: gphoto-set-procperm
 Patch2: gphoto2-gcc4.patch
@@ -77,8 +77,13 @@
 ####################################
 %build
 pushd %{libpkg}-%{libver}
-%configure --disable-rpath --enable-docs--enable-docs \
-	--with-doc-dir=%{buildroot}%{_docdir}/%{name}
+export CFLAGS=$RPM_OPT_FLAGS
+%configure \
+	--mandir=%{_mandir} \
+	--libdir=%{_libdir} \
+	--with-drivers=all \
+	--with-doc-dir=%{_docdir}/%{name} \
+	--disable-static
 export tagname=CC
 make
 ln -s . libgphoto2/gphoto2
@@ -93,8 +98,11 @@
   -e "s,^Cflags:.*$,Cflags: -I\${includedir}/$gp_path -I\${includedir}," \
   > libgphoto2.pc
 export PKG_CONFIG_PATH=.
-export DESTDIR=%{buildroot}%{_docdir}/%{name}
-%configure --enable-docs --with-doc-dir=%{buildroot}%{_docdir}/%{name}
+%configure \
+	--mandir=%{_mandir} \
+	--libdir=%{_libdir} \
+	--with-doc-dir=%{_docdir}/%{name} 
+
 export tagname=CC
 make
 
@@ -105,18 +113,21 @@
 pushd %{libpkg}-%{libver}
 
 export tagname=CC
-%makeinstall
+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
-
+#
+#LIBDIR=%{buildroot}%{_libdir} %{SOURCE2} > %{buildroot}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+#
+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
 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
 
 export tagname=CC
-%makeinstall
+make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
 
 install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/
 
@@ -137,11 +148,9 @@
 cat libgphoto2*.lang >> %{name}.lang
 
 
-
 ####################################
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
-#echo ${RPM_BUILD_ROOT}
 
 ########################################################################
 # file list and installation for main package
@@ -195,6 +204,10 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Fri Jan 13 2006 Radek Vokal <rvokal at redhat.com> 2.1.99-2
+- spec file clean-up
+- use ./print-usb-map instead 
+
 * Thu Jan 05 2006 Radek Vokal <rvokal at redhat.com> 2.1.99-1
 - upgrade to 2.1.99 + dbus patch
 


