From 222b17b0f3443236b41f40ff43b30ff60e7f7f36 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Nov 28 2013 10:27:56 +0000 Subject: 2.4.2-9: Update to native package's libtool-2.4.2 --- diff --git a/mingw-libltdl.spec b/mingw-libltdl.spec index 6438905..711414e 100644 --- a/mingw-libltdl.spec +++ b/mingw-libltdl.spec @@ -1,3 +1,5 @@ +%{?mingw_package_header} + %global __strip %{mingw32_strip} %global __objdump %{mingw32_objdump} %define __debug_install_post %{mingw32_debug_install_post} @@ -18,7 +20,7 @@ Summary: Runtime libraries for GNU Libtool Dynamic Module Loader Name: mingw-libltdl -Version: 2.4 +Version: 2.4.2 Release: 9%{?dist} Group: System Environment/Libraries # Even though the source package contains files under @@ -31,10 +33,17 @@ URL: http://www.gnu.org/software/libtool/ Patch0: libtool-2.2.10-rpath.patch -BuildRequires: mingw32-filesystem >= 53 +BuildRequires: autoconf +BuildRequires: automake + +BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-binutils BuildRequires: mingw32-gcc +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-binutils +BuildRequires: mingw64-gcc + %if %run_tests BuildRequires: wine %endif @@ -45,13 +54,13 @@ BuildArch: noarch # Use a ? to expand to nothing if undefined, enabling F13 mock builds on F11. # This avoids the trick of hiding the macro in %%description which in turn # confuses the koji webinterface. -%{?mingw32_debug_package} +%{?mingw_debug_package} %description -The mingw32-libltdl package contains the GNU Libtool Dynamic Module Loader, a +The mingw-libltdl package contains the GNU Libtool Dynamic Module Loader, a library that provides a consistent, portable interface which simplifies the -process of using dynamic modules, for the mingw32 cross compilation +process of using dynamic modules, for the mingw cross compilation environment. These runtime libraries are needed by programs that link directly to the @@ -73,6 +82,20 @@ system-installed ltdl libraries; they are not needed by software built using the rest of the GNU Autotools (including GNU Autoconf and GNU Automake). +%package -n mingw64-libltdl +Summary: Runtime libraries for GNU Libtool Dynamic Module Loader + +%description -n mingw64-libltdl +The mingw64-libltdl package contains the GNU Libtool Dynamic Module Loader, a +library that provides a consistent, portable interface which simplifies the +process of using dynamic modules, for the mingw64 cross compilation +environment. + +These runtime libraries are needed by programs that link directly to the +system-installed ltdl libraries; they are not needed by software built using +the rest of the GNU Autotools (including GNU Autoconf and GNU Automake). + + %prep %setup -n libtool-%{version}%{?patchlevel} -q %patch0 -p1 -b .rpath @@ -89,9 +112,9 @@ export F77=false export CFLAGS="$RPM_OPT_FLAGS -fPIC" # dumb redhat-rpm-config replaces config.{sub,guess} with ancient ones in %%configure, use ./configure instead: # %%mingw32_configure does not make that error :) -%{mingw32_configure} --enable-shared --enable-ltdl-install +%{mingw_configure} --enable-shared --enable-ltdl-install # build not smp safe: -make #%{?_smp_mflags} +%{mingw_make} #%{?_smp_mflags} %check @@ -103,8 +126,9 @@ make check VERBOSE=yes > make_check.log 2>&1 || (cat make_check.log && false) %install cd libltdl -make install DESTDIR=%{buildroot} +%mingw_make_install DESTDIR=%{buildroot} rm -f %{buildroot}%{mingw32_libdir}/libltdl.a +rm -f %{buildroot}%{mingw64_libdir}/libltdl.a # Drop all .la files find $RPM_BUILD_ROOT -name "*.la" -delete @@ -122,7 +146,23 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_libdir}/libltdl.dll.a +%files -n mingw64-libltdl +%doc AUTHORS NEWS THANKS TODO ChangeLog +%doc libltdl/COPYING.LIB libltdl/README +%{mingw64_bindir}/libltdl-%{libltdl_major}.dll +%dir %{mingw64_includedir}/libltdl +%{mingw64_includedir}/libltdl/lt_dlloader.h +%{mingw64_includedir}/libltdl/lt_error.h +%{mingw64_includedir}/libltdl/lt_system.h +%{mingw64_includedir}/ltdl.h +%{mingw64_libdir}/libltdl.dll.a + + %changelog +* Thu Nov 28 2013 Hans Ulrich Niedermann - 2.4.2-9 +- Update to native package's libtool-2.4.2 version +- Support both mingw32 and mingw64 + * Sat Aug 03 2013 Fedora Release Engineering - 2.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index a347ca7..095ac67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e6144439d95d7332dc50ace6dd24c55 libtool-2.4.tar.xz +2ec8997e0c07249eb4cbd072417d70fe libtool-2.4.2.tar.xz