[rtems-crossrpms commit] Switch to fedora >= 17 packaging.
Ralf Corsepius
ralf at rtems.org
Wed Jun 5 07:05:36 UTC 2013
Module: rtems-crossrpms
Branch: master
Commit: d9a4a692dc4a3eaa602ab27fae4670788c840c12
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=d9a4a692dc4a3eaa602ab27fae4670788c840c12
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Sun Jun 2 13:14:34 2013 +0200
Switch to fedora >= 17 packaging.
---
mingw32/i686/Makefile.am | 4 ++--
mingw32/i686/Makefile.in | 4 ++--
mingw32/i686/mingw-mpc.add | 24 ++++++++++++++++++++----
mingw32/i686/mingw-mpc.spec | 26 +++++++++++++++++++++-----
mingw32/i686/mingw-mpc.spec.in | 26 +++++++++++++++++++++-----
mingw32/i686/mingw-mpfr.add | 20 ++++++++++++++++++--
mingw32/i686/mingw-mpfr.spec | 22 +++++++++++++++++++---
mingw32/i686/mingw-mpfr.spec.in | 22 +++++++++++++++++++---
mingw32/x86_64/Makefile.am | 4 ++--
mingw32/x86_64/Makefile.in | 4 ++--
mingw32/x86_64/mingw-mpc.add | 24 ++++++++++++++++++++----
mingw32/x86_64/mingw-mpc.spec | 26 +++++++++++++++++++++-----
mingw32/x86_64/mingw-mpc.spec.in | 26 +++++++++++++++++++++-----
mingw32/x86_64/mingw-mpfr.add | 20 ++++++++++++++++++--
mingw32/x86_64/mingw-mpfr.spec | 22 +++++++++++++++++++---
mingw32/x86_64/mingw-mpfr.spec.in | 22 +++++++++++++++++++---
16 files changed, 244 insertions(+), 52 deletions(-)
diff --git a/mingw32/i686/Makefile.am b/mingw32/i686/Makefile.am
index f9a8ca0..28c2fe7 100644
--- a/mingw32/i686/Makefile.am
+++ b/mingw32/i686/Makefile.am
@@ -7,11 +7,11 @@ GMP_RPMREL = 0.20120426.0
include ../gmp.am
MPC_VERS = 0.8.1
-MPC_RPMREL = 0.20120426.0
+MPC_RPMREL = 0.20130601.0
include ../mpc.am
MPFR_VERS = 2.4.2
-MPFR_RPMREL = 0.20120426.0
+MPFR_RPMREL = 0.20130601.0
include ../mpfr.am
@rpmprefix at mingw32-binutils-helper.spec: mingw32-binutils-helper.spec.in
diff --git a/mingw32/i686/Makefile.in b/mingw32/i686/Makefile.in
index e4de669..b5a6205 100644
--- a/mingw32/i686/Makefile.in
+++ b/mingw32/i686/Makefile.in
@@ -244,10 +244,10 @@ GMP_VERS = 5.0.4
GMP_RPMREL = 0.20120426.0
GMP_SUBPACKAGES = $(srcdir)/mingw-gmp.add
MPC_VERS = 0.8.1
-MPC_RPMREL = 0.20120426.0
+MPC_RPMREL = 0.20130601.0
MPC_SUBPACKAGES = $(srcdir)/mingw-mpc.add
MPFR_VERS = 2.4.2
-MPFR_RPMREL = 0.20120426.0
+MPFR_RPMREL = 0.20130601.0
MPFR_SUBPACKAGES = $(srcdir)/mingw-mpfr.add
all: all-am
diff --git a/mingw32/i686/mingw-mpc.add b/mingw32/i686/mingw-mpc.add
index 446d552..90183de 100644
--- a/mingw32/i686/mingw-mpc.add
+++ b/mingw32/i686/mingw-mpc.add
@@ -38,6 +38,9 @@ BuildRequires: mingw64-mpfr
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -47,15 +50,15 @@ BuildRequires: m4
%package -n mingw32-mpc
Summary: MinGW32 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw32-mpc
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpc
Summary: MinGW64 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw64-mpc
%{summary}
@@ -67,22 +70,35 @@ Group: Development/Tools
%setup -q -n mpc-%{mpc_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpc.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpc.la}
%files -n mingw32-mpc
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpc
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/i686/mingw-mpc.spec b/mingw32/i686/mingw-mpc.spec
index e1b4191..df9138a 100644
--- a/mingw32/i686/mingw-mpc.spec
+++ b/mingw32/i686/mingw-mpc.spec
@@ -9,7 +9,7 @@
%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)}
Name: mingw-mpc
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -38,6 +38,9 @@ BuildRequires: mingw64-mpfr
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -47,15 +50,15 @@ BuildRequires: m4
%package -n mingw32-mpc
Summary: MinGW32 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw32-mpc
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpc
Summary: MinGW64 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw64-mpc
%{summary}
@@ -67,22 +70,35 @@ Group: Development/Tools
%setup -q -n mpc-%{mpc_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpc.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpc.la}
%files -n mingw32-mpc
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpc
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/i686/mingw-mpc.spec.in b/mingw32/i686/mingw-mpc.spec.in
index e1b4191..df9138a 100644
--- a/mingw32/i686/mingw-mpc.spec.in
+++ b/mingw32/i686/mingw-mpc.spec.in
@@ -9,7 +9,7 @@
%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)}
Name: mingw-mpc
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -38,6 +38,9 @@ BuildRequires: mingw64-mpfr
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -47,15 +50,15 @@ BuildRequires: m4
%package -n mingw32-mpc
Summary: MinGW32 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw32-mpc
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpc
Summary: MinGW64 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw64-mpc
%{summary}
@@ -67,22 +70,35 @@ Group: Development/Tools
%setup -q -n mpc-%{mpc_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpc.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpc.la}
%files -n mingw32-mpc
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpc
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/i686/mingw-mpfr.add b/mingw32/i686/mingw-mpfr.add
index aaedf7d..771df61 100644
--- a/mingw32/i686/mingw-mpfr.add
+++ b/mingw32/i686/mingw-mpfr.add
@@ -36,6 +36,9 @@ BuildRequires: mingw64-gmp
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -50,7 +53,7 @@ Group: Development/Tools
%description -n mingw32-mpfr
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpfr
Summary: MinGW64 mpfr libraries
Group: Development/Tools
@@ -65,22 +68,35 @@ Group: Development/Tools
%setup -q -n mpfr-%{mpfr_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpfr.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpfr.la}
%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/i686/mingw-mpfr.spec b/mingw32/i686/mingw-mpfr.spec
index faeea4f..664150e 100644
--- a/mingw32/i686/mingw-mpfr.spec
+++ b/mingw32/i686/mingw-mpfr.spec
@@ -9,7 +9,7 @@
%define mpfr_rpmvers %{expand:%(echo 2.4.2 | tr - _)}
Name: mingw-mpfr
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -36,6 +36,9 @@ BuildRequires: mingw64-gmp
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -50,7 +53,7 @@ Group: Development/Tools
%description -n mingw32-mpfr
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpfr
Summary: MinGW64 mpfr libraries
Group: Development/Tools
@@ -65,22 +68,35 @@ Group: Development/Tools
%setup -q -n mpfr-%{mpfr_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpfr.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpfr.la}
%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/i686/mingw-mpfr.spec.in b/mingw32/i686/mingw-mpfr.spec.in
index faeea4f..664150e 100644
--- a/mingw32/i686/mingw-mpfr.spec.in
+++ b/mingw32/i686/mingw-mpfr.spec.in
@@ -9,7 +9,7 @@
%define mpfr_rpmvers %{expand:%(echo 2.4.2 | tr - _)}
Name: mingw-mpfr
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -36,6 +36,9 @@ BuildRequires: mingw64-gmp
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -50,7 +53,7 @@ Group: Development/Tools
%description -n mingw32-mpfr
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpfr
Summary: MinGW64 mpfr libraries
Group: Development/Tools
@@ -65,22 +68,35 @@ Group: Development/Tools
%setup -q -n mpfr-%{mpfr_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpfr.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpfr.la}
%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/x86_64/Makefile.am b/mingw32/x86_64/Makefile.am
index 45f222a..efc8876 100644
--- a/mingw32/x86_64/Makefile.am
+++ b/mingw32/x86_64/Makefile.am
@@ -7,11 +7,11 @@ GMP_RPMREL = 0.20120426.0
include ../gmp.am
MPC_VERS = 0.8.1
-MPC_RPMREL = 0.20120426.0
+MPC_RPMREL = 0.20130601.0
include ../mpc.am
MPFR_VERS = 2.4.2
-MPFR_RPMREL = 0.20120426.0
+MPFR_RPMREL = 0.20130601.0
include ../mpfr.am
@rpmprefix at mingw64-binutils-helper.spec: mingw64-binutils-helper.spec.in
diff --git a/mingw32/x86_64/Makefile.in b/mingw32/x86_64/Makefile.in
index edb9035..9698e98 100644
--- a/mingw32/x86_64/Makefile.in
+++ b/mingw32/x86_64/Makefile.in
@@ -244,10 +244,10 @@ GMP_VERS = 5.0.4
GMP_RPMREL = 0.20120426.0
GMP_SUBPACKAGES = $(srcdir)/mingw-gmp.add
MPC_VERS = 0.8.1
-MPC_RPMREL = 0.20120426.0
+MPC_RPMREL = 0.20130601.0
MPC_SUBPACKAGES = $(srcdir)/mingw-mpc.add
MPFR_VERS = 2.4.2
-MPFR_RPMREL = 0.20120426.0
+MPFR_RPMREL = 0.20130601.0
MPFR_SUBPACKAGES = $(srcdir)/mingw-mpfr.add
all: all-am
diff --git a/mingw32/x86_64/mingw-mpc.add b/mingw32/x86_64/mingw-mpc.add
index 446d552..90183de 100644
--- a/mingw32/x86_64/mingw-mpc.add
+++ b/mingw32/x86_64/mingw-mpc.add
@@ -38,6 +38,9 @@ BuildRequires: mingw64-mpfr
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -47,15 +50,15 @@ BuildRequires: m4
%package -n mingw32-mpc
Summary: MinGW32 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw32-mpc
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpc
Summary: MinGW64 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw64-mpc
%{summary}
@@ -67,22 +70,35 @@ Group: Development/Tools
%setup -q -n mpc-%{mpc_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpc.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpc.la}
%files -n mingw32-mpc
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpc
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/x86_64/mingw-mpc.spec b/mingw32/x86_64/mingw-mpc.spec
index e1b4191..df9138a 100644
--- a/mingw32/x86_64/mingw-mpc.spec
+++ b/mingw32/x86_64/mingw-mpc.spec
@@ -9,7 +9,7 @@
%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)}
Name: mingw-mpc
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -38,6 +38,9 @@ BuildRequires: mingw64-mpfr
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -47,15 +50,15 @@ BuildRequires: m4
%package -n mingw32-mpc
Summary: MinGW32 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw32-mpc
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpc
Summary: MinGW64 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw64-mpc
%{summary}
@@ -67,22 +70,35 @@ Group: Development/Tools
%setup -q -n mpc-%{mpc_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpc.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpc.la}
%files -n mingw32-mpc
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpc
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/x86_64/mingw-mpc.spec.in b/mingw32/x86_64/mingw-mpc.spec.in
index e1b4191..df9138a 100644
--- a/mingw32/x86_64/mingw-mpc.spec.in
+++ b/mingw32/x86_64/mingw-mpc.spec.in
@@ -9,7 +9,7 @@
%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)}
Name: mingw-mpc
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -38,6 +38,9 @@ BuildRequires: mingw64-mpfr
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -47,15 +50,15 @@ BuildRequires: m4
%package -n mingw32-mpc
Summary: MinGW32 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw32-mpc
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpc
Summary: MinGW64 mpc libraries
-Group: Development/Tools
+Group: Development/Tools
%description -n mingw64-mpc
%{summary}
@@ -67,22 +70,35 @@ Group: Development/Tools
%setup -q -n mpc-%{mpc_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpc.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpc.la}
%files -n mingw32-mpc
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpc
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/x86_64/mingw-mpfr.add b/mingw32/x86_64/mingw-mpfr.add
index aaedf7d..771df61 100644
--- a/mingw32/x86_64/mingw-mpfr.add
+++ b/mingw32/x86_64/mingw-mpfr.add
@@ -36,6 +36,9 @@ BuildRequires: mingw64-gmp
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -50,7 +53,7 @@ Group: Development/Tools
%description -n mingw32-mpfr
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpfr
Summary: MinGW64 mpfr libraries
Group: Development/Tools
@@ -65,22 +68,35 @@ Group: Development/Tools
%setup -q -n mpfr-%{mpfr_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpfr.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpfr.la}
%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/x86_64/mingw-mpfr.spec b/mingw32/x86_64/mingw-mpfr.spec
index faeea4f..664150e 100644
--- a/mingw32/x86_64/mingw-mpfr.spec
+++ b/mingw32/x86_64/mingw-mpfr.spec
@@ -9,7 +9,7 @@
%define mpfr_rpmvers %{expand:%(echo 2.4.2 | tr - _)}
Name: mingw-mpfr
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -36,6 +36,9 @@ BuildRequires: mingw64-gmp
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -50,7 +53,7 @@ Group: Development/Tools
%description -n mingw32-mpfr
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpfr
Summary: MinGW64 mpfr libraries
Group: Development/Tools
@@ -65,22 +68,35 @@ Group: Development/Tools
%setup -q -n mpfr-%{mpfr_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpfr.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpfr.la}
%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
diff --git a/mingw32/x86_64/mingw-mpfr.spec.in b/mingw32/x86_64/mingw-mpfr.spec.in
index faeea4f..664150e 100644
--- a/mingw32/x86_64/mingw-mpfr.spec.in
+++ b/mingw32/x86_64/mingw-mpfr.spec.in
@@ -9,7 +9,7 @@
%define mpfr_rpmvers %{expand:%(echo 2.4.2 | tr - _)}
Name: mingw-mpfr
-Release: 0.20120426.0%{?dist}
+Release: 0.20130601.0%{?dist}
License: GPL
Group: Development/Tools
@@ -36,6 +36,9 @@ BuildRequires: mingw64-gmp
%global __strip %{_mingw32_strip}
# F16 uses _mingw32_sysroot, fedora > 16 uses mingw32_sysroot
%global mingw32_sysroot %{_mingw32_sysroot}
+%global mingw32_bindir %{_mingw32_bindir}
+%global mingw32_libdir %{_mingw32_libdir}
+%global mingw32_includedir %{_mingw32_includedir}
%endif
BuildRequires: m4
@@ -50,7 +53,7 @@ Group: Development/Tools
%description -n mingw32-mpfr
%{summary}
-%if %{?mingw_build_win64}0
+%if 0%{?mingw_build_win64} == 1
%package -n mingw64-mpfr
Summary: MinGW64 mpfr libraries
Group: Development/Tools
@@ -65,22 +68,35 @@ Group: Development/Tools
%setup -q -n mpfr-%{mpfr_version}
%build
+%if 0%{?fedora} >= 17
+%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --disable-static --enable-shared
+%else
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
+%endif
%{?mingw_build_win64:%mingw_make}%{!?mingw_build_win64:%_mingw32_make}
%install
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
+# Clean out files that should not be part of the rpm.
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libmpfr.la
+%{?mingw_build_win64:rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libmpfr.la}
%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw32_libdir}/*.debug
+%endif
%exclude %{mingw32_sysroot}/mingw/share/info/dir
-%if %{?mingw_build_win64}0
+%if %{?mingw_build_win64}%{!?mingw_build_win64:0}
%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
+%if 0%{?fedora} > 17
+%exclude %{mingw64_libdir}/*.debug
+%endif
%exclude %{mingw64_sysroot}/mingw/share/info/dir
%endif
More information about the vc
mailing list