.gitignore

@@ -29,10 +29,3 @@
 /skychart-4.3-4401-src-nopatents.tar.xz
 /skychart-4.3-4466-src-nopatents.tar.xz
 /skychart-4.3-4486-src-nopatents.tar.xz
-/catalog_vdb.tgz
-/skychart-4.3-4558-src-nopatents.tar.xz
-/data_spicesun.tgz
-/skychart-4.3-4630-src-nopatents.tar.xz
-/skychart-4.3-4639-src-nopatents.tar.xz
-/skychart-4.3-4719-src-nopatents.tar.xz
-/skychart-4.3-4974-src-nopatents.tar.xz

skychart-4.3-fpc-3.2.4.patch

@@ -1,15 +0,0 @@
-diff -rU4 skychart-4.3-4974-src--orig/skychart/cu_tz.pas skychart-4.3-4974-src--patched/skychart/cu_tz.pas
---- skychart-4.3-4974-src--orig/skychart/cu_tz.pas	2025-03-03 03:30:14.000000000 +0100
-+++ skychart-4.3-4974-src--patched/skychart/cu_tz.pas	2025-08-15 10:32:52.001369952 +0200
-@@ -41,8 +41,11 @@
-   Windows,
-   {$endif}
-   {$ifdef unix}
-   unixutil,
-+    {$IF FPC_FULLVERSION > 30202} // FPC 3.2.4 moves TzSeconds from UnixUtil to Unix
-+      unix,
-+	{$ENDIF}
-   {$endif}
-   Classes, SysUtils, Math;
- 
- type

skychart.spec

@@ -1,13 +1,12 @@
-%global svnversion 4974
-%global date 20250303
+%global svnversion 4486
+%global date 20220411
 %global maj_ver 4.3
 
 Name:       skychart
-Version:    %{maj_ver}^%{date}.svn%{svnversion}
+Version:    %{maj_ver}^%{date}svn%{svnversion}
 Release:    %autorelease
 Summary:    Planetarium software for the advanced amateur astronomer
-# bgrabitmap code is licensed LGPL-3.0-only WITH LGPL-3.0-linking-exception
-License:    GPL-2.0-or-later AND LGPL-3.0-only WITH LGPL-3.0-linking-exception
+License:    GPLv2+
 URL:        http://www.ap-i.net/skychart/
 # Upstream sources are modified to:
 # - Remove pre-built software (iridflare.exe, quicksat.exe, dll files)
@@ -18,57 +17,49 @@ URL:        http://www.ap-i.net/skychart/
 # Download upstream tarball from
 # https://sourceforge.net/projects/skychart/files/0-beta/
 # in the same directory of the script and run:
-# ./generate-tarball.sh 4.3-4974
+# ./generate-tarball.sh 4.3-4486
 Source0:    %{name}-%{maj_ver}-%{svnversion}-src-nopatents.tar.xz
 Source1:    generate-tarball.sh
-# Base source data
-Source2:    http://sourceforge.net/projects/skychart/files/4-source_data/data_spicesun.tgz
 # Source data for skychart-data-stars
-Source3:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gcvs.tgz
-Source4:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_tycho2.tgz
-Source5:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_wds.tgz
-Source6:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_idx.tgz
+Source2:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gcvs.tgz
+Source3:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_tycho2.tgz
+Source4:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_wds.tgz
+Source5:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_idx.tgz
 # Source data for skychart-data-dso
-Source7:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_leda.tgz
-Source8:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_barnard.tgz
-Source9:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gcm.tgz
-Source10:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gpn.tgz
-Source11:   http://sourceforge.net/projects/skychart/files/4-source_data/catalog_lbn.tgz
-Source12:   http://sourceforge.net/projects/skychart/files/4-source_data/catalog_ocl.tgz
-Source13:   http://sourceforge.net/projects/skychart/files/4-source_data/catalog_sh2.tgz
-Source14:   http://sourceforge.net/projects/skychart/files/4-source_data/catalog_vdb.tgz
+Source6:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_leda.tgz
+Source7:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_barnard.tgz
+Source8:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gcm.tgz
+Source9:    http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gpn.tgz
+Source10:   http://sourceforge.net/projects/skychart/files/4-source_data/catalog_lbn.tgz
+Source11:   http://sourceforge.net/projects/skychart/files/4-source_data/catalog_ocl.tgz
+Source12:   http://sourceforge.net/projects/skychart/files/4-source_data/catalog_sh2.tgz
 
 
 # Avoid stripping debuginfo from executables
 # This is Fedora specific and not reported upstream
-Patch:      skychart-4.3-nostrip.patch
+Patch1:     skychart-4.3-nostrip.patch
 
 # Disable wget in install script
 # This is Fedora specific and not reported upstream
-Patch:      skychart-4.1-wgetdata.patch
+Patch2:     skychart-4.1-wgetdata.patch
 
 # Notify the user that artificial satellites calculation
 # has been disabled in Fedora RPMs due to Fedora policies
 # This is Fedora specific and not reported upstream
-Patch:      skychart-4.3-satmessage.patch
+Patch3:     skychart-4.3-satmessage.patch
 
 # Disable software update menu item
 # This feature was asked upstream specifically for Fedora
-Patch:      skychart-4.3-noupdatemenu.patch
+Patch4:     skychart-4.3-noupdatemenu.patch
 
-# Fix build with FPC 3.2.4
-Patch:      skychart-4.3-fpc-3.2.4.patch
 
 ExclusiveArch: %{fpc_arches}
-ExcludeArch: %{ix86}
+ExcludeArch: ppc64le
 
 
 BuildRequires: make
 BuildRequires: fpc
-BuildRequires:  fpc-src
-BuildRequires:  lazarus-lcl-nogui
-BuildRequires:  lazarus-lcl-qt5
-BuildRequires:  lazarus-tools
+BuildRequires: lazarus
 BuildRequires: desktop-file-utils
 BuildRequires: dos2unix
 BuildRequires: gtk2-devel
@@ -105,7 +96,7 @@ atlas more complete than a conventional planetarium.
 
 %package doc
 Summary:        Documentation files for Skychart
-License:        CC-BY-SA-3.0 OR GFDL-1.3-no-invariants-or-later
+License:        CC-BY-SA or GFDL
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
@@ -115,7 +106,7 @@ within the program as an offline copy.
 
 %package data-stars
 Summary:        Additional star catalogs for Skychart
-License:        LicenseRef-Fedora-Public-Domain
+License:        Public Domain
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
@@ -126,7 +117,7 @@ Tycho 2; General Catalogue of Variable Stars; Washington Double Stars.
 
 %package data-dso
 Summary:        Additional Deep Sky Object catalogs for Skychart
-License:        LicenseRef-Fedora-Public-Domain
+License:        Public Domain
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
@@ -138,35 +129,47 @@ Barnard Catalogue of Dark Nebulae; Sharpless Catalog.
 
 %package catgen
 Summary:        Custom catalog builder for Skychart
-License:        GPL-2.0-or-later
+License:        GPLv2+
 Provides:       catgen = %{version}-%{release}
 
 %description catgen
 Custom catalog builder for Skychart.
 
 %prep
-%setup -q -n %{name}-%{maj_ver}-%{svnversion}-src
+%setup0 -q -n %{name}-%{maj_ver}-%{svnversion}-src
 
-%autopatch -p1
+%patch1 -p1
+
+%patch2 -p1
+
+%patch3 -p1
+
+%patch4 -p1
 
 # Fix executable bit set on sources
 find skychart -type f -print0 | xargs -0 chmod -x
 
-# Put additional catalogs files where are required for installation
+# Put additional catalogs files where where required for installation
+%{__cp} -p %SOURCE2 ./BaseData
+%{__cp} -p %SOURCE3 ./BaseData
+%{__cp} -p %SOURCE4 ./BaseData
+%{__cp} -p %SOURCE5 ./BaseData
+%{__cp} -p %SOURCE6 ./BaseData
+%{__cp} -p %SOURCE7 ./BaseData
+%{__cp} -p %SOURCE8 ./BaseData
+%{__cp} -p %SOURCE9 ./BaseData
+%{__cp} -p %SOURCE10 ./BaseData
+%{__cp} -p %SOURCE11 ./BaseData
+%{__cp} -p %SOURCE12 ./BaseData
 
-cp -p %SOURCE2 ./BaseData
-cp -p %SOURCE3 ./BaseData
-cp -p %SOURCE4 ./BaseData
-cp -p %SOURCE5 ./BaseData
-cp -p %SOURCE6 ./BaseData
-cp -p %SOURCE7 ./BaseData
-cp -p %SOURCE8 ./BaseData
-cp -p %SOURCE9 ./BaseData
-cp -p %SOURCE10 ./BaseData
-cp -p %SOURCE11 ./BaseData
-cp -p %SOURCE12 ./BaseData
-cp -p %SOURCE13 ./BaseData
-cp -p %SOURCE14 ./BaseData
+# Add directories to fix builds on arm and ppc architectures
+declare -a arches=("arm-linux-gtk2" "powerpc-linux-gtk2" "powerpc64-linux-gtk2")
+for arch in "${arches[@]}"
+do
+    %{__mkdir_p} ./skychart/component/lib/$arch
+    %{__mkdir_p} ./skychart/units/$arch
+    %{__mkdir_p} ./varobs/units/$arch
+done
 
 
 %build
@@ -228,6 +231,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf
 %{_datadir}/skychart/cat/milkyway
 %{_datadir}/skychart/cat/openngc
 %{_datadir}/skychart/cat/RealSky
+%{_datadir}/skychart/cat/sac
 %{_datadir}/skychart/cat/xhip
 %dir %{_datadir}/skychart/doc
 %{_datadir}/skychart/doc/html_doc
@@ -252,7 +256,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf
 %{_datadir}/skychart/cat/gpn
 %{_datadir}/skychart/cat/barnard
 %{_datadir}/skychart/cat/sh2
-%{_datadir}/skychart/cat/vdb
 %{_datadir}/metainfo/net.ap_i.%{name}.%{name}_data_dso.metainfo.xml
 
 %files catgen

sources

@@ -9,6 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13
 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56
 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67
 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c
-SHA512 (catalog_vdb.tgz) = d3df026a2b5a1de6c41c7ec4202da48784d12a9a0adc6e6069a1b5f50b3beb6c80a66fd1be26fdf60fbbccbf32d392bffd0c020a867fe5d276231ecceaaa8528
-SHA512 (data_spicesun.tgz) = 6656d6dd089025cb4cbbb1a76e2a5ae219b1be4ee87d8ceb8ce6abff9d59ed813939928baed2bd8eb4a1a48ec374c76527a5e70e53584bc3612aa12002604706
-SHA512 (skychart-4.3-4974-src-nopatents.tar.xz) = 89e5c5c4294b5472b7640d094c498c5be1845616a8b9fd40a5e70b7defe268ddd86cf86e2454bb85dd00b3173fc162eceeddfba54c2cb4f9f0f6f83083b4d13b
+SHA512 (skychart-4.3-4486-src-nopatents.tar.xz) = fd3e786605f8032905a2843e3ac8e75b79cf69282f935ccfaecce8ab5f000de9384005a4de01dd942a1d57510caeb3a5e1e29c193626720848d3473a581a4a82