SHA256
1
0
forked from pool/libica

- Removed COPYING from %files, since it is no longer in the tarball.

- Added Add-non-executable-gnu-stack-markings-in-the-assembl.patch
  (bsc#1103493).
- Made multiple changes to the spec file based on the output of
  spec-cleaner

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/libica?expand=0&rev=29
This commit is contained in:
Mark Post 2018-11-16 22:49:59 +00:00 committed by Git OBS Bridge
parent 23e8e71f70
commit 9130c2a747
2 changed files with 47 additions and 39 deletions

View File

@ -18,17 +18,25 @@ Wed Nov 14 18:01:37 UTC 2018 - mpost@suse.com
[FEATURE] Use z14 PRNO-TRNG to seed SHA512-DRBG. [FEATURE] Use z14 PRNO-TRNG to seed SHA512-DRBG.
[PATCH] Various bug fixes. [PATCH] Various bug fixes.
- Dropped obsolete patch increment-icastats-counter-for-aes-gcm.patch - Dropped obsolete patch increment-icastats-counter-for-aes-gcm.patch
- Added "Obsoletes: libica-2_3_0" to the libica-tools package to
fix a problem with upgrading from SLES12 SP2 to either SLES12
SP3/SP4, or SLES15. (bsc#1112655)
- Added "Obsoletes: libica2" to the libica-tools package to fix
a problem with upgrading from SLES12 SP2 to either SLES12
SP3/SP4, or SLES15. (bsc#1046435, bsc#1104638)
- Removed COPYING from %files, since it is no longer in the tarball. - Removed COPYING from %files, since it is no longer in the tarball.
- Added Add-non-executable-gnu-stack-markings-in-the-assembl.patch - Added Add-non-executable-gnu-stack-markings-in-the-assembl.patch
(bsc#1103493). (bsc#1103493).
- Replaced multiple instances of $RPM_BUILD_ROOT with %buildroot - Made multiple changes to the spec file based on the output of
in the spec file. spec-cleaner
-------------------------------------------------------------------
Mon Oct 22 19:09:13 UTC 2018 - mpost@suse.com
- Added "Obsoletes: libica-2_3_0" to the libica-tools package to
fix a problem with upgrading from SLES12 SP2 to either SLES12
SP3/SP4, or SLES15. (bsc#1112655)
-------------------------------------------------------------------
Tue Sep 11 17:19:57 UTC 2018 - mpost@suse.com
- Added "Obsoletes: libica2" to the libica-tools package to fix
a problem with upgrading from SLES12 SP2 to either SLES12
SP3/SP4, or SLES15. (bsc#1046435, bsc#1104638)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 18 02:29:29 UTC 2018 - mpost@suse.com Wed Apr 18 02:29:29 UTC 2018 - mpost@suse.com

View File

@ -18,20 +18,16 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
Name: libica Name: libica
BuildRequires: autoconf Version: 3.3.3
BuildRequires: automake Release: 0
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: openssl-devel
Summary: Library interface for the IBM Cryptographic Accelerator device driver Summary: Library interface for the IBM Cryptographic Accelerator device driver
License: CPL-1.0 License: CPL-1.0
Group: Hardware/Other Group: Hardware/Other
Version: 3.3.3 Url: https://github.com/opencryptoki/libica
Release: 0
Source: libica-%{version}.tar.gz Source: libica-%{version}.tar.gz
Source1: libica-SuSE.tar.bz2 Source1: libica-SuSE.tar.bz2
# The icaioctl.h file came from https://sourceforge.net/p/opencryptoki/icadd/ci/master/tree/ # The icaioctl.h file came from https://sourceforge.net/p/opencryptoki/icadd/ci/master/tree/
@ -41,10 +37,13 @@ Source5: sysconfig.z90crypt
Source6: baselibs.conf Source6: baselibs.conf
Source7: %{name}-rpmlintrc Source7: %{name}-rpmlintrc
Patch1: Add-non-executable-gnu-stack-markings-in-the-assembl.patch Patch1: Add-non-executable-gnu-stack-markings-in-the-assembl.patch
BuildRequires: autoconf
Url: https://github.com/opencryptoki/libica BuildRequires: automake
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++
PreReq: %fillup_prereq %insserv_prereq BuildRequires: libtool
BuildRequires: openssl-devel
PreReq: %fillup_prereq
PreReq: %insserv_prereq
ExclusiveArch: s390 s390x ExclusiveArch: s390 s390x
%description %description
@ -78,12 +77,12 @@ eServer Cryptographic Accelerator (ICA).
%package devel %package devel
Summary: Development files for the ICA device driver interface library Summary: Development files for the ICA device driver interface library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libica3 = %{version}
Requires: libopenssl-devel
Obsoletes: libica-2_1_0-devel < %{version}-%{release} Obsoletes: libica-2_1_0-devel < %{version}-%{release}
Provides: libica-2_1_0-devel = %{version}-%{release} Provides: libica-2_1_0-devel = %{version}-%{release}
Obsoletes: libica-2_3_0-devel < %{version}-%{release} Obsoletes: libica-2_3_0-devel < %{version}-%{release}
Provides: libica-2_3_0-devel = %{version}-%{release} Provides: libica-2_3_0-devel = %{version}-%{release}
Requires: libica3 = %{version}
Requires: libopenssl-devel
%description devel %description devel
This package contains the interface library routines used by IBM This package contains the interface library routines used by IBM
@ -107,37 +106,37 @@ This RPM contains all the tools necessary to compile and link using
the libica library. the libica library.
%prep %prep
%setup -a 1 %setup -q -a 1
%patch1 -p1 %patch1 -p1
%build %build
mkdir -p include/linux/ mkdir -p include/linux/
cp %{S:3} include/linux/ cp %{SOURCE3} include/linux/
autoreconf --force --install autoreconf --force --install
%configure CPPFLAGS="-Iinclude -fPIC" CFLAGS="%optflags -fPIC" \ %configure CPPFLAGS="-Iinclude -fPIC" CFLAGS="%{optflags} -fPIC" \
--enable-fips --enable-fips
make clean make clean
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
mkdir -p %{buildroot}/usr/include mkdir -p %{buildroot}%{_includedir}
make DESTDIR=%{buildroot} install %make_install
cp -p include/ica_api.h %{buildroot}/usr/include cp -p include/ica_api.h %{buildroot}%{_includedir}
cp -a SuSE/* %{buildroot} cp -a SuSE/* %{buildroot}
install -D %{S:5} %{buildroot}%{_fillupdir}/sysconfig.z90crypt install -D %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.z90crypt
cp -a ${RPM_SOURCE_DIR}/README.SUSE . cp -a %{_sourcedir}/README.SUSE .
rm -f %{buildroot}%{_libdir}/libica.la rm -f %{buildroot}%{_libdir}/libica.la
rm -f %{buildroot}/usr/share/doc/libica/* rm -f %{buildroot}%{_datadir}/doc/libica/*
rmdir %{buildroot}/usr/share/doc/libica rmdir %{buildroot}%{_datadir}/doc/libica
%post -n libica-tools %post tools
%{fillup_and_insserv -n boot.z90crypt} %{fillup_and_insserv -n boot.z90crypt}
%preun -n libica-tools %preun tools
%stop_on_removal boot.z90crypt %stop_on_removal boot.z90crypt
%postun -n libica-tools %postun tools
%restart_on_update boot.z90crypt %restart_on_update boot.z90crypt
%{insserv_cleanup} %{insserv_cleanup}
@ -150,20 +149,21 @@ rmdir %{buildroot}/usr/share/doc/libica
%files tools %files tools
%defattr(-, root, root) %defattr(-, root, root)
%doc README.SUSE LICENSE %license LICENSE
%doc README.SUSE
%{_initddir}/boot.z90crypt %{_initddir}/boot.z90crypt
%{_sbindir}/rcz90crypt %{_sbindir}/rcz90crypt
%attr(0644,root,root) %{_fillupdir}/sysconfig.z90crypt %attr(0644,root,root) %{_fillupdir}/sysconfig.z90crypt
%{_bindir}/icainfo %{_bindir}/icainfo
%{_bindir}/icastats %{_bindir}/icastats
%{_mandir}/man1/icainfo.1.gz %{_mandir}/man1/icainfo.1%{?ext_man}
%{_mandir}/man1/icastats.1.gz %{_mandir}/man1/icastats.1%{?ext_man}
# Must be in here, otherwise openssl-ibmca does not find it via DSO_load() bsc#952871 # Must be in here, otherwise openssl-ibmca does not find it via DSO_load() bsc#952871
%{_libdir}/libica.so %{_libdir}/libica.so
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%attr(0644,root,root) /usr/include/ica_api.h %attr(0644,root,root) %{_includedir}/ica_api.h
%files devel-static %files devel-static
%defattr(-, root, root) %defattr(-, root, root)