- updated to 1.2.4

- updated build patch
- removed obsolete enroll-ret,gcc44 patches

diff --git a/bioapi-build.patch b/bioapi-build.patch
index 9d679fe8c8923abae090ba433f6238e2f59d49e5..de7571ff5d1858f168b96ac5e2bbb63e374ddcce 100644 (file)
--- a/bioapi-build.patch
+++ b/bioapi-build.patch
@@ -1,8 +1,8 @@
 http://code.google.com/p/bioapi-linux/issues/detail?id=4
 
---- a/addins/pwbsp/Makefile.in
-+++ b/addins/pwbsp/Makefile.in
-@@ -87,7 +87,7 @@ CC = @CC@
+--- bioapi-linux/addins/pwbsp/Makefile.in.orig 2012-10-22 08:04:44.000000000 +0200
++++ bioapi-linux/addins/pwbsp/Makefile.in      2012-11-01 12:48:56.593549017 +0100
+@@ -113,7 +113,7 @@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
@@ -11,18 +11,18 @@ http://code.google.com/p/bioapi-linux/issues/detail?id=4
                -I${top_srcdir}/imports/cdsa/v2_0/inc/
  
  CXX = @CXX@
-@@ -111,7 +111,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -139,7 +139,7 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
 -LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
 +AM_LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
---- a/addins/qtpwbsp/Makefile.in
-+++ b/addins/qtpwbsp/Makefile.in
-@@ -96,7 +96,7 @@ CC = @CC@
+--- bioapi-linux/addins/qtpwbsp/Makefile.in.orig       2012-10-22 08:04:44.000000000 +0200
++++ bioapi-linux/addins/qtpwbsp/Makefile.in    2012-11-01 12:49:06.603548597 +0100
+@@ -122,7 +122,7 @@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
@@ -31,10 +31,10 @@ http://code.google.com/p/bioapi-linux/issues/detail?id=4
                -I${top_srcdir}/imports/cdsa/v2_0/inc \
                ${QT_CXXFLAGS}
  
-@@ -121,7 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -149,7 +149,7 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
 -LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
 +AM_LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
                ${QT_LIBS}

diff --git a/bioapi-enroll-ret.patch b/bioapi-enroll-ret.patch
deleted file mode 100644 (file)
index e077c13..0000000
--- a/bioapi-enroll-ret.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/236654
-
-make sure we return 0 when things work
-
-patch by kouyu
-
---- bioapi-linux/apps/NonGUI_Sample/main.c
-+++ bioapi-linux/apps/NonGUI_Sample/main.c
-@@ -234,6 +234,7 @@
-     }
-     
-     OutputToFile(userName, EnrolledTemplate);
-+    return 0;
-   }
- }
- 

diff --git a/bioapi-gcc44.patch b/bioapi-gcc44.patch
deleted file mode 100644 (file)
index 85b5eff..0000000
--- a/bioapi-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur bioapi-linux.orig/framework/mds_util_api/mds_app_util.c bioapi-linux/framework/mds_util_api/mds_app_util.c
---- bioapi-linux.orig/framework/mds_util_api/mds_app_util.c    2007-07-14 08:06:14.000000000 +0300
-+++ bioapi-linux/framework/mds_util_api/mds_app_util.c 2009-07-25 23:26:55.000000000 +0300
-@@ -28,7 +28,7 @@
-       /* Linux-Port: added "const" keyword for Linux version */
- #if defined (UNIX)
-       const BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;
--#elif
-+#else
-       BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;
- #endif
- 

diff --git a/bioapi.spec b/bioapi.spec
index 1ebcf8502404921acb3cafbb39486cc0ba9ef9c6..32414c63deeff9a034ab18c92a15d467b6c9ca8e 100644 (file)
--- a/bioapi.spec
+++ b/bioapi.spec
@@ -1,5 +1,5 @@
 # TODO:
-# - change code to do not require *.so libs and use *.so.X.X.X
+# - change code to do not require *.so libs and dlopen by SONAME
 #
 # Conditional build:
 %bcond_without qt      # don't build qtpwbsp module
@@ -7,25 +7,27 @@
 Summary:       Framework for biometric-based authentication
 Summary(pl.UTF-8):     Szkielet do uwierzytelniania opartego o biometrykę
 Name:          bioapi
-Version:       1.2.3
+Version:       1.2.4
 Release:       0.1
 License:       BSD
 Group:         Applications/Networking
+#Source0Download: http://code.google.com/p/bioapi-linux/downloads/list
 Source0:       http://bioapi-linux.googlecode.com/files/%{name}_%{version}.tar.gz
-# Source0-md5: 9bcfb8505a9e4379aa5012300afd3f8c
+# Source0-md5: 98c20bd7bb2d87f24980c87b6e1c3fb6
 Patch0:                %{name}-build.patch
-Patch1:                %{name}-enroll-ret.patch
-Patch2:                %{name}-gcc44.patch
-Patch3:                %{name}-no-delete.patch
+Patch1:                %{name}-no-delete.patch
 URL:           http://code.google.com/p/bioapi-linux/
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.67
 BuildRequires: automake >= 1.6
 BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
+BuildRequires: libtool >= 2:2
 %{?with_qt:BuildRequires:      qt-devel}
 %{?with_qt:BuildRequires:      xorg-lib-libXt-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# circular symbol dependencies between libmds_util and libbioapi_mds300
+%define                skip_post_check_so      libmds_util.so.*
+
 # to get /var/lib/bioapi instead of /var/bioapi
 %define                _localstatedir  /var/lib
 
@@ -92,8 +94,6 @@ Przykładowa aplikacja BioAPI w Qt.
 %setup -q -n %{name}-linux
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -102,8 +102,10 @@ Przykładowa aplikacja BioAPI w Qt.
 %{__automake}
 %configure \
 %if %{with qt}
-       --with-Qt-dir=/usr \
+       --with-Qt-bin-dir=/usr/bin \
+       --with-Qt-include-dir=/usr/include/qt \
        --with-Qt-lib-dir=%{_libdir} \
+       --with-Qt-lib=qt-mt \
 %else
        --without-Qt-dir \
 %endif
@@ -130,7 +132,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/QSample $RPM_BUILD_ROOT%{_bindir}/BioAPI-QSample
 %endif
 
 # modules to dlopen
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib{bioapi_dummy100,pwbsp,qtpwbsp}.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{bioapi_dummy100,pwbsp,qtpwbsp}.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/BioAPI-mds_install -s %{_libdir}
 %{_bindir}/BioAPI-mod_install -fi %{_libdir}/libbioapi100.so
 %{_bindir}/BioAPI-mod_install -fi %{_libdir}/libbioapi_dummy100.so
+%{_bindir}/BioAPI-mod_install -fi %{_libdir}/libpwbsp.so
 
 %postun -p /sbin/ldconfig
 
@@ -156,10 +159,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/BioAPI-*_*
 %attr(755,root,root) %{_bindir}/BioAPITest
 %attr(755,root,root) %{_libdir}/libbioapi100.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libbioapi100.so.0
 %attr(755,root,root) %{_libdir}/libbioapi_dummy100.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libbioapi_dummy100.so.0
 %attr(755,root,root) %{_libdir}/libbioapi_mds300.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libbioapi_mds300.so.0
 %attr(755,root,root) %{_libdir}/libmds_util.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmds_util.so.0
 %attr(755,root,root) %{_libdir}/libpwbsp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpwbsp.so.0
+# libraries are dlopened too
 %attr(755,root,root) %{_libdir}/libbioapi100.so
 %attr(755,root,root) %{_libdir}/libbioapi_dummy100.so
 %attr(755,root,root) %{_libdir}/libbioapi_mds300.so
@@ -187,5 +196,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/BioAPI-MdsEdit
 %attr(755,root,root) %{_bindir}/BioAPI-QSample
 %attr(755,root,root) %{_libdir}/libqtpwbsp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqtpwbsp.so.0
 %attr(755,root,root) %{_libdir}/libqtpwbsp.so
 %endif