#8 Some cleanup before merging Rawhide to F32
Merged 2 years ago by omajid. Opened 2 years ago by omajid.
rpms/ omajid/dotnet3.1 some-cleanup-for-merging  into  master

file modified
+1
@@ -117,6 +117,7 @@ 

  # Remove files with funny licenses, crypto implementations and other

  # not-very-useful artifacts to reduce tarball size

  find -type f -iname '*.tar.gz' -delete

+ rm -rf .dotnet

  rm -r src/aspnetcore.*/src/SignalR/clients/java/signalr/gradle*

  find src/aspnetcore.*/src -type d -name samples -print0 | xargs -0 rm -r

  rm -r src/NuGet.Client.*/test/EndToEnd/ProjectTemplates/NetCoreWebApplication1.0.zip

file modified
+4
@@ -93,7 +93,11 @@ 

  # Disable telemetry by default; make it opt-in

  Patch500:       cli-telemetry-optout.patch

  

+ %if 0%{?fedora} > 32 || 0%{?rhel} > 8

  ExclusiveArch:  aarch64 x86_64

+ %else

+ ExclusiveArch:  x86_64

+ %endif

  

  BuildRequires:  clang

  BuildRequires:  cmake

  • Use conditionals to express that aarch64 is available only on Rawhide, not on older distributions.

  • Don't include the SDK used to build the source-tarball, we will delete it and use the installed in the buildroot anyway. This saves about ~100MB in the tarball size.

After this, this is the diff between Fedora 32 and the Rawhide branches: https://gist.github.com/omajid/a23774b8081d6edaa99896724edb27e9

I have done scratch builds with this single spec file on both Rawhide and Fedora 32 to make sure it still works in both environments:

The "fedora CI" test is broken: it fails to find a spec file to build....

@crummel @rhea : Any concerns with merging this?

No, this looks good to me.

Pull-Request has been merged by omajid

2 years ago

Thanks! I have pushed this change and merged f32 and master branches to keep them in sync.