archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8257434: jpackage fails to create rpm on Fedora Linux

Browse source 
Reviewed-by: almatvee, herrick
This commit is contained in:
Alexey Semenyuk 2020-12-02 02:50:33 +00:00
parent 8f4fa3f8d5
commit 541c7f74bb
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec
View file

@ -5,19 +5,19 @@ Release: APPLICATION_RELEASE
License: APPLICATION_LICENSE_TYPE License: APPLICATION_LICENSE_TYPE
Vendor: APPLICATION_VENDOR Vendor: APPLICATION_VENDOR
%if "xAPPLICATION_PREFIX" != x %if "xAPPLICATION_PREFIX" != "x"
Prefix: APPLICATION_PREFIX Prefix: APPLICATION_PREFIX
%endif %endif
Provides: APPLICATION_PACKAGE Provides: APPLICATION_PACKAGE
%if "xAPPLICATION_GROUP" != x %if "xAPPLICATION_GROUP" != "x"
Group: APPLICATION_GROUP Group: APPLICATION_GROUP
%endif %endif
Autoprov: 0 Autoprov: 0
Autoreq: 0 Autoreq: 0
%if "xPACKAGE_DEFAULT_DEPENDENCIES" != x || "xPACKAGE_CUSTOM_DEPENDENCIES" != x %if "xPACKAGE_DEFAULT_DEPENDENCIES" != "x" || "xPACKAGE_CUSTOM_DEPENDENCIES" != "x"
Requires: PACKAGE_DEFAULT_DEPENDENCIES PACKAGE_CUSTOM_DEPENDENCIES Requires: PACKAGE_DEFAULT_DEPENDENCIES PACKAGE_CUSTOM_DEPENDENCIES
%endif %endif
@ -43,7 +43,7 @@ APPLICATION_DESCRIPTION
rm -rf %{buildroot} rm -rf %{buildroot}
install -d -m 755 %{buildroot}APPLICATION_DIRECTORY install -d -m 755 %{buildroot}APPLICATION_DIRECTORY
cp -r %{_sourcedir}APPLICATION_DIRECTORY/* %{buildroot}APPLICATION_DIRECTORY cp -r %{_sourcedir}APPLICATION_DIRECTORY/* %{buildroot}APPLICATION_DIRECTORY
%if "xAPPLICATION_LICENSE_FILE" != x %if "xAPPLICATION_LICENSE_FILE" != "x"
%define license_install_file %{_defaultlicensedir}/%{name}-%{version}/%{basename:APPLICATION_LICENSE_FILE} %define license_install_file %{_defaultlicensedir}/%{name}-%{version}/%{basename:APPLICATION_LICENSE_FILE}
install -d -m 755 "%{buildroot}%{dirname:%{license_install_file}}" install -d -m 755 "%{buildroot}%{dirname:%{license_install_file}}"
install -m 644 "APPLICATION_LICENSE_FILE" "%{buildroot}%{license_install_file}" install -m 644 "APPLICATION_LICENSE_FILE" "%{buildroot}%{license_install_file}"
@ -53,12 +53,12 @@ cp -r %{_sourcedir}APPLICATION_DIRECTORY/* %{buildroot}APPLICATION_DIRECTORY
comm -23 %{app_filelist} %{filesystem_filelist} > %{package_filelist} comm -23 %{app_filelist} %{filesystem_filelist} > %{package_filelist}
sed -i -e 's/.*/%dir "&"/' %{package_filelist} sed -i -e 's/.*/%dir "&"/' %{package_filelist}
(cd %{buildroot} && find . -not -type d) | sed -e 's/^\.//' -e 's/.*/"&"/' >> %{package_filelist} (cd %{buildroot} && find . -not -type d) | sed -e 's/^\.//' -e 's/.*/"&"/' >> %{package_filelist}
%if "xAPPLICATION_LICENSE_FILE" != x %if "xAPPLICATION_LICENSE_FILE" != "x"
sed -i -e 's|"%{license_install_file}"||' -e '/^$/d' %{package_filelist} sed -i -e 's|"%{license_install_file}"||' -e '/^$/d' %{package_filelist}
%endif %endif
%files -f %{package_filelist} %files -f %{package_filelist}
%if "xAPPLICATION_LICENSE_FILE" != x %if "xAPPLICATION_LICENSE_FILE" != "x"
%license "%{license_install_file}" %license "%{license_install_file}"
%endif %endif