Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Artur Frenszek-Iwicki
a1f9b40e25 Fix build with FPC 3.2.4 2025-08-15 10:35:00 +02:00
Fedora Release Engineering
e349e4daf3 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 18:23:58 +00:00
Mattia Verga
83f39af43b Update to svn4974 2025-03-09 15:53:05 +01:00
Fedora Release Engineering
7e0d8b2261 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 10:55:20 +00:00
Mattia Verga
c7cacc4ff6 Fix F41 FTB (Fedora#2301274) 2024-08-02 18:49:24 +02:00
Fedora Release Engineering
9e8fda5da7 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 05:47:55 +00:00
4 changed files with 24 additions and 11 deletions

1
.gitignore vendored
View file

@ -35,3 +35,4 @@
/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

View file

@ -0,0 +1,15 @@
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

View file

@ -1,5 +1,5 @@
%global svnversion 4719
%global date 20240205
%global svnversion 4974
%global date 20250303
%global maj_ver 4.3
Name: skychart
@ -18,7 +18,7 @@ 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-4719
# ./generate-tarball.sh 4.3-4974
Source0: %{name}-%{maj_ver}-%{svnversion}-src-nopatents.tar.xz
Source1: generate-tarball.sh
# Base source data
@ -56,6 +56,8 @@ Patch: skychart-4.3-satmessage.patch
# This feature was asked upstream specifically for Fedora
Patch: 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}
@ -63,14 +65,10 @@ ExcludeArch: %{ix86}
BuildRequires: make
BuildRequires: fpc
%if 0%{?fedora} >= 39
BuildRequires: fpc-src
BuildRequires: lazarus-lcl-nogui
BuildRequires: lazarus-lcl-qt5
BuildRequires: lazarus-tools
%else
BuildRequires: lazarus >= 1.6.2
%endif
BuildRequires: desktop-file-utils
BuildRequires: dos2unix
BuildRequires: gtk2-devel
@ -147,14 +145,14 @@ Provides: catgen = %{version}-%{release}
Custom catalog builder for Skychart.
%prep
%setup0 -q -n %{name}-%{maj_ver}-%{svnversion}-src
%setup -q -n %{name}-%{maj_ver}-%{svnversion}-src
%autopatch -p1
# Fix executable bit set on sources
find skychart -type f -print0 | xargs -0 chmod -x
# Put additional catalogs files where where required for installation
# Put additional catalogs files where are required for installation
cp -p %SOURCE2 ./BaseData
cp -p %SOURCE3 ./BaseData
@ -230,7 +228,6 @@ 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

View file

@ -11,4 +11,4 @@ SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63e
SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c
SHA512 (catalog_vdb.tgz) = d3df026a2b5a1de6c41c7ec4202da48784d12a9a0adc6e6069a1b5f50b3beb6c80a66fd1be26fdf60fbbccbf32d392bffd0c020a867fe5d276231ecceaaa8528
SHA512 (data_spicesun.tgz) = 6656d6dd089025cb4cbbb1a76e2a5ae219b1be4ee87d8ceb8ce6abff9d59ed813939928baed2bd8eb4a1a48ec374c76527a5e70e53584bc3612aa12002604706
SHA512 (skychart-4.3-4719-src-nopatents.tar.xz) = 8b08e337a6f5ffb97b3f09c212fa1a26c1761ddd24296fc4a8214e949cba3161034bd29417796c0754b6c4e09d5ef179480d2b63a729935f8e3716111232eec3
SHA512 (skychart-4.3-4974-src-nopatents.tar.xz) = 89e5c5c4294b5472b7640d094c498c5be1845616a8b9fd40a5e70b7defe268ddd86cf86e2454bb85dd00b3173fc162eceeddfba54c2cb4f9f0f6f83083b4d13b