fixup

Author: tomerd

platforms/Linux/Fedora/34/Dockerfile renamed to platforms/Linux/RPM/Fedora/34/Dockerfile

@@ -14,10 +14,11 @@ RUN yum -y update
 # RPM and yum development tools
 RUN yum install -y rpmdevtools yum-utils
 
-# Configure powertools
+# Configure epel and powertools
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 RUN yum config-manager --set-enabled powertools
 
 # Optimization: Install all the dependencies needed to build Swift from the spec file itself
 ADD swift-lang.spec /tmp/swift-lang.spec
-RUN yum-builddep -y /tmp/swift-lang.spec
+RUN touch /tmp/metadata.inc # fake metadata is okay for this optimization
+RUN cd /tmp && yum-builddep -y swift-lang.spec

platforms/Linux/Fedora/34/build_swift_rpm.sh renamed to platforms/Linux/RPM/Fedora/34/build_swift_rpm.sh

@@ -31,7 +31,7 @@ mkdir -p $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 # Add the spec
 cp swift-lang.spec $HOME/rpmbuild/SPECS/
 # Add the metadata for this swift version
-cp /metadata/rpm/$SWIFT_VERSION/metadata.inc $HOME/rpmbuild/SPECS/
+cp /metadata/$SWIFT_VERSION/metadata.inc $HOME/rpmbuild/SPECS/
 # Add any patches
 cp patches/*.patch $HOME/rpmbuild/SOURCES/
 

platforms/Linux/Fedora/34/nocyclades.patch renamed to platforms/Linux/RPM/Fedora/34/nocyclades.patch

@@ -21,7 +21,7 @@ services:
     depends_on: [docker-setup]
     volumes:
       - .:/code:z
-      - ../../../../metadata:/metadata:ro
+      - ../../shared/metadata:/metadata:ro
       - ./.output:/output:z
     working_dir: /code
     cap_drop:

platforms/Linux/Fedora/34/pc-circular-dependencies-optimization.patch renamed to platforms/Linux/RPM/Fedora/34/pc-circular-dependencies-optimization.patch

@@ -2,7 +2,7 @@
 
 %global package_name      swiftlang
 %global package_version   5.5.0
-%global package_summary   The Swift programming language"
+%global package_summary   The Swift programming language
 %global package_license   Apache 2.0
 %global package_url       https://swift.org