rpms/gphoto2/devel gphoto2-2.1.99-dbus.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 gphoto2-gcc4.patch, 1.2, 1.3 gphoto2.spec, 1.45, 1.46 sources, 1.9, 1.10

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jan 5 14:21:36 UTC 2006 

Author: rvokal

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

Modified Files:
	.cvsignore gphoto2-gcc4.patch gphoto2.spec sources 
Added Files:
	gphoto2-2.1.99-dbus.patch 
Log Message:
- upgrade to 2.1.99 + dbus patch


gphoto2-2.1.99-dbus.patch:
 disk.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE gphoto2-2.1.99-dbus.patch ---
--- gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/disk/disk.c.old	2005-08-14 16:01:38.000000000 +0200
+++ gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/disk/disk.c	2006-01-03 15:07:56.000000000 +0100
@@ -171,10 +171,9 @@
 		
         }
 
-	libhal_free_string_array (volumes);
-	libhal_ctx_free(ctx);
-
-	dbus_connection_unref(dbus_connection);
+       libhal_ctx_free (ctx);
+       dbus_connection_disconnect (dbus_connection);
+       dbus_connection_unref (dbus_connection);
 #else
 	FILE *mnt;
 	struct mntent *mntent;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jun 2005 11:20:50 -0000	1.9
+++ .cvsignore	5 Jan 2006 14:21:31 -0000	1.10
@@ -4,3 +4,5 @@
 gphoto2-2.1.5.tar.gz
 libgphoto2-2.1.6.tar.gz
 gphoto2-2.1.6.tar.gz
+libgphoto2-2.1.99.tar.bz2
+gphoto2-2.1.99.tar.bz2

gphoto2-gcc4.patch:
 camlibs/digita/commands.c                      |    8 ++++----
 libgphoto2_port/libgphoto2_port/gphoto2-port.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: gphoto2-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2-gcc4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gphoto2-gcc4.patch	23 Jun 2005 11:20:50 -0000	1.2
+++ gphoto2-gcc4.patch	5 Jan 2006 14:21:31 -0000	1.3
@@ -1,5 +1,5 @@
---- gphoto2-2.1.6/libgphoto2-2.1.6/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4	2005-02-22 06:33:42.000000000 +0000
-+++ gphoto2-2.1.6/libgphoto2-2.1.6/libgphoto2_port/libgphoto2_port/gphoto2-port.c	2005-06-23 12:07:51.000000000 +0100
+--- gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4	2005-02-22 06:33:42.000000000 +0000
++++ gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/libgphoto2_port/gphoto2-port.c	2005-06-23 12:07:51.000000000 +0100
 @@ -408,7 +408,7 @@
  
  	/* Check if we read as many bytes as expected */
@@ -9,8 +9,8 @@
  	CHECK_RESULT (retval);
  	if (retval != size)
  		gp_log (GP_LOG_DEBUG, "gphoto2-port", _("Could only read %i "
---- gphoto2-2.1.6/libgphoto2-2.1.6/camlibs/digita/commands.c.gcc4	2005-03-21 12:26:46.000000000 +0000
-+++ gphoto2-2.1.6/libgphoto2-2.1.6/camlibs/digita/commands.c	2005-06-23 11:51:43.000000000 +0100
+--- gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/digita/commands.c.gcc4	2005-03-21 12:26:46.000000000 +0000
++++ gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/digita/commands.c	2005-06-23 11:51:43.000000000 +0100
 @@ -73,7 +73,7 @@
  		return -1;
  	}


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gphoto2.spec	10 Dec 2005 16:39:20 -0000	1.45
+++ gphoto2.spec	5 Jan 2006 14:21:31 -0000	1.46
@@ -1,20 +1,21 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
 %define pkg gphoto2
-%define pkgver 2.1.6
+%define pkgver 2.1.99
 %define libpkg libgphoto2
-%define libver 2.1.6
+%define libver 2.1.99
 Version: %{pkgver}
-Release: 7.1
+Release: 1
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.gz
-Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.gz
+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
 Source3: 90-gphoto-camera-policy.fdi
 Source4: gphoto-set-procperm
 Patch2: gphoto2-gcc4.patch
+Patch3: gphoto2-2.1.99-dbus.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 PreReq: /sbin/ldconfig, grep, fileutils
@@ -71,11 +72,12 @@
 %prep
 %setup -q -a 1
 %patch2 -p1 -b .gcc4
+%patch3 -p1 -b .dbus
 
 ####################################
 %build
 pushd %{libpkg}-%{libver}
-%configure --disable-rpath --enable-docs \
+%configure --disable-rpath --enable-docs--enable-docs \
 	--with-doc-dir=%{buildroot}%{_docdir}/%{name}
 export tagname=CC
 make
@@ -91,6 +93,7 @@
   -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}
 export tagname=CC
 make
@@ -122,8 +125,8 @@
 cp -a %{buildroot}%{_docdir}/%{name} installed-doc
 find installed-doc -name '*.sgml' | xargs -r rm
 rm -rf %{buildroot}%{_docdir}/%{name}
-rm -rf %{buildroot}%{_libdir}/gphoto2/*/*a
-rm -rf %{buildroot}%{_libdir}/gphoto2_port/*/*a
+rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
+rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
 
 eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
@@ -134,9 +137,11 @@
 cat libgphoto2*.lang >> %{name}.lang
 
 
+
 ####################################
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
+#echo ${RPM_BUILD_ROOT}
 
 ########################################################################
 # file list and installation for main package
@@ -148,17 +153,16 @@
 %doc AUTHORS README COPYING
 %{_bindir}/gphoto2
 %{_datadir}/libgphoto2
-%dir %{_libdir}/gphoto2_port
-%dir %{_libdir}/gphoto2_port/*
-%{_libdir}/gphoto2_port/*/*.so
-%dir %{_libdir}/gphoto2
-%dir %{_libdir}/gphoto2/*
-%{_libdir}/gphoto2/*/*.so
+%dir %{_libdir}/libgphoto2_port
+%dir %{_libdir}/libgphoto2_port/*
+%{_libdir}/libgphoto2_port/*/*.so
+%dir %{_libdir}/libgphoto2
+%dir %{_libdir}/libgphoto2/*
+%{_libdir}/libgphoto2/*/*.so
 %{_libdir}/*.so.*
-%{_libdir}/libgphoto2
 %{_mandir}/man1/gphoto2.1*
-/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-/usr/share/hal/fdi/policy/20thirdparty/90-gphoto-camera-policy.fdi
+%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+%{_datadir}/hal/fdi/policy/20thirdparty/90-gphoto-camera-policy.fdi
 %{_libexecdir}/gphoto-set-procperm
 
 ####################################
@@ -191,6 +195,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Thu Jan 05 2006 Radek Vokal <rvokal at redhat.com> 2.1.99-1
+- upgrade to 2.1.99 + dbus patch
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 2.1.6-7.1
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jun 2005 11:20:50 -0000	1.9
+++ sources	5 Jan 2006 14:21:31 -0000	1.10
@@ -1,2 +1,2 @@
-1938cbd9718595fd419907bf2f7c3195  libgphoto2-2.1.6.tar.gz
-2de2bcc62599b8a7337b54b0a067c50b  gphoto2-2.1.6.tar.gz
+3c6d9cb65661915e07491a6f9215d5a9  libgphoto2-2.1.99.tar.bz2
+549a9dfae6910ab6456b194ea86b55a2  gphoto2-2.1.99.tar.bz2

More information about the fedora-cvs-commits mailing list