Skip to content

[Fix] bypass rpmbuild ln error #210

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.

Sign up for GitHub

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

Open
canxin121 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Fix] bypass rpmbuild ln error #210

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2325fa
[Fix] bypass rpmbuild ln error.
canxin121 Jul 31, 2024
d9fd476
[Change] change the field to 'bin_name'
canxin121 Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/flutter_app_packager/lib/src/makers/rpm/make_rpm_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ class MakeRPMConfig extends MakeConfig {
this.defattr,
this.attr,
this.changelog,

// RPM ln bug fix
this.packageName,
});

factory MakeRPMConfig.fromJson(Map<String, dynamic> json) {
Expand Down Expand Up @@ -68,6 +71,7 @@ class MakeRPMConfig extends MakeConfig {
defattr: json['defattr'] as String?,
attr: json['attr'] as String?,
changelog: json['changelog'] as String?,
packageName: json['package_name'] as String?,
);
}

Expand Down Expand Up @@ -102,6 +106,8 @@ class MakeRPMConfig extends MakeConfig {
String? defattr;
String? attr;
String? changelog;
//RPM ln bug fix
String? packageName;

@override
Map<String, dynamic> toJson() {
Expand Down Expand Up @@ -132,7 +138,7 @@ class MakeRPMConfig extends MakeConfig {
'mkdir -p %{buildroot}%{_datadir}/metainfo',
'mkdir -p %{buildroot}%{_datadir}/pixmaps',
'cp -r %{name}/* %{buildroot}%{_datadir}/%{name}',
'ln -s %{_datadir}/%{name}/%{name} %{buildroot}%{_bindir}/%{name}',
'ln -s %{_datadir}/%{name}/${packageName ?? "%{name}"} %{buildroot}%{_bindir}/%{name}',

@MarkieMark MarkieMark Dec 9, 2024 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It looks as though this may no longer be sufficient in rpmbuild 4.20.0 (current F41) as the working directory during %install is no longer the flutter project (/dist/<versionBuild>/<projectName>-<versionBuild>-linux_rpm/rpmbuild/BUILD) (sub)directory; please see narrative at PR #236

'cp -r %{name}.desktop %{buildroot}%{_datadir}/applications',
'cp -r %{name}.png %{buildroot}%{_datadir}/pixmaps',
'cp -r %{name}*.xml %{buildroot}%{_datadir}/metainfo || :',
Expand Down