rpms/libgphoto2/devel .cvsignore, 1.2, 1.3 gphoto2-pkgcfg.patch, 1.1, 1.2 gphoto2-storage.patch, 1.1, 1.2 libgphoto2.spec, 1.4, 1.5 sources, 1.2, 1.3 gphoto2-data-phase.patch, 1.1, NONE
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Mon Jun 2 09:21:18 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/libgphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1848
Modified Files:
.cvsignore gphoto2-pkgcfg.patch gphoto2-storage.patch
libgphoto2.spec sources
Removed Files:
gphoto2-data-phase.patch
Log Message:
* Mon Jun 02 2008 Jindrich Novy <jnovy at redhat.com> 2.4.1-1
- update to 2.4.1 (#443515, #436138)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgphoto2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Apr 2008 06:10:29 -0000 1.2
+++ .cvsignore 2 Jun 2008 09:20:38 -0000 1.3
@@ -1 +1,2 @@
libgphoto2-2.4.0.tar.bz2
+libgphoto2-2.4.1.tar.bz2
gphoto2-pkgcfg.patch:
Index: gphoto2-pkgcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/libgphoto2/devel/gphoto2-pkgcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gphoto2-pkgcfg.patch 18 Apr 2008 06:10:29 -0000 1.1
+++ gphoto2-pkgcfg.patch 2 Jun 2008 09:20:38 -0000 1.2
@@ -1,5 +1,5 @@
---- libgphoto2-2.4.0/gphoto2-config.in.pkgcfg 2007-07-27 02:36:23.000000000 +0200
-+++ libgphoto2-2.4.0/gphoto2-config.in 2007-07-31 12:21:14.000000000 +0200
+--- libgphoto2-2.4.1/gphoto2-config.in.pkgcfg 2007-07-27 02:36:23.000000000 +0200
++++ libgphoto2-2.4.1/gphoto2-config.in 2007-07-31 12:21:14.000000000 +0200
@@ -1,11 +1,5 @@
#! /bin/sh
@@ -26,17 +26,17 @@
--cflags)
- echo "-I at includedir@/gphoto2"
-+ pkg-config --cflags gphoto2
++ pkg-config --cflags libgphoto2
;;
--libs)
- echo "-L at libdir@" -lgphoto2 -lgphoto2_port -lm
-+ pkg-config --libs gphoto2
++ pkg-config --libs libgphoto2
;;
*)
---- libgphoto2-2.4.0/libgphoto2_port/gphoto2-port-config.in.pkgcfg 2007-07-27 02:36:16.000000000 +0200
-+++ libgphoto2-2.4.0/libgphoto2_port/gphoto2-port-config.in 2007-07-31 12:21:14.000000000 +0200
+--- libgphoto2-2.4.1/libgphoto2_port/gphoto2-port-config.in.pkgcfg 2007-07-27 02:36:16.000000000 +0200
++++ libgphoto2-2.4.1/libgphoto2_port/gphoto2-port-config.in 2007-07-31 12:21:14.000000000 +0200
@@ -1,11 +1,5 @@
#! /bin/sh
@@ -63,12 +63,12 @@
--cflags)
- echo "-I at includedir@/gphoto2"
-+ pkg-config --cflags gphoto2-port
++ pkg-config --cflags libgphoto2-port
;;
--libs)
- echo "-L at libdir@" -lgphoto2_port
-+ pkg-config --libs gphoto2-port
++ pkg-config --libs libgphoto2-port
;;
*)
gphoto2-storage.patch:
Index: gphoto2-storage.patch
===================================================================
RCS file: /cvs/extras/rpms/libgphoto2/devel/gphoto2-storage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gphoto2-storage.patch 18 Apr 2008 06:10:29 -0000 1.1
+++ gphoto2-storage.patch 2 Jun 2008 09:20:38 -0000 1.2
@@ -1,15 +1,16 @@
---- libgphoto2-2.4.0/packaging/generic/print-camera-list.c.orig 2007-09-18 11:36:19.000000000 -0400
-+++ libgphoto2-2.4.0/packaging/generic/print-camera-list.c 2007-09-18 11:52:42.000000000 -0400
-@@ -799,6 +799,8 @@
+diff -up libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage libgphoto2-2.4.1/packaging/generic/print-camera-list.c
+--- libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage 2008-03-24 12:47:00.000000000 +0100
++++ libgphoto2-2.4.1/packaging/generic/print-camera-list.c 2008-06-02 10:44:29.000000000 +0200
+@@ -793,6 +793,8 @@ fdi_begin_func (const func_params_t *par
printf("<deviceinfo version=\"0.2\">\n");
printf(" <device>\n");
- printf(" <match key=\"info.bus\" string=\"usb\">\n");
+ printf(" <match key=\"info.subsystem\" string=\"usb\">\n");
+ printf(" <!-- skip USB Mass Storage Devices -->\n");
+ printf(" <match key=\"usb.interface.class\" compare_ne=\"8\">\n");
return 0;
}
-@@ -838,52 +840,52 @@
+@@ -832,52 +834,52 @@ fdi_camera_func (const func_params_t *pa
return 0;
}
if (a->usb_vendor) { /* usb product id might be 0! */
@@ -87,7 +88,7 @@
}
} /* camera has USB connection */
return 0;
-@@ -892,6 +894,7 @@
+@@ -886,6 +888,7 @@ fdi_camera_func (const func_params_t *pa
static int
fdi_end_func (const func_params_t *params, void *data)
{
@@ -95,16 +96,16 @@
printf(" </match>\n");
printf(" </device>\n");
printf("</deviceinfo>\n");
-@@ -918,6 +921,8 @@
+@@ -912,6 +915,8 @@ fdi_device_begin_func (const func_params
printf("<deviceinfo version=\"0.2\">\n");
printf(" <device>\n");
- printf(" <match key=\"info.bus\" string=\"usb\">\n");
+ printf(" <match key=\"info.subsystem\" string=\"usb\">\n");
+ printf(" <!-- skip USB Mass Storage Devices -->\n");
+ printf(" <match key=\"usb.interface.class\" compare_ne=\"8\">\n");
return 0;
}
-@@ -961,28 +966,28 @@
+@@ -955,28 +960,28 @@ fdi_device_camera_func (const func_param
/* do not set category. We don't really know what this device really is.
* But we do now that is capable of being a camera, so add to capabilities
*/
@@ -143,7 +144,7 @@
}
#endif
}
-@@ -992,6 +997,7 @@
+@@ -986,6 +991,7 @@ fdi_device_camera_func (const func_param
static int
fdi_device_end_func (const func_params_t *params, void *data)
{
Index: libgphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgphoto2.spec 29 May 2008 18:26:53 -0000 1.4
+++ libgphoto2.spec 2 Jun 2008 09:20:38 -0000 1.5
@@ -1,7 +1,7 @@
Summary: Library for accessing digital cameras
Name: libgphoto2
-Version: 2.4.0
-Release: 3%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
License: GPLv2+ and GPLv2
Group: Development/Libraries
@@ -10,7 +10,6 @@
Patch1: gphoto2-pkgcfg.patch
Patch2: gphoto2-storage.patch
Patch3: gphoto2-ixany.patch
-Patch5: gphoto2-data-phase.patch
Patch6: gphoto2-libusb-fix-build.patch
Url: http://www.gphoto.org/
Requires: lockdev
@@ -22,6 +21,8 @@
BuildRequires: libtool-ltdl-devel, popt-devel
# we run autoreconf:
BuildRequires: autoconf, automake, libtool, gettext-devel
+Obsoletes: gphoto2 <= 2.4.0-10
+Obsoletes: gphoto2-devel <= 2.4.0-10
%description
libgphoto2 is a library that can be used by applications to access
@@ -34,6 +35,8 @@
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: pkgconfig
+Obsoletes: gphoto2-devel <= 2.4.0-10
+Provides: gphoto2-devel = %{version}-%{release}
%description devel
libgphoto2 is a library that can be used by applications to access
@@ -49,7 +52,6 @@
%patch1 -p1 -b .pkgcfg
%patch2 -p1 -b .storage
%patch3 -p1 -b .ixany
-%patch5 -p1 -b .data-phase
%patch6 -p1 -b .libusb-build
cat > gphoto2.pc.in << \EOF
@@ -74,7 +76,7 @@
# But fix a typo first:
sed -i 's/\(AC_SUBST([^,]*\)}/\1/' {m4m,libgphoto2_port/m4}/gp-documentation.m4
sed -i 's/\(m4_pattern_\)disallow/\1forbid/g' {m4m,libgphoto2_port/m4}/gp-check-library.m4
-autoreconf -i
+autoreconf -i --force
export CFLAGS=$RPM_OPT_FLAGS
%configure \
--with-drivers=all \
@@ -147,6 +149,9 @@
%{_mandir}/man3/*
%changelog
+* Mon Jun 02 2008 Jindrich Novy <jnovy at redhat.com> 2.4.1-1
+- update to 2.4.1 (#443515, #436138)
+
* Thu May 29 2008 Stepan Kasal <skasal at redhat.com> 2.4.0-3
- drop gphoto2-norpath.patch
- use quoted here-document in %%prep
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgphoto2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Apr 2008 06:10:29 -0000 1.2
+++ sources 2 Jun 2008 09:20:38 -0000 1.3
@@ -1 +1,2 @@
a60154772635b693ff08b4f34dea7f61 libgphoto2-2.4.0.tar.bz2
+70c7d2c3e84997f29b4e988e56bd02aa libgphoto2-2.4.1.tar.bz2
--- gphoto2-data-phase.patch DELETED ---
More information about the fedora-extras-commits
mailing list