From dec0de9b194474af7300d1fc1830e71bf6c82265 Mon Sep 17 00:00:00 2001 From: jmatsuok Date: Fri, 5 May 2023 17:17:54 +0000 Subject: [PATCH] Updating the patches to re-enable windows artifacts Related: rhbz#2192978 --- 1-remove-non-linux-environments.patch | 14 ++------------ jmc.spec | 6 +++++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/1-remove-non-linux-environments.patch b/1-remove-non-linux-environments.patch index 3a2d862..e8904d3 100644 --- a/1-remove-non-linux-environments.patch +++ b/1-remove-non-linux-environments.patch @@ -1,18 +1,8 @@ diff --git a/pom.xml b/pom.xml -index 12c1373..4c3efa0 100644 +index be477c2e..7b6afef0 100644 --- a/pom.xml +++ b/pom.xml -@@ -195,26 +195,11 @@ - ${tycho.version} - - -- -- win32 -- win32 -- x86_64 -- - - linux +@@ -247,16 +247,6 @@ gtk x86_64 diff --git a/jmc.spec b/jmc.spec index ecf0f79..ef92aef 100644 --- a/jmc.spec +++ b/jmc.spec @@ -4,7 +4,7 @@ %global patchlevel 0 # Revision -%global revnum 13 +%global revnum 14 # set to 1 for snapshots, 0 for release %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/ 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/win32/* %{buildroot}%{_jmcdir}/ # move jmc.ini to /etc/jmc.ini 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 %changelog +* Wed May 3 2023 Joshua Matsuoka - 8.2.0-4 +- Reenable the Windows artifacts. Related: rhbz#2192978 + * Mon Dec 5 2022 Joshua Matsuoka - 8.2.0-3 - Fix provides and requires exclusions. Related: rhbz#2122401