rpms/gphoto2/FC-6 gphoto2.spec,1.70,1.71 sources,1.13,1.14

Tue Jan 2 16:41:25 UTC 2007

Author: jnovy

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

Modified Files:
	gphoto2.spec sources 
Log Message:
- update to 2.3.1
- don't ship docs in separate tarball, use the internal one
- nuke useless PreReq and BuildRequires
- fix BuildRoot, use dist tag
- specify version of libgphoto2 in Provides
- enable lockdev
- spec cleanup



Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/FC-6/gphoto2.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71

--- gphoto2.spec	12 Jul 2006 06:13:51 -0000	1.70
+++ gphoto2.spec	2 Jan 2007 16:41:23 -0000	1.71
@@ -4,32 +4,24 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
 %define pkg gphoto2
-%define pkgver 2.2.0
+%define pkgver 2.3.1
 %define libpkg libgphoto2
-%define libver 2.2.1
+%define libver 2.3.1
 Version: %{pkgver}
-Release: 2.1
+Release: 1%{?dist}
 License: LGPL
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+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
-Source2: gphoto2-2.1.99-installed-doc.tar.bz2
 Source3: 90-gphoto-camera-policy.fdi
 Source4: gphoto-set-procperm
 Source5: gphoto2-config
-Patch2: gphoto2-2.2.0-gcc4.patch
-Patch5: gphoto2-2.1.99-config.patch
-Patch6: gphoto2-2.2.0-print-camera-list.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
-PreReq: /sbin/ldconfig, grep, fileutils
-Provides: libgphoto2
+Provides: libgphoto2 = %{libver}
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
-BuildRequires: gtk-doc
-BuildRequires: findutils perl
-BuildRequires: transfig
 BuildRequires: lockdev-devel
 BuildRequires: libexif-devel
 BuildRequires: libjpeg-devel, readline-devel
@@ -75,10 +67,7 @@
 
 ####################################
 %prep
-%setup -q -a 1 -a 2
-%patch2 -p1 -b .gcc4
-%patch5 -p1 -b .config
-%patch6 -p1 -b .include
+%setup -q -a 1
 
 ####################################
 %build
@@ -86,33 +75,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
 
 
@@ -121,9 +98,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/
@@ -132,60 +108,38 @@
 # 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}/
 install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm
 
-# not building them - bug in gtk-doc
-rm -rf %{buildroot}%{_docdir}/%{name}
-#mv -f %{buildroot}/%{name} installed-doc
-#mv -f %{buildroot}/%{name}-port installed-doc
-#mv -f %{buildroot}/canon installed-doc
-find installed-doc -name '*.sgml' | xargs -r rm
-
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
 rm -rf %{buildroot}%{_libdir}/*.la
 
-# gphoto2-2.1.99
-#eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
-#eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in`
-
-# ghoto2-2.2.0
-#LIBGPHOTO2_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_CURRENT\],' %{libpkg}-%{libver}/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
-#LIBGPHOTO2_PORT_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_PORT_CURRENT\],' %{libpkg}-%{libver}/libgphoto2_port/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
-
-# the above doesn't get correct numbers -> hardcode them
-LIBGPHOTO2_CURRENT=2
-LIBGPHOTO2_PORT_CURRENT=0
-
 %find_lang %{name}
-%find_lang %{libpkg}-$LIBGPHOTO2_CURRENT
-%find_lang %{libpkg}_port-$LIBGPHOTO2_PORT_CURRENT
+%find_lang %{libpkg}-2
+%find_lang %{libpkg}_port-0
 cat libgphoto2*.lang >> %{name}.lang
 
 
 # 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}
 install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config
 
-
 ####################################
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
@@ -211,6 +165,7 @@
 %{_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
 
 ####################################
 %post
@@ -229,7 +184,7 @@
 ####################################
 %files devel
 %defattr(-,root,root)
-%doc installed-doc
+%doc %{_docdir}/gphoto2
 %{_bindir}/gphoto2-config*
 %{_bindir}/gphoto2-port-config
 %{_includedir}/gphoto2
@@ -241,6 +196,15 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Jan  2 2007 Jindrich Novy <jnovy at redhat.com> 2.3.1-1
+- update to 2.3.1
+- don't ship docs in separate tarball, use the internal one
+- nuke useless PreReq and BuildRequires
+- fix BuildRoot, use dist tag
+- specify version of libgphoto2 in Provides
+- enable lockdev
+- spec cleanup
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.0-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Jun 2006 13:26:37 -0000	1.13
+++ sources	2 Jan 2007 16:41:23 -0000	1.14
@@ -1,4 +1,3 @@
-584e1fca2dd1e6cd210d59f7944c8ebd  gphoto2-2.1.99-installed-doc.tar.bz2
 5f0bdd099f8649abf58490ffc2b5df5b  gphoto2-config
-69827311733e39fafa9f77bb05e55b77  libgphoto2-2.2.1.tar.bz2
-f5c1f83185db598b4ca52889964a5e84  gphoto2-2.2.0.tar.bz2
+00da102280dd5743d8f8b80173b4dd26  gphoto2-2.3.1.tar.bz2
+37f85e34e5b6031ddf6cac8b8782ac4f  libgphoto2-2.3.1.tar.bz2


