rpms/gphoto2/devel gphoto2.spec,1.74,1.75

[fedora-cvs-commits at redhat.com]

Author: jnovy

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

Modified Files:
	gphoto2.spec 
Log Message:
- enable lockdev, spec cleanup



Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gphoto2.spec	5 Dec 2006 13:45:14 -0000	1.74
+++ gphoto2.spec	8 Dec 2006 12:53:59 -0000	1.75
@@ -77,33 +77,21 @@
 pushd %{libpkg}-%{libver}
 export CFLAGS=$RPM_OPT_FLAGS
 %configure \
-	--mandir=%{_mandir} \
-	--libdir=%{_libdir} \
 	--with-drivers=all \
 	--with-doc-dir=%{_docdir}/%{name} \
-	--disable-static
+	--disable-static \
+	--without-aalib
 
-export tagname=CC
 make
-ln -s . libgphoto2/gphoto2
-ln -s . libgphoto2_port/libgphoto2_port/gphoto2
 popd
 
-gp_path=../libgphoto2_port/libgphoto2_port
-cat $(pwd)/libgphoto2-%{libver}/libgphoto2/libgphoto2.pc | sed \
-  -e "s,^libdir=.*$,libdir=$(pwd)/libgphoto2-%{libver}/libgphoto2," \
-  -e "s,^includedir=.*$,includedir=$(pwd)/libgphoto2-%{libver}/libgphoto2," \
-  -e "s,^Libs:.*},Libs: -L\${libdir}/.libs -L\${libdir}/$gp_path/.libs/," \
-  -e "s,^Cflags:.*$,Cflags: -I\${includedir}/$gp_path -I\${includedir}," \
-  > libgphoto2.pc
-export PKG_CONFIG_PATH=.
+export LIBGPHOTO2_LIBS="-L../%{libpkg}-%{libver}/%{libpkg}/.libs -L../%{libpkg}-%{libver}/%{libpkg}_port/%{libpkg}_port/.libs -lgphoto2 -lgphoto2_port"
+export LIBGPHOTO2_CFLAGS="-I../%{libpkg}-%{libver} -I../%{libpkg}-%{libver}/%{libpkg}_port"
 %configure \
-	--mandir=%{_mandir} \
-	--libdir=%{_libdir} \
 	--enable-docs \
-	--with-doc-dir=%{_docdir}/%{name} 
+	--enable-lockdev \
+	--with-doc-dir=%{_docdir}/%{name}
 
-export tagname=CC
 make
 
 
@@ -112,9 +100,8 @@
 rm -rf "${RPM_BUILD_ROOT}"
 
 pushd %{libpkg}-%{libver}
-export tagname=CC
-export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
+    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/
@@ -123,15 +110,12 @@
 # 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
 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
 make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
 
 install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/
@@ -168,9 +152,10 @@
 
 
 # multilib fun, rename old script, add dummy one
-basearch=%{_arch}
 %ifarch %{ix86}
 basearch=i386
+%else
+basearch=%{_arch}
 %endif
 
 mv ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config-${basearch}
@@ -234,6 +219,8 @@
 %changelog
 * Tue Dec  5 2006 Jindrich Novy <jnovy at redhat.com> 2.3.0-1
 - update to 2.3.0
+- enable lockdev
+- spec cleanup
 
 * Fri Dec  1 2006 Jindrich Novy <jnovy at redhat.com> 2.2.0-4
 - nuke useless PreReq and BuildRequires