diff --git a/macros.mingw32 b/macros.mingw32 index 924804b..a3662ca 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -167,79 +167,3 @@ package or when debugging this package. \ %defattr(-,root,root,-) \ %{nil} - -# Maintain backwards compatibility with the original MinGW packaging guidelines -# These can be dropped as soon as all packages are ported to the new packaging guidelines -%_mingw32_pkg_name %{mingw32_pkg_name} -%_mingw32_target %{mingw32_target} -%_mingw32_sysroot %{mingw32_sysroot} -%_mingw32_prefix %{mingw32_prefix} -%_mingw32_exec_prefix %{mingw32_exec_prefix} -%_mingw32_bindir %{mingw32_bindir} -%_mingw32_sbindir %{mingw32_sbindir} -%_mingw32_libexecdir %{mingw32_libexecdir} -%_mingw32_libdir %{mingw32_libdir} -%_mingw32_datadir %{mingw32_datadir} -%_mingw32_docdir %{mingw32_docdir} -%_mingw32_infodir %{mingw32_infodir} -%_mingw32_mandir %{mingw32_mandir} -%_mingw32_sysconfdir %{mingw32_sysconfdir} -%_mingw32_sharedstatedir %{mingw32_sharedstatedir} -%_mingw32_localstatedir %{mingw32_localstatedir} -%_mingw32_includedir %{mingw32_includedir} -%_mingw32_host %{mingw32_host} -%_mingw32_cflags %{mingw32_cflags} -%_mingw32_cppflags %{mingw32_cppflags} -%_mingw32_ldflags %{mingw32_ldflags} -%_mingw32_findprovides %{mingw_findprovides} -%_mingw32_findrequires %{mingw_findrequires} -%_mingw32_cc %{mingw32_cc} -%_mingw32_cxx %{mingw32_cxx} -%_mingw32_cpp %{mingw32_cpp} -%_mingw32_addr2line %{mingw32_addr2line} -%_mingw32_ar %{mingw32_ar} -%_mingw32_as %{mingw32_as} -%_mingw32_dlltool %{mingw32_dlltool} -%_mingw32_dllwrap %{mingw32_dllwrap} -%_mingw32_gcov %{mingw32_gcov} -%_mingw32_gprof %{mingw32_gprof} -%_mingw32_ld %{mingw32_ld} -%_mingw32_nm %{mingw32_nm} -%_mingw32_objcopy %{mingw32_objcopy} -%_mingw32_objdump %{mingw32_objdump} -%_mingw32_ranlib %{mingw32_ranlib} -%_mingw32_readelf %{mingw32_readelf} -%_mingw32_size %{mingw32_size} -%_mingw32_strings %{mingw32_strings} -%_mingw32_strip %{mingw32_strip} -%_mingw32_windmc %{mingw32_windmc} -%_mingw32_windres %{mingw32_windres} -%_mingw32_env %{mingw32_env} -%_mingw32_pkg_config %{mingw32_pkg_config} -%_mingw32_configure %{mingw32_configure} -%_mingw32_make %{mingw32_make} -%_mingw32_cmake %{mingw32_cmake} -%_mingw32_description %{mingw32_description} -%_mingw32_debug_package %{mingw32_debug_package} -%_mingw32_debug_install_post %{mingw_debug_install_post} -%mingw32_debug_install_post %{mingw_debug_install_post} - - -# This macro has been dropped from the new guidelines, keep -# it here around for backwards compatibility -%_mingw32_makeinstall %{mingw32_env} ; \ - make \\\ - prefix=%{?buildroot:%{buildroot}}%{mingw32_prefix} \\\ - exec_prefix=%{?buildroot:%{buildroot}}%{mingw32_exec_prefix} \\\ - bindir=%{?buildroot:%{buildroot}}%{mingw32_bindir} \\\ - sbindir=%{?buildroot:%{buildroot}}%{mingw32_sbindir} \\\ - sysconfdir=%{?buildroot:%{buildroot}}%{mingw32_sysconfdir} \\\ - datadir=%{?buildroot:%{buildroot}}%{mingw32_datadir} \\\ - includedir=%{?buildroot:%{buildroot}}%{mingw32_includedir} \\\ - libdir=%{?buildroot:%{buildroot}}%{mingw32_libdir} \\\ - libexecdir=%{?buildroot:%{buildroot}}%{mingw32_libexecdir} \\\ - localstatedir=%{?buildroot:%{buildroot}}%{mingw32_localstatedir} \\\ - sharedstatedir=%{?buildroot:%{buildroot}}%{mingw32_sharedstatedir} \\\ - mandir=%{?buildroot:%{buildroot}}%{mingw32_mandir} \\\ - infodir=%{?buildroot:%{buildroot}}%{mingw32_infodir} \\\ - install diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 4f78c33..769f977 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -331,6 +331,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/ as it breaks CPack and isn't needed by any of the Fedora MinGW packages (RHBZ #1152696) - Accept empty MINGW{32,64}_{C,CPP,CXX}FLAGS environment variables +- Removed old _mingw32 macros which have been deprecated since Fedora 17 * Sat Jun 07 2014 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild