Skip to content

improve RPM spec formatting #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2022
Merged

Conversation

tomerd
Copy link
Contributor

@tomerd tomerd commented Mar 11, 2022

motivation: easier to maintain code

changes:

  • sort BuildRequires, Requires and move secions alphabetically
  • other small formatting fixes like whitespace, etc
  • remove cmake from fedora BuildRequires since we are builfing it from source
  • update fedora rawhide path to be more consistent with other fedora locations and rpm builders

motivation: easier to maintain code

changes:
* sort BuildRequires, Requires and move secions alphabetically
* other small formatting fixes like whitespace, etc
* remove cmake from fedora BuildRequires since we are builfing it from source
* update fedora rawhide path to be more consistent with other fedora locations and rpm builders
@tomerd tomerd requested a review from shahmishal as a code owner March 11, 2022 19:49
ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks to have been a mistake in the rawhide script

mv swift-syntax-swift-%{swift_version} swift-syntax
mv swift-system-%{swift_system_version} swift-system
mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
mv Yams-%{yams_version} yams
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ basically sorts the "mv" commands, no functional change

mv Yams-%{yams_version} yams

# Ninja
mv ninja-%{ninja_version} ninja

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ basically sorts the "mv" commands, no functional change

mv Yams-%{yams_version} yams

# Ninja
mv ninja-%{ninja_version} ninja

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ basically sorts the "mv" commands, no functional change


ExclusiveArch: x86_64 aarch64
ExclusiveArch: x86_64 aarch64
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ basically sorts the Requires and BuildRequires, no functional change

Requires: ncurses-compat-libs
Requires: ncurses-devel
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ basically sorts the Requires and BuildRequires, no functional change

Requires: ncurses-compat-libs
Requires: ncurses-devel
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ basically sorts the Requires and BuildRequires, no functional change

@tomerd
Copy link
Contributor Author

tomerd commented Mar 11, 2022

@shahmishal

@shahmishal shahmishal merged commit cd51c11 into swiftlang:main Mar 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants