[rtems-crossrpms commit] Cleanup.
Ralf Corsepius
ralf at rtems.org
Mon Apr 23 07:21:19 UTC 2012
Module: rtems-crossrpms
Branch: master
Commit: 81393c09900e52c485fb64c841eeb632385866ce
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=81393c09900e52c485fb64c841eeb632385866ce
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Mon Apr 23 00:07:12 2012 -0500
Cleanup.
---
mingw32/i686/mingw-gmp.add | 6 +++---
mingw32/i686/mingw-gmp.spec | 4 ++--
mingw32/i686/mingw-mpc.add | 6 +++---
mingw32/i686/mingw-mpc.spec | 2 +-
mingw32/i686/mingw-mpfr.add | 32 ++++++++++++++++----------------
mingw32/i686/mingw-mpfr.spec | 32 ++++++++++++++++----------------
6 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/mingw32/i686/mingw-gmp.add b/mingw32/i686/mingw-gmp.add
index 7585370..40ae1ae 100644
--- a/mingw32/i686/mingw-gmp.add
+++ b/mingw32/i686/mingw-gmp.add
@@ -5,11 +5,11 @@
%?mingw_package_header
-%define gmp_version 5.0.4
-%define gmp_rpmvers %{expand:%(echo 5.0.4 | tr - _)}
+%define gmp_version @GMP_VERS@
+%define gmp_rpmvers %{expand:%(echo @GMP_VERS@ | tr - _)}
Name: mingw-gmp
-Release: 0.20120422.0%{?dist}
+Release: @GMP_RPMREL@%{?dist}
License: GPL
Group: Development/Tools
diff --git a/mingw32/i686/mingw-gmp.spec b/mingw32/i686/mingw-gmp.spec
index 7585370..7a6c083 100644
--- a/mingw32/i686/mingw-gmp.spec
+++ b/mingw32/i686/mingw-gmp.spec
@@ -5,11 +5,11 @@
%?mingw_package_header
-%define gmp_version 5.0.4
+%define gmp_version 5.0.4
%define gmp_rpmvers %{expand:%(echo 5.0.4 | tr - _)}
Name: mingw-gmp
-Release: 0.20120422.0%{?dist}
+Release: 0.20120422.1%{?dist}%{?dist}
License: GPL
Group: Development/Tools
diff --git a/mingw32/i686/mingw-mpc.add b/mingw32/i686/mingw-mpc.add
index 808fdd8..98b0f7e 100644
--- a/mingw32/i686/mingw-mpc.add
+++ b/mingw32/i686/mingw-mpc.add
@@ -5,11 +5,11 @@
%?mingw_package_header
-%define mpc_version 0.8.1
-%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)}
+%define mpc_version @MPC_VERS@
+%define mpc_rpmvers %{expand:%(echo @MPC_VERS@ | tr - _)}
Name: mingw-mpc
-Release: 0.20120422.0%{?dist}
+Release: @MPC_RPMREL@%{?dist}
License: GPL
Group: Development/Tools
diff --git a/mingw32/i686/mingw-mpc.spec b/mingw32/i686/mingw-mpc.spec
index 808fdd8..bb5544e 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.20120422.0%{?dist}
+Release: 0.20120422.1%{?dist}%{?dist}
License: GPL
Group: Development/Tools
diff --git a/mingw32/i686/mingw-mpfr.add b/mingw32/i686/mingw-mpfr.add
index 808fdd8..44e51af 100644
--- a/mingw32/i686/mingw-mpfr.add
+++ b/mingw32/i686/mingw-mpfr.add
@@ -5,20 +5,20 @@
%?mingw_package_header
-%define mpc_version 0.8.1
-%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)}
+%define mpfr_version @MPFR_VERS@
+%define mpfr_rpmvers %{expand:%(echo @MPFR_VERS@ | tr - _)}
-Name: mingw-mpc
-Release: 0.20120422.0%{?dist}
+Name: mingw-mpfr
+Release: @MPFR_RPMREL@%{?dist}
License: GPL
Group: Development/Tools
BuildArch: noarch
-Version: %mpc_rpmvers
-Summary: MinGW mpc Libraries
+Version: %mpfr_rpmvers
+Summary: MinGW mpfr Libraries
-Source0: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+Source0: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.xz
BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc
@@ -44,24 +44,24 @@ BuildRequires: m4
%description
%{summary}
-%package -n mingw32-mpc
-Summary: MinGW32 mpc libraries
+%package -n mingw32-mpfr
+Summary: MinGW32 mpfr libraries
-%description -n mingw32-mpc
+%description -n mingw32-mpfr
%{summary}
%if %{?mingw_build_win64}0
-%package -n mingw64-mpc
-Summary: MinGW64 mpc libraries
+%package -n mingw64-mpfr
+Summary: MinGW64 mpfr libraries
-%description -n mingw64-mpc
+%description -n mingw64-mpfr
%{summary}
%endif
%?mingw_debug_package
%prep
-%setup -q -n mpc-%{mpc_version}
+%setup -q -n mpfr-%{mpfr_version}
%build
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
@@ -72,13 +72,13 @@ Summary: MinGW64 mpc libraries
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
-%files -n mingw32-mpc
+%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
%exclude %{mingw32_sysroot}/mingw/share/info/dir
%if %{?mingw_build_win64}0
-%files -n mingw64-mpc
+%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
%exclude %{mingw64_sysroot}/mingw/share/info/dir
diff --git a/mingw32/i686/mingw-mpfr.spec b/mingw32/i686/mingw-mpfr.spec
index 808fdd8..78f910d 100644
--- a/mingw32/i686/mingw-mpfr.spec
+++ b/mingw32/i686/mingw-mpfr.spec
@@ -5,20 +5,20 @@
%?mingw_package_header
-%define mpc_version 0.8.1
-%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)}
+%define mpfr_version 2.4.2
+%define mpfr_rpmvers %{expand:%(echo 2.4.2 | tr - _)}
-Name: mingw-mpc
-Release: 0.20120422.0%{?dist}
+Name: mingw-mpfr
+Release: 0.20120422.1%{?dist}%{?dist}
License: GPL
Group: Development/Tools
BuildArch: noarch
-Version: %mpc_rpmvers
-Summary: MinGW mpc Libraries
+Version: %mpfr_rpmvers
+Summary: MinGW mpfr Libraries
-Source0: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+Source0: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.xz
BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc
@@ -44,24 +44,24 @@ BuildRequires: m4
%description
%{summary}
-%package -n mingw32-mpc
-Summary: MinGW32 mpc libraries
+%package -n mingw32-mpfr
+Summary: MinGW32 mpfr libraries
-%description -n mingw32-mpc
+%description -n mingw32-mpfr
%{summary}
%if %{?mingw_build_win64}0
-%package -n mingw64-mpc
-Summary: MinGW64 mpc libraries
+%package -n mingw64-mpfr
+Summary: MinGW64 mpfr libraries
-%description -n mingw64-mpc
+%description -n mingw64-mpfr
%{summary}
%endif
%?mingw_debug_package
%prep
-%setup -q -n mpc-%{mpc_version}
+%setup -q -n mpfr-%{mpfr_version}
%build
%{?mingw_build_win64:%mingw_configure}%{!?mingw_build_win64:%_mingw32_configure} --enable-static --disable-shared
@@ -72,13 +72,13 @@ Summary: MinGW64 mpc libraries
%{?mingw_build_win64:%mingw_make_install}%{!?mingw_build_win64:make install} DESTDIR=$RPM_BUILD_ROOT
-%files -n mingw32-mpc
+%files -n mingw32-mpfr
%defattr(-,root,root,-)
%{mingw32_sysroot}/mingw
%exclude %{mingw32_sysroot}/mingw/share/info/dir
%if %{?mingw_build_win64}0
-%files -n mingw64-mpc
+%files -n mingw64-mpfr
%defattr(-,root,root,-)
%{mingw64_sysroot}/mingw
%exclude %{mingw64_sysroot}/mingw/share/info/dir
More information about the vc
mailing list