diff --git a/.cvsignore b/.cvsignore index c59cc8a..be82ec1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libfprint-0.1.0-pre1.tar.bz2 +libfprint-0.1.0-pre2.tar.bz2 diff --git a/0002-Fix-fp_get_pollfds.patch b/0002-Fix-fp_get_pollfds.patch deleted file mode 100644 index a0d3f83..0000000 --- a/0002-Fix-fp_get_pollfds.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5534d57ddc156582be5ed68f0e3fb6e23c69f6e9 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 25 Nov 2008 15:54:56 +0000 -Subject: [PATCH] Fix fp_get_pollfds() - -It was increasing i too early, and writing past the allocated -structures. ---- - libfprint/poll.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/libfprint/poll.c b/libfprint/poll.c -index a852905..f78b658 100644 ---- a/libfprint/poll.c -+++ b/libfprint/poll.c -@@ -308,9 +308,10 @@ API_EXPORTED size_t fp_get_pollfds(struct fp_pollfd **pollfds) - - ret = g_malloc(sizeof(struct fp_pollfd) * cnt); - i = 0; -- while ((usbfd = usbfds[i++]) != NULL) { -+ while ((usbfd = usbfds[i]) != NULL) { - ret[i].fd = usbfd->fd; - ret[i].events = usbfd->events; -+ i++; - } - - *pollfds = ret; --- -1.6.0.3 - diff --git a/libfprint.spec b/libfprint.spec index 73157a6..ba876e5 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,14 +1,13 @@ Name: libfprint Version: 0.1.0 -Release: 7.pre1%{?dist} +Release: 8.pre2%{?dist} Summary: Tool kit for fingerprint scanner Group: System Environment/Libraries License: LGPLv2+ URL: http://www.reactivated.net/fprint/wiki/Main_Page -Source0: http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre1.tar.bz2 +Source0: http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: 0002-Fix-fp_get_pollfds.patch Patch1: fprint-add-udev-rules.patch ExcludeArch: s390 s390x @@ -35,7 +34,6 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-0.1.0-pre1 -%patch0 -p1 %patch1 -p1 %build @@ -76,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jun 20 2009 Bastien Nocera 0.1.0-8.pre2 +- Update to 0.1.0-pre2 + * Tue Jun 09 2009 Matthew Garrett 0.1.0-7.pre1 - fprint-add-udev-rules.patch - build udev rules for autosuspend - move hal fdi into the main package rather than -devel diff --git a/sources b/sources index 9723989..8d7ca8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80173e0f871e701a26c8cf4085e46776 libfprint-0.1.0-pre1.tar.bz2 +f0e7fb9438fe17fba642fe59778d668e libfprint-0.1.0-pre2.tar.bz2