From cdbc13f847f6b26b467ee8d4885e05fd91ceb207 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:34:12 +0100 Subject: [PATCH] remove requirement for cross pkg-config package (missing since switching to pkgconf) [release 0.4-15mamba;Tue May 03 2022] --- cross-environment.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cross-environment.spec b/cross-environment.spec index fe9af54..9770ba4 100644 --- a/cross-environment.spec +++ b/cross-environment.spec @@ -7,13 +7,13 @@ Name: cross-environment Version: 0.4 -Release: 14mamba +Release: 15mamba Summary: Environment files for cross-platform development Group: Development/Tools Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.openmamba.org +URL: https://openmamba.org/en/ Source0: %{name}-0.4.tar.bz2 Source1: %{name}-arm-macros Source2: %{name}-x86_64-macros @@ -26,7 +26,6 @@ BuildRequires: cross-%{_target_platform}-binutils BuildRequires: cross-%{_target_platform}-gcc BuildRequires: cross-%{_target_platform}-glibc %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Environment files for cross-platform development. @@ -39,7 +38,7 @@ Requires: qemu Requires: cross-%{_target_platform}-binutils Requires: cross-%{_target_platform}-gcc Requires: cross-%{_target_platform}-glibc -Requires: cross-%{_target_platform}-pkg-config +#Requires: cross-%{_target_platform}-pkg-config %description -n cross-%{_target_platform}-environment Environment files for cross-platform development. @@ -78,6 +77,7 @@ ln -s ../include $CROSSDIR/usr/include ln -s ../%{_lib} $CROSSDIR%{_libdir} rpm -r $CROSSDIR --initdb rm -f $CROSSDIR/var/lib/rpm/__db.00* +rm -f $CROSSDIR/var/lib/rpm/.{dbenv,rpm}.lock # qemu symlink in /usr/gnemul install -d -m0755 %{buildroot}%{_prefix}/gnemul @@ -107,7 +107,7 @@ exit 0 %{_prefix}/%{_target_platform}/sys-include %{_prefix}/%{_target_platform}/usr/include %{_prefix}/%{_target_platform}%{_libdir} -%config(noreplace) %{_prefix}/%{_target_platform}/var/lib/rpm/Packages +%config(noreplace) %{_prefix}/%{_target_platform}/var/lib/rpm/* %dir %{_prefix}/%{_target_platform}/usr/src/RPM #%{_prefix}/gnemul/qemu-%{target_cpu} %{_datadir}/cross-environment-%{version}/fakedeps-%{fakedeps_ver}.%{target_cpu}.rpm @@ -119,6 +119,9 @@ exit 0 %attr(775,root,packager) %{_prefix}/%{_target_platform}/usr/src/RPM/RPMS/* %changelog +* Tue May 03 2022 Silvan Calarco 0.4-15mamba +- remove requirement for cross pkg-config package (missing since switching to pkgconf) + * Fri Apr 20 2018 Silvan Calarco 0.4-14mamba - i586: rebuilt after removing x86_64 cross target