Skip to content
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

Fix building on SFDK #5

Merged
merged 2 commits into from Mar 31, 2023
Merged

Conversation

direc85
Copy link
Contributor

@direc85 direc85 commented Mar 5, 2023

This is a cosmetic PR to make the .spec and .changes files pass the parsers.

With these changes I'm able to successfully build OpenSSL for 4.3.0.12-armv7hl and 4.5.0.18-armv7hl targets on SFDK version 3.10.4 w/Docker using sfdk build.

Copy link
Contributor

@Thaodan Thaodan left a comment

Choose a reason for hiding this comment

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

I agree with the changes however the commit messages are wrong, they are not related to the SDK but to rpmlint.

rpm/openssl.spec Outdated
@@ -320,7 +320,7 @@ install -m755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/renew-dummy-cert
# docs are disabled
# BEGIN
# Rename man pages so that they don't conflict with other system man pages.
#pushd $RPM_BUILD_ROOT%{_mandir}
#pushd $RPM_BUILD_ROOT %_{_mandir}
Copy link
Contributor

Choose a reason for hiding this comment

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

% characters should be escaped with %, e.g. %%.

Assume that the date is correct and adjust the weekday to match the date
This can be reverted by replacing every %%{ with %{
Copy link
Contributor

@pvuorela pvuorela left a comment

Choose a reason for hiding this comment

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

Good to me. I'll merge but not tag as this would trigger lots of rebuilds while the only difference is .changes entries for some ancient adjustments.

@pvuorela pvuorela merged commit 838f686 into sailfishos:master Mar 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants