Updating the patches to re-enable windows artifacts

Related: rhbz#2192978
This commit is contained in:
jmatsuok 2023-05-05 17:17:54 +00:00
parent 60aaae43ea
commit dec0de9b19
2 changed files with 7 additions and 13 deletions

View File

@ -1,18 +1,8 @@
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 12c1373..4c3efa0 100644 index be477c2e..7b6afef0 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -195,26 +195,11 @@ @@ -247,16 +247,6 @@
<version>${tycho.version}</version>
<configuration>
<environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
<environment>
<os>linux</os>
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
</environment> </environment>

View File

@ -4,7 +4,7 @@
%global patchlevel 0 %global patchlevel 0
# Revision # Revision
%global revnum 13 %global revnum 14
# set to 1 for snapshots, 0 for release # set to 1 for snapshots, 0 for release
%global usesnapshot 1 %global usesnapshot 1
@ -586,6 +586,7 @@ sed -i '$ a -Dosgi.configuration.area=@user.home/.%{name}/%{version}/eclipse' %{
# move contents of target/products/org.openjdk.jmc/linux/gtk/x86_64/'JDK Mission Control' to /usr/lib/jmc/ # move contents of target/products/org.openjdk.jmc/linux/gtk/x86_64/'JDK Mission Control' to /usr/lib/jmc/
install -d -m 755 %{buildroot}%{_jmcdir} install -d -m 755 %{buildroot}%{_jmcdir}
cp -p -r %{_builddir}/%{jmc_dir_name}/target/products/org.openjdk.jmc/linux/gtk/x86_64/'JDK Mission Control'/* %{buildroot}%{_jmcdir}/ cp -p -r %{_builddir}/%{jmc_dir_name}/target/products/org.openjdk.jmc/linux/gtk/x86_64/'JDK Mission Control'/* %{buildroot}%{_jmcdir}/
cp -p -r %{_builddir}/%{jmc_dir_name}/target/products/org.openjdk.jmc/win32/* %{buildroot}%{_jmcdir}/
# move jmc.ini to /etc/jmc.ini # move jmc.ini to /etc/jmc.ini
install -d -m 755 %{buildroot}%{_sysconfdir} install -d -m 755 %{buildroot}%{_sysconfdir}
@ -624,6 +625,9 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%changelog %changelog
* Wed May 3 2023 Joshua Matsuoka <jmatsuok@redhat.com> - 8.2.0-4
- Reenable the Windows artifacts. Related: rhbz#2192978
* Mon Dec 5 2022 Joshua Matsuoka <jmatsuok@redhat.com> - 8.2.0-3 * Mon Dec 5 2022 Joshua Matsuoka <jmatsuok@redhat.com> - 8.2.0-3
- Fix provides and requires exclusions. Related: rhbz#2122401 - Fix provides and requires exclusions. Related: rhbz#2122401