From 00097492cdbdade6bb97bc8b70e3eb09154888a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20R=2E=20Pietraszczyk?= Date: Sat, 21 Sep 2024 21:00:34 +0200 Subject: Spec file fix --- CzytajTo.docx | Bin DEBIAN/HOWTO.txt | 0 DEBIAN/debian.changelog | 0 DEBIAN/debian.control | 2 +- DEBIAN/debian.rules | 0 DEBIAN/kopieckreta.dsc | 10 +++++----- KopiecKreta.desktop | 2 +- Makefile | 0 PKG/PKGBUILD | 6 +++--- RPM/kopieckreta.spec | 19 +++++++++++++------ bass-bad.wav | Bin build.xml | 0 changelog.txt | 0 kopieckreta.png | Bin kopieckreta_old.png | Bin slownik.txt | 0 smooth-ok.wav | Bin src/Actions.java | 0 src/ConfigFile.java | 0 src/KopiecKreta.java | 0 src/MyResource.java | 0 src/StartScreen.java | 0 src/wavResource.java | 0 startscreen.jpg | Bin 24 files changed, 23 insertions(+), 16 deletions(-) mode change 100644 => 100755 CzytajTo.docx mode change 100644 => 100755 DEBIAN/HOWTO.txt mode change 100644 => 100755 DEBIAN/debian.changelog mode change 100644 => 100755 DEBIAN/debian.control mode change 100644 => 100755 DEBIAN/debian.rules mode change 100644 => 100755 DEBIAN/kopieckreta.dsc mode change 100644 => 100755 KopiecKreta.desktop mode change 100644 => 100755 Makefile mode change 100644 => 100755 PKG/PKGBUILD mode change 100644 => 100755 bass-bad.wav mode change 100644 => 100755 build.xml mode change 100644 => 100755 changelog.txt mode change 100644 => 100755 kopieckreta.png mode change 100644 => 100755 kopieckreta_old.png mode change 100644 => 100755 slownik.txt mode change 100644 => 100755 smooth-ok.wav mode change 100644 => 100755 src/Actions.java mode change 100644 => 100755 src/ConfigFile.java mode change 100644 => 100755 src/KopiecKreta.java mode change 100644 => 100755 src/MyResource.java mode change 100644 => 100755 src/StartScreen.java mode change 100644 => 100755 src/wavResource.java mode change 100644 => 100755 startscreen.jpg diff --git a/CzytajTo.docx b/CzytajTo.docx old mode 100644 new mode 100755 diff --git a/DEBIAN/HOWTO.txt b/DEBIAN/HOWTO.txt old mode 100644 new mode 100755 diff --git a/DEBIAN/debian.changelog b/DEBIAN/debian.changelog old mode 100644 new mode 100755 diff --git a/DEBIAN/debian.control b/DEBIAN/debian.control old mode 100644 new mode 100755 index a46ac33..b6fb6b0 --- a/DEBIAN/debian.control +++ b/DEBIAN/debian.control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Przemysław R. Pietraszczyk Build-Depends: debhelper-compat (= 12), default-jdk, default-jdk-headless, fakeroot, ant Standards-Version: 0.0000000000 -Homepage: https://pietraszczyk.smallhost.pl +Homepage: https://prymula.ct8.pl Package: kopieckreta diff --git a/DEBIAN/debian.rules b/DEBIAN/debian.rules old mode 100644 new mode 100755 diff --git a/DEBIAN/kopieckreta.dsc b/DEBIAN/kopieckreta.dsc old mode 100644 new mode 100755 index defe08e..d7642ac --- a/DEBIAN/kopieckreta.dsc +++ b/DEBIAN/kopieckreta.dsc @@ -5,18 +5,18 @@ Format: 1.0 Source: kopieckreta Binary: kopieckreta Architecture: all -Version: 0.230503-3 +Version: 0.230503-2 Maintainer: Przemysław R. Pietraszczyk -Homepage: https://pietraszczyk.smallhost.pl -DEBTRANSFORM-TAR: kopieckreta-0.230924-3.tar.gz +Homepage: https://prymula.ct8.pl +DEBTRANSFORM-TAR: kopieckreta-0.230924-0.tar.gz Standards-Version: 0.0000000000 Build-Depends: debhelper-compat (>= 12), default-jdk, default-jdk-headless, fakeroot, ant Package-List: kopieckreta deb x11 optional arch=all Files: - b31649bc23b2b7bca9ab70ea3410711a 128820 kopieckreta-0.230924-3.tar.gz - 29e7e7e60bc81891e3da3871b9eeb549 764 kopieckreta-0.230924-3.debian.tar.xz + b31649bc23b2b7bca9ab70ea3410711a 128820 kopieckreta-0.230924-0.tar.gz + 29e7e7e60bc81891e3da3871b9eeb549 764 kopieckreta-0.230924-0.debian.tar.xz -----BEGIN PGP SIGNATURE----- diff --git a/KopiecKreta.desktop b/KopiecKreta.desktop old mode 100644 new mode 100755 index 74e911c..bc41084 --- a/KopiecKreta.desktop +++ b/KopiecKreta.desktop @@ -3,7 +3,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Categories=Game; +Categories=Games; Name=KopiecKreta diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 diff --git a/PKG/PKGBUILD b/PKG/PKGBUILD old mode 100644 new mode 100755 index 7690162..53540e8 --- a/PKG/PKGBUILD +++ b/PKG/PKGBUILD @@ -2,16 +2,16 @@ pkgname=kopieckreta pkgver=0.230924 -pkgrel=3 +pkgrel=0 pkgdesc="My version of the Pyramid of Words" arch=('any') -url="https://pietraszczyk.smallhost.pl" +url="prymula.ct8.pl" license=('GPL3') provides=('kopieckreta') depends=('jdk-openjdk') makedepends=('jdk-openjdk' 'ant') source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::file://${pkgname}-${pkgver}-${pkgrel}.tar.gz") -sha256sums=('30b8261b9359b341fd55d8fdd344327b133b9e88eff940c57f6d995e7c72adbf') #generate with 'makepkg -g' || sha256sum +sha256sums=('f3bbfef777c3ac3e8e0f1f13c8b09b4844644ecaa26f36dfc2d3f4fca52bd797') #generate with 'makepkg -g' || sha256sum build() { cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}" make diff --git a/RPM/kopieckreta.spec b/RPM/kopieckreta.spec index 0daa38a..23f3487 100644 --- a/RPM/kopieckreta.spec +++ b/RPM/kopieckreta.spec @@ -15,21 +15,28 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define unmangled_version 0.230924-3 +%define unmangled_version 0.230924-4 Name: kopieckreta Version: 0.230924 -Release: 3 +Release: 4 Summary: My version of the Pyramid of Words License: GPL 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/bass-bad.wav b/bass-bad.wav old mode 100644 new mode 100755 diff --git a/build.xml b/build.xml old mode 100644 new mode 100755 diff --git a/changelog.txt b/changelog.txt old mode 100644 new mode 100755 diff --git a/kopieckreta.png b/kopieckreta.png old mode 100644 new mode 100755 diff --git a/kopieckreta_old.png b/kopieckreta_old.png old mode 100644 new mode 100755 diff --git a/slownik.txt b/slownik.txt old mode 100644 new mode 100755 diff --git a/smooth-ok.wav b/smooth-ok.wav old mode 100644 new mode 100755 diff --git a/src/Actions.java b/src/Actions.java old mode 100644 new mode 100755 diff --git a/src/ConfigFile.java b/src/ConfigFile.java old mode 100644 new mode 100755 diff --git a/src/KopiecKreta.java b/src/KopiecKreta.java old mode 100644 new mode 100755 diff --git a/src/MyResource.java b/src/MyResource.java old mode 100644 new mode 100755 diff --git a/src/StartScreen.java b/src/StartScreen.java old mode 100644 new mode 100755 diff --git a/src/wavResource.java b/src/wavResource.java old mode 100644 new mode 100755 diff --git a/startscreen.jpg b/startscreen.jpg old mode 100644 new mode 100755 -- cgit v1.2.3