diff --git a/cross-environment.spec b/cross-environment.spec index 31cb147..af48e01 100644 --- a/cross-environment.spec +++ b/cross-environment.spec @@ -7,7 +7,7 @@ Name: cross-environment Version: 0.4 -Release: 12mamba +Release: 13mamba Summary: Environment files for cross-platform development Group: Development/Tools Vendor: openmamba @@ -21,9 +21,11 @@ Source3: %{name}-ppc-macros License: GPL ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END +%if "%{?cross_target_cpu}" != "" BuildRequires: cross-%{_target_platform}-binutils BuildRequires: cross-%{_target_platform}-gcc BuildRequires: cross-%{_target_platform}-glibc +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -52,19 +54,20 @@ mkdir -p RPM/{SPECS,BUILD,SOURCES,SRPMS,RPMS/%{target_cpu}} %build rpmbuild -ba fakedeps.spec --target %{target_cpu} \ + --define="_target_platform %{_target_platform}" \ --define="_topdir %{_builddir}/%{name}-%{version}/RPM" %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} %if "%{target_cpu}" == "arm" - install -D -m0644 %{SOURCE1} %{buildroot}%{_libdir}/rpm/arm-linux/macros + install -D -m0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/rpm/arm-linux/macros %endif %if "%{target_cpu}" == "x86_64" - install -D -m0644 %{SOURCE2} %{buildroot}%{_libdir}/rpm/x86_64-linux/macros + install -D -m0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/rpm/x86_64-linux/macros %endif %if "%{target_cpu}" == "ppc" - install -D -m0644 %{SOURCE3} %{buildroot}%{_libdir}/rpm/ppc-linux/macros + install -D -m0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/ppc-linux/macros %endif CROSSDIR=%{buildroot}%{_prefix}/%{_target_platform} @@ -93,7 +96,7 @@ exit 0 %files -n cross-%{_target_platform}-environment %defattr(-,root,root) %{_prefix}/gnemul/qemu-%{target_cpu} -%{_libdir}/rpm/%{target_cpu}-linux/macros +%{_prefix}/lib/rpm/%{target_cpu}-linux/macros %dir %{_prefix}/%{_target_platform} %dir %attr(775,root,packager) %{_prefix}/%{_target_platform}/usr %dir %attr(775,root,packager) %{_prefix}/%{_target_platform}/usr/src @@ -116,6 +119,9 @@ exit 0 %attr(775,root,packager) %{_prefix}/%{_target_platform}/usr/src/RPM/RPMS/* %changelog +* Mon Aug 01 2016 Silvan Calarco 0.4-13mamba +- rebuilt with target armopenmamba-linux-gnueabihf + * Sat Jul 27 2013 Silvan Calarco 0.4-12mamba - ppc-macros: add -fPIC required to recently build cross glibc/gcc