diff --git a/.gitignore b/.gitignore index 342033e..7c6d215 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ffcall-1.12.tar.gz /ffcall-1.13.tar.xz /libffcall-1.13.tar.gz +/libffcall-2.0.tar.gz diff --git a/ffcall.spec b/ffcall.spec index 902324a..7d78f8a 100644 --- a/ffcall.spec +++ b/ffcall.spec @@ -1,14 +1,11 @@ -# Only a static library is provided, so no debug information can be extracted. -%global debug_package %{nil} - # This package uses assembly to do its work. This is the entire list of # supported architectures understood by RPM, even those not currently supported # by Fedora. RPM hasn't heard about line continuations, hence the mess. -%global ffcall_arches %{ix86} x86_64 amd64 aarch64 %{alpha} %{arm} parisc hppa1.0 hppa1.1 hppa1.2 hppa2.0 ia64 m68k %{mips32} %{mips64} ppc ppc8260 ppc8560 ppc32dy4 ppciseries ppcpseries %{power64} s390 s390x %{sparc} +%global ffcall_arches %{ix86} x86_64 amd64 aarch64 %{alpha} %{arm} parisc hppa1.0 hppa1.1 hppa1.2 hppa2.0 ia64 m68k %{mips} ppc ppc8260 ppc8560 ppc32dy4 ppciseries ppcpseries %{power64} s390 s390x %{sparc} Name: ffcall -Version: 1.13 -Release: 5%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: Libraries for foreign function call interfaces License: GPLv2+ @@ -18,8 +15,6 @@ Source0: https://ftp.gnu.org/gnu/libffcall/lib%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: gnulib-devel -Provides: %{name}-static = %{version}-%{release} - ExclusiveArch: %{ffcall_arches} %description @@ -32,6 +27,20 @@ packages are: - callback: closures with variable arguments as first-class C functions (a reentrant combination of vacall and trampoline) +%package devel +Summary: Files needed to develop programs with %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Files needed to develop programs with %{name}. + +%package static +Summary: Static libraries for foreign function call interfaces +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +Static libraries for foreign function call interfaces. + %prep %setup -q -n lib%{name}-%{version} @@ -49,6 +58,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT%{_datadir}/html rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# Fix permissions +chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so.* + # Advertise supported architectures mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.%{name} << EOF @@ -63,21 +75,37 @@ for page in *; do done popd + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + %files %license COPYING %doc README NEWS +%{_libdir}/lib*.so.* + +%files devel %doc avcall/avcall.html %doc callback/callback.html %doc callback/trampoline_r/trampoline_r.html %doc trampoline/trampoline.html %doc vacall/vacall.html -%{_libdir}/*.a %{_includedir}/* +%{_libdir}/lib*.so %{_mandir}/man*/* %{_rpmconfigdir}/macros.d/macros.%{name} +%files static +%{_libdir}/*.a + %changelog +* Tue Sep 12 2017 Jerry James - 2.0-1 +- New upstream release +- Make -devel and -static subpackages + * Wed Aug 02 2017 Fedora Release Engineering - 1.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index e2a30d5..04b4b9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffcall-1.13.tar.gz) = c059fa89eb3e85bad22d045de074bfc88fae42454821e10905ffd67209b6e6ea44eeab120b869696f77b816aacb9a5af3e4b51c640512e876df1b6da6f296bd4 +SHA512 (libffcall-2.0.tar.gz) = d75aa1df97b14692a9137745bae5b24c4d8f739cb1c7f854e7ed47e4a77a49759122abd6b0e445efa56381f47932c13cd21a154b2783649afb9c7a39e73fea04