packages: bioapi/bioapi.spec, bioapi/bioapi-build.patch (NEW), bioapi/bioap...
glen
glen at pld-linux.org
Sun Jan 16 23:45:09 CET 2011
Author: glen Date: Sun Jan 16 22:45:09 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- add patches from gentoo
---- Files affected:
packages/bioapi:
bioapi.spec (1.11 -> 1.12) , bioapi-build.patch (NONE -> 1.1) (NEW), bioapi-enroll-ret.patch (NONE -> 1.1) (NEW), bioapi-gcc44.patch (NONE -> 1.1) (NEW), bioapi-no-delete.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/bioapi/bioapi.spec
diff -u packages/bioapi/bioapi.spec:1.11 packages/bioapi/bioapi.spec:1.12
--- packages/bioapi/bioapi.spec:1.11 Tue Sep 4 15:04:23 2007
+++ packages/bioapi/bioapi.spec Sun Jan 16 23:45:04 2011
@@ -14,6 +14,10 @@
Group: Applications/Networking
Source0: http://bioapi-linux.googlecode.com/files/%{name}_%{version}.tar.gz
# Source0-md5: 9bcfb8505a9e4379aa5012300afd3f8c
+Patch0: %{name}-build.patch
+Patch1: %{name}-enroll-ret.patch
+Patch2: %{name}-gcc44.patch
+Patch3: %{name}-no-delete.patch
URL: http://code.google.com/p/bioapi-linux/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
@@ -87,6 +91,10 @@
%prep
%setup -q -n %{name}-linux
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -100,18 +108,17 @@
%else
--without-Qt-dir \
%endif
- --includedir=%{_includedir}/%{name}
+ --includedir=%{_includedir}/%{name}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_includedir}/%{name},/var/lib/bioapi}
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install imports/cdsa/v2_0/inc/cssmtype.h \
+cp -p imports/cdsa/v2_0/inc/cssmtype.h \
$RPM_BUILD_ROOT%{_includedir}/%{name}
mv $RPM_BUILD_ROOT%{_bindir}/Sample $RPM_BUILD_ROOT%{_bindir}/BioAPI-Sample
@@ -190,6 +197,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2011/01/16 22:45:04 glen
+- add patches from gentoo
+
Revision 1.11 2007/09/04 13:04:23 wolvverine
- add QT_DIR
================================================================
Index: packages/bioapi/bioapi-build.patch
diff -u /dev/null packages/bioapi/bioapi-build.patch:1.1
--- /dev/null Sun Jan 16 23:45:09 2011
+++ packages/bioapi/bioapi-build.patch Sun Jan 16 23:45:04 2011
@@ -0,0 +1,42 @@
+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@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-CPPFLAGS = -I${top_srcdir}/include/ \
++AM_CPPFLAGS = -I${top_srcdir}/include/ \
+ -I${top_srcdir}/imports/cdsa/v2_0/inc/
+
+ CXX = @CXX@
+@@ -111,7 +111,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-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@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-CPPFLAGS = -I${top_srcdir}/include \
++AM_CPPFLAGS = -I${top_srcdir}/include \
+ -I${top_srcdir}/imports/cdsa/v2_0/inc \
+ ${QT_CXXFLAGS}
+
+@@ -121,7 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
++AM_LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
+ ${QT_LIBS}
+
+ LEX = @LEX@
================================================================
Index: packages/bioapi/bioapi-enroll-ret.patch
diff -u /dev/null packages/bioapi/bioapi-enroll-ret.patch:1.1
--- /dev/null Sun Jan 16 23:45:09 2011
+++ packages/bioapi/bioapi-enroll-ret.patch Sun Jan 16 23:45:04 2011
@@ -0,0 +1,16 @@
+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;
+ }
+ }
+
================================================================
Index: packages/bioapi/bioapi-gcc44.patch
diff -u /dev/null packages/bioapi/bioapi-gcc44.patch:1.1
--- /dev/null Sun Jan 16 23:45:09 2011
+++ packages/bioapi/bioapi-gcc44.patch Sun Jan 16 23:45:04 2011
@@ -0,0 +1,12 @@
+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
+
================================================================
Index: packages/bioapi/bioapi-no-delete.patch
diff -u /dev/null packages/bioapi/bioapi-no-delete.patch:1.1
--- /dev/null Sun Jan 16 23:45:09 2011
+++ packages/bioapi/bioapi-no-delete.patch Sun Jan 16 23:45:04 2011
@@ -0,0 +1,15 @@
+do not delete the installed symlink -- let the package manager handle that
+
+--- bioapi-linux/apps/mod_install/install.c
++++ bioapi-linux/apps/mod_install/install.c
+@@ -496,10 +496,6 @@
+ }
+ else if ( Action == INSTALL_ACTION_UNINSTALL )
+ {
+-/* Linux-Port: Added the Linux branch */
+-#if defined (LINUX) || defined (SOLARIS)
+- DeleteFile(szDstPath);
+-#endif
+ printf( "Module uninstalled successfully.\n" );
+ }
+ else if ( Action == INSTALL_ACTION_REFRESH )
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bioapi/bioapi.spec?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list