From 5f063db194796565fcce9725dbf7aa5c4b6ca683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20R=2E=20Pietraszczyk?= Date: Sat, 21 Sep 2024 21:08:02 +0200 Subject: Spec file fix, language fix --- RPM/colorsmemory.spec | 17 ++++++++++++----- build.xml | 2 +- src/ColorsMemory.java | 10 +++++----- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/RPM/colorsmemory.spec b/RPM/colorsmemory.spec index 0a92fb1..b948f7f 100644 --- a/RPM/colorsmemory.spec +++ b/RPM/colorsmemory.spec @@ -21,15 +21,22 @@ Version: 0.210503 Release: 2 Summary: My implementation Memory game License: GPL -URL: https://prymula.ct8.pl +URL: https://pietraszczyk.smallhost.pl Source0: %{name}-%{unmangled_version}.tar.gz -%if 0%{?suse_version}==1530 + +%if 0%{?suse_version} > 1600 +BuildRequires: java-21-openjdk, ant +Requires: java-21-openjdk +%endif +%if 0%{?sle_version} >= 150400 && 0%{?is_opensuse} BuildRequires: java-11-openjdk, ant Requires: java-11-openjdk -%else -BuildRequires: java-11-openjdk, ant -Requires: java-11-openjdk %endif +%if 0%{?fedora} >= 37 +BuildRequires: java-latest-openjdk, ant +Requires: java-latest-openjdk +%endif + BuildArch: noarch %description diff --git a/build.xml b/build.xml index c674970..5d91239 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ - + diff --git a/src/ColorsMemory.java b/src/ColorsMemory.java index 0e11fef..271ddd2 100644 --- a/src/ColorsMemory.java +++ b/src/ColorsMemory.java @@ -54,13 +54,13 @@ public class ColorsMemory extends JPanel menuItem = new JMenuItem("Nowa Gra", null); menuItem.setActionCommand("NewGame"); menuItem.addActionListener(this); - menuItem.setToolTipText("Rozpoczyna nowa gre"); + menuItem.setToolTipText("Rozpoczyna nową grę"); menu.add(menuItem); menu.addSeparator(); - menuItem = new JMenuItem("Zakoncz", null); + menuItem = new JMenuItem("Zakończ", null); menuItem.setActionCommand("Exit"); menuItem.addActionListener(this); - menuItem.setToolTipText("Wyjscie z programu"); + menuItem.setToolTipText("Wyjście z programu"); menu.add(menuItem); menuItem = new JMenuItem("O Programie", null); menuItem.setActionCommand("About"); @@ -205,7 +205,7 @@ public class ColorsMemory extends JPanel else if(e.getActionCommand().equals("About")) { JOptionPane.showMessageDialog(frame, - "Moja implementacja gry Memory\nPrzemyslaw R. Pietraszczyk\nStworzono w oparciu o OpenJDK\nSierpien 2019", + "Moja implementacja gry Memory\nPrzemysław R. Pietraszczyk\nStworzono w oparciu o OpenJDK\nSierpien 2019", "Colors Memory 0.210503-0", JOptionPane.PLAIN_MESSAGE); @@ -295,7 +295,7 @@ public class ColorsMemory extends JPanel } else { JOptionPane.showMessageDialog(frame, - "Wykonales "+nmove+" posuniec", + "Wykonałeś "+nmove+" posunięć", "Podsumowanie", JOptionPane.PLAIN_MESSAGE); nFields=1; // aby nie wyswietlalo drugi raz -- cgit v1.2.3