Hello community,
here is the log from the commit of package libica-1_3_9
checked in at Wed Nov 5 01:42:22 CET 2008.
--------
--- libica-1_3_9/libica-1_3_9.changes 2008-11-02 02:00:13.000000000 +0100
+++ /mounts/work_users/ro/STABLE/libica-1_3_9/libica-1_3_9.changes 2008-11-05 01:34:55.724825000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 5 01:34:34 CET 2008 - ro@suse.de
+
+- fix build on all platforms
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
libica-buildfix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libica-1_3_9.spec ++++++
--- /var/tmp/diff_new_pack.u22760/_old 2008-11-05 01:41:53.000000000 +0100
+++ /var/tmp/diff_new_pack.u22760/_new 2008-11-05 01:41:53.000000000 +0100
@@ -22,7 +22,7 @@
BuildRequires: gcc-c++ openssl-devel
Summary: An Interface Library for the ICA Device Driver
Version: 1.3.9
-Release: 3
+Release: 4
License: IBM Public License
Group: Hardware/Other
Source: libica-%{version}.tar.bz2
@@ -34,9 +34,12 @@
Source4: README.SUSE
Source5: sysconfig.z90crypt
Patch1: libica-z90crypt_h-license.patch
+Patch2: libica-buildfix.patch
Url: http://oss.software.ibm.com/developerworks/opensource/libica
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
+Obsoletes: libica < 1.3.9
+Provides: libica = 1.3.9
%description
This package contains the interface library routines used by IBM
@@ -49,6 +52,7 @@
%setup -n libica-%{version}
%setup -n libica-%{version} -T -D -a 1
%patch1 -p1
+%patch2
%build
mkdir -p include/linux/
@@ -66,11 +70,7 @@
mkdir -p $RPM_BUILD_ROOT/usr/include
make INSROOT=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT bindir=%_libdir install
cp -p include/ica_api.h $RPM_BUILD_ROOT/usr/include
-%ifarch s390
-cp -a SuSE/* $RPM_BUILD_ROOT
-install -D %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.z90crypt
-%endif
-%ifarch s390x
+%ifarch s390 s390x
cp -a SuSE/* $RPM_BUILD_ROOT
install -D %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.z90crypt
%endif
@@ -78,10 +78,7 @@
%post
/sbin/ldconfig
-%ifarch s390
-%{fillup_and_insserv -n z90crypt}
-%endif
-%ifarch s390x
+%ifarch s390 s390x
%{fillup_and_insserv -n z90crypt}
%endif
@@ -94,22 +91,19 @@
%files
%defattr(-, root, root)
%doc README.SUSE
-%ifarch s390
-/etc/init.d/z90crypt
-/usr/sbin/rcz90crypt
-%attr(0644,root,root) /var/adm/fillup-templates/sysconfig.z90crypt
-%endif
-%ifarch s390x
+%ifarch s390 s390x
/etc/init.d/z90crypt
/usr/sbin/rcz90crypt
%attr(0644,root,root) /var/adm/fillup-templates/sysconfig.z90crypt
+%{_libdir}/icainfo
%endif
%{_libdir}/libica.*
%{_libdir}/libica-*
-%{_libdir}/icainfo
%attr(0644,root,root) /usr/include/ica_api.h
%changelog
+* Wed Nov 05 2008 ro@suse.de
+- fix build on all platforms
* Sun Nov 02 2008 jjolly@suse.de
- Added CPL license to include/z90crypt.h, removed GPL reference
(This patch is upstream)
++++++ libica-buildfix.patch ++++++
--- configure.in
+++ configure.in
@@ -51,15 +51,19 @@
CFLAGS="$cmdline_CFLAGS"
+IS_S390=no
case $target in
*s390x*)
CFLAGS="$CFLAGS -D_LINUX_S390X_ -D_LINUX_S390_"
+ IS_S390=yes
;;
*s390*)
CFLAGS="$CFLAGS -D_LINUX_S390_"
+ IS_S390=yes
;;
esac
+AM_CONDITIONAL([WANT_ICAINFO], [test "$IS_S390" = yes])
AC_ARG_ENABLE(debug,
[--enable-debug turn on debugging flags],
--- src/Makefile.am
+++ src/Makefile.am
@@ -8,6 +8,8 @@
mp_util.c mpsubadd.c prand.c rsa.c rsakygen.c sha1.c sieve.c\
x931prim.c sha256.c sha512.c
+if WANT_ICAINFO
bin_PROGRAMS = icainfo
icainfo_SOURCES = icainfo.c
+endif
--- src/icalinux.c
+++ src/icalinux.c
@@ -386,10 +386,8 @@
#endif
#endif
-#ifdef _LINUX_S390_
#define __USE_GNU
#include