From 8dc462d7f046b4ad230afe4e6d7cefcd982884fd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:02:55 +0000 Subject: [PATCH 01/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 751fa62..ca95cad 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -214,6 +214,9 @@ fi %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 3.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 2026c704dcab0b80cd1a6dcf3e1bc38bc1f8051e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 20 Jun 2015 09:10:25 +0200 Subject: [PATCH 02/86] Added patch to fix build with lazarus 1.4 --- skychart-jdcalendar-laz14.patch | 69 +++++++++++++++++++++++++++++++++ skychart.spec | 9 ++++- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 skychart-jdcalendar-laz14.patch diff --git a/skychart-jdcalendar-laz14.patch b/skychart-jdcalendar-laz14.patch new file mode 100644 index 0000000..f5a29db --- /dev/null +++ b/skychart-jdcalendar-laz14.patch @@ -0,0 +1,69 @@ +Index: skychart/component/jdcalendar/jdcalendar.pas +=================================================================== +--- skychart/component/jdcalendar/jdcalendar.pas (revision 2854) ++++ skychart/component/jdcalendar/jdcalendar.pas (working copy) +@@ -26,7 +26,7 @@ + interface + + uses +- SysUtils, Classes, Dialogs, LCLType, Grids, StdCtrls, ++ SysUtils, Classes, Dialogs, LCLType, Grids, StdCtrls, LCLVersion, + Controls, ExtCtrls, Types, GraphType, Graphics, Forms, Buttons, MaskEdit, + Math, LResources, EditBtn, enhedits; + +@@ -138,7 +138,11 @@ + + { TJDDatePicker } + ++ {$if (lcl_major<2) and (lcl_minor<3)} + TJDDatePicker = class(TEditButton) ++ {$ELSE} ++ TJDDatePicker = class(TCustomEditButton) ++ {$ENDIF} + private + savejd: double; + Flabels: TDatesLabelsArray; +@@ -145,7 +149,11 @@ + Fcaption: string; + procedure UpdDate; + protected ++ {$if (lcl_major<2) and (lcl_minor<3)} + procedure DoButtonClick(Sender: TObject); override; ++ {$ELSE} ++ procedure ButtonClick(Sender: TObject); ++ {$ENDIF} + procedure SetJD(Value: double); + public + constructor Create(AOwner: TComponent); override; +@@ -810,7 +818,11 @@ + Color := clBtnFace; + ReadOnly := True; + Button.Glyph.LoadFromLazarusResource('BtnDatePicker'); ++ {$if (lcl_major<2) and (lcl_minor<3)} + Button.OnClick := @DoButtonClick; ++ {$ELSE} ++ Button.OnClick := @ButtonClick; ++ {$ENDIF} + Button.Enabled := True; + UpdDate; + end; +@@ -820,11 +832,19 @@ + inherited Destroy; + end; + ++{$if (lcl_major<2) and (lcl_minor<3)} + procedure TJDDatePicker.DoButtonClick(Sender: TObject);//or onClick ++{$ELSE} ++procedure TJDDatePicker.ButtonClick(Sender: TObject);//or onClick ++{$ENDIF} + var + CD: TJDCalendarDialog; + begin ++ {$if (lcl_major<2) and (lcl_minor<3)} + inherited DoButtonClick(Sender); ++ {$ELSE} ++ inherited ButtonClick; ++ {$ENDIF} + + CD := TJDCalendarDialog.Create(Self); + CD.JD := savejd; diff --git a/skychart.spec b/skychart.spec index ca95cad..417a2ea 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -29,6 +29,8 @@ Source11: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_o Patch1: skychart-3.10-strip.patch Patch2: skychart-wgetdata.patch +# Patch to fix versione 3.10 with lazarus 1.4. Upstream #1410 +Patch3: skychart-jdcalendar-laz14.patch # no fpc and lazarus on s390(x) # no lazarus on sparc(64) @@ -95,6 +97,8 @@ Galactic Planetary Nebulae. # Disable wget for documentation and ephemeris data %patch2 -p1 +%patch3 -p1 + find skychart -type f -print0 |xargs -0 chmod 644 # Fix exotic EOL encodings @@ -214,6 +218,9 @@ fi %changelog +* Sat Jun 20 2015 Mattia Verga - 3.10-6 +- Added patch to fix build with lazarus 1.4 + * Fri Jun 19 2015 Fedora Release Engineering - 3.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 82075c264beabb84ffd34fbc7d5f7bb93380a627 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 20 Jun 2015 09:30:42 +0200 Subject: [PATCH 03/86] Fix patch command --- skychart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 417a2ea..d27507c 100644 --- a/skychart.spec +++ b/skychart.spec @@ -97,7 +97,7 @@ Galactic Planetary Nebulae. # Disable wget for documentation and ephemeris data %patch2 -p1 -%patch3 -p1 +%patch3 find skychart -type f -print0 |xargs -0 chmod 644 From ff7427b5d7b1cf87cf616300492f2d18156edf84 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 21 Jun 2015 13:01:04 +0200 Subject: [PATCH 04/86] Validate appdata file --- skychart.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/skychart.spec b/skychart.spec index d27507c..8ae7085 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -40,7 +40,7 @@ ExcludeArch: s390 s390x sparc sparc64 BuildRequires: fpc >= 2.4.4 BuildRequires: lazarus >= 1.0.4 BuildRequires: ImageMagick desktop-file-utils dos2unix gtk2-devel -BuildRequires: prelink +BuildRequires: prelink libappstream-glib Requires: xdg-utils tzdata xplanet %description @@ -162,9 +162,12 @@ chmod +x %{buildroot}%{_libdir}/* # Menu entry desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop +# Appdata file check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml + %files -%doc skychart/gpl.txt +%license skychart/gpl.txt %{_bindir}/* %{_libdir}/*.so %{_datadir}/applications/* @@ -218,6 +221,10 @@ fi %changelog +* Sun Jun 21 2015 Mattia Verga - 3.10-7 +- Validate appdata file +- Change license file location + * Sat Jun 20 2015 Mattia Verga - 3.10-6 - Added patch to fix build with lazarus 1.4 From 247e70ed3d67ba35b70d09954946a31d7ff8ba38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 4 Aug 2015 12:36:39 -0400 Subject: [PATCH 05/86] execstack is not used since last release --- skychart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 8ae7085..bb6607e 100644 --- a/skychart.spec +++ b/skychart.spec @@ -40,7 +40,7 @@ ExcludeArch: s390 s390x sparc sparc64 BuildRequires: fpc >= 2.4.4 BuildRequires: lazarus >= 1.0.4 BuildRequires: ImageMagick desktop-file-utils dos2unix gtk2-devel -BuildRequires: prelink libappstream-glib +BuildRequires: libappstream-glib Requires: xdg-utils tzdata xplanet %description From b31cc2aadb4579ef7ac6c7a84a49dd053a6d8b05 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 10:40:16 +0100 Subject: [PATCH 06/86] Update to 3.11svn --- generate-tarball.sh | 2 +- ...0-strip.patch => skychart-3.11-strip.patch | 0 skychart-jdcalendar-laz14.patch | 69 ------------------- skychart.spec | 14 ++-- 4 files changed, 6 insertions(+), 79 deletions(-) rename skychart-3.10-strip.patch => skychart-3.11-strip.patch (100%) delete mode 100644 skychart-jdcalendar-laz14.patch diff --git a/generate-tarball.sh b/generate-tarball.sh index 051ca40..02ae0e5 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -2,7 +2,7 @@ VERSION=$1 -tar -xjvf skychart-$VERSION-src.tar.bz2 +tar -xJvf skychart-$VERSION-src.tar.xz #Remove pre-built software rm -rf skychart-$VERSION-src/tools/data/iridflar diff --git a/skychart-3.10-strip.patch b/skychart-3.11-strip.patch similarity index 100% rename from skychart-3.10-strip.patch rename to skychart-3.11-strip.patch diff --git a/skychart-jdcalendar-laz14.patch b/skychart-jdcalendar-laz14.patch deleted file mode 100644 index f5a29db..0000000 --- a/skychart-jdcalendar-laz14.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: skychart/component/jdcalendar/jdcalendar.pas -=================================================================== ---- skychart/component/jdcalendar/jdcalendar.pas (revision 2854) -+++ skychart/component/jdcalendar/jdcalendar.pas (working copy) -@@ -26,7 +26,7 @@ - interface - - uses -- SysUtils, Classes, Dialogs, LCLType, Grids, StdCtrls, -+ SysUtils, Classes, Dialogs, LCLType, Grids, StdCtrls, LCLVersion, - Controls, ExtCtrls, Types, GraphType, Graphics, Forms, Buttons, MaskEdit, - Math, LResources, EditBtn, enhedits; - -@@ -138,7 +138,11 @@ - - { TJDDatePicker } - -+ {$if (lcl_major<2) and (lcl_minor<3)} - TJDDatePicker = class(TEditButton) -+ {$ELSE} -+ TJDDatePicker = class(TCustomEditButton) -+ {$ENDIF} - private - savejd: double; - Flabels: TDatesLabelsArray; -@@ -145,7 +149,11 @@ - Fcaption: string; - procedure UpdDate; - protected -+ {$if (lcl_major<2) and (lcl_minor<3)} - procedure DoButtonClick(Sender: TObject); override; -+ {$ELSE} -+ procedure ButtonClick(Sender: TObject); -+ {$ENDIF} - procedure SetJD(Value: double); - public - constructor Create(AOwner: TComponent); override; -@@ -810,7 +818,11 @@ - Color := clBtnFace; - ReadOnly := True; - Button.Glyph.LoadFromLazarusResource('BtnDatePicker'); -+ {$if (lcl_major<2) and (lcl_minor<3)} - Button.OnClick := @DoButtonClick; -+ {$ELSE} -+ Button.OnClick := @ButtonClick; -+ {$ENDIF} - Button.Enabled := True; - UpdDate; - end; -@@ -820,11 +832,19 @@ - inherited Destroy; - end; - -+{$if (lcl_major<2) and (lcl_minor<3)} - procedure TJDDatePicker.DoButtonClick(Sender: TObject);//or onClick -+{$ELSE} -+procedure TJDDatePicker.ButtonClick(Sender: TObject);//or onClick -+{$ENDIF} - var - CD: TJDCalendarDialog; - begin -+ {$if (lcl_major<2) and (lcl_minor<3)} - inherited DoButtonClick(Sender); -+ {$ELSE} -+ inherited ButtonClick; -+ {$ENDIF} - - CD := TJDCalendarDialog.Create(Self); - CD.JD := savejd; diff --git a/skychart.spec b/skychart.spec index bb6607e..d414c19 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 2854 +%global svnversion 3141 Name: skychart -Version: 3.10 -Release: 7%{?dist} +Version: 3.11 +Release: 1.%{svnversion}svn.%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -11,7 +11,7 @@ URL: http://www.ap-i.net/skychart/ # we remove it from sources. # Download upstream tarball and invoke this script # while in tarballs directory: -# ./generate-tarball.sh 3.10-2854 +# ./generate-tarball.sh 3.11-3141 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -27,10 +27,8 @@ Source9: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gp 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 -Patch1: skychart-3.10-strip.patch +Patch1: skychart-3.11-strip.patch Patch2: skychart-wgetdata.patch -# Patch to fix versione 3.10 with lazarus 1.4. Upstream #1410 -Patch3: skychart-jdcalendar-laz14.patch # no fpc and lazarus on s390(x) # no lazarus on sparc(64) @@ -97,8 +95,6 @@ Galactic Planetary Nebulae. # Disable wget for documentation and ephemeris data %patch2 -p1 -%patch3 - find skychart -type f -print0 |xargs -0 chmod 644 # Fix exotic EOL encodings From 29598aa7c919e92e720742e638c9ef73dfb1a447 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 10:56:33 +0100 Subject: [PATCH 07/86] new source From 93f6a751328c0a4188db282058ee6f5a6cd4f7ed Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 10:57:35 +0100 Subject: [PATCH 08/86] new source From 54dbc43b2017c57670aa711e155a55089c0c0d6c Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 11:00:46 +0100 Subject: [PATCH 09/86] modify source files From 92f22688edd17622d04e6f67b632677542a9062b Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 11:02:45 +0100 Subject: [PATCH 10/86] fix files not being committed?? --- .gitignore | 1 + skychart.spec | 1 + sources | 1 + 3 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index cb45f98..8db86c8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ skychart-3.0.1.6.tar.gz /catalog_ocl.tgz /skychart-3.8-2450-src-nopatents.tar.xz /skychart-3.10-2854-src-nopatents.tar.xz +/skychart-3.11-3141-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index d414c19..2e2acf1 100644 --- a/skychart.spec +++ b/skychart.spec @@ -41,6 +41,7 @@ BuildRequires: ImageMagick desktop-file-utils dos2unix gtk2-devel BuildRequires: libappstream-glib Requires: xdg-utils tzdata xplanet + %description This program enables you to draw sky charts, making use of the data in 16 catalogs of stars and nebulae. In addition the position of planets, diff --git a/sources b/sources index 20d4056..2f63a09 100644 --- a/sources +++ b/sources @@ -9,3 +9,4 @@ de9e5492d4d29cd505e4a2fb2ffdfdff catalog_lbn.tgz 7ab9842429d0407e7dff1946a166a685 catalog_pgc.tgz eb41098f194574662b147e4891ef261e catalog_tycho2.tgz 00d206019a86098d79c1e89b32103792 catalog_wds.tgz +a34d0d2f86bfa01d86353198893cb538 skychart-3.11-3141-src-nopatents.tar.xz From a81a4bf0f6c3e5dfb947408e640bd7d6611df2b9 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 11:05:06 +0100 Subject: [PATCH 11/86] fix package release name --- skychart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 2e2acf1..45756ab 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 1.%{svnversion}svn.%{?dist} +Release: 1.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ From 8ef2f8a02c6a6a2a518b94aaaef95051f31c1b4a Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 11:38:37 +0100 Subject: [PATCH 12/86] Correct files declaration --- skychart.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/skychart.spec b/skychart.spec index 45756ab..6a96cf1 100644 --- a/skychart.spec +++ b/skychart.spec @@ -167,10 +167,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %license skychart/gpl.txt %{_bindir}/* %{_libdir}/*.so -%{_datadir}/applications/* -%{_datadir}/appdata/skychart.appdata.xml -%{_datadir}/pixmaps/* -%{_datadir}/icons/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/*/*/*/%{name}.png %dir %{_datadir}/skychart %{_datadir}/skychart/data %{_datadir}/skychart/cat/DSoutlines @@ -218,6 +218,9 @@ fi %changelog +* Sat Nov 14 2015 Mattia Verga - 3.11-1.3141svn +- Update to 3.11svn to fix incompatibility with lazarus 1.4.2 + * Sun Jun 21 2015 Mattia Verga - 3.10-7 - Validate appdata file - Change license file location From b69954277279e30135c3924860f3e4d09afdef68 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 11:47:26 +0100 Subject: [PATCH 13/86] Remove old source file --- .gitignore | 8 -------- skychart.spec | 1 - sources | 1 - 3 files changed, 10 deletions(-) diff --git a/.gitignore b/.gitignore index 8db86c8..e8c5bfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,3 @@ -skychart-3.0.1.6.tar.gz -/skychart_3.2-source.tgz -/skychart-3.4-source.tgz -/skychart-3.6-2150-src-nopatents.tar.bz2 -/skychart-3.7-2268-src-nopatents.tar.bz2 -/skychart-3.8-2450-src-nopatents.tar.bz2 /catalog_gcvs.tgz /catalog_idx.tgz /catalog_tycho2.tgz @@ -14,6 +8,4 @@ skychart-3.0.1.6.tar.gz /catalog_gpn.tgz /catalog_lbn.tgz /catalog_ocl.tgz -/skychart-3.8-2450-src-nopatents.tar.xz -/skychart-3.10-2854-src-nopatents.tar.xz /skychart-3.11-3141-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index 6a96cf1..4633d73 100644 --- a/skychart.spec +++ b/skychart.spec @@ -41,7 +41,6 @@ BuildRequires: ImageMagick desktop-file-utils dos2unix gtk2-devel BuildRequires: libappstream-glib Requires: xdg-utils tzdata xplanet - %description This program enables you to draw sky charts, making use of the data in 16 catalogs of stars and nebulae. In addition the position of planets, diff --git a/sources b/sources index 2f63a09..f299a98 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -f0e27d2ff180a27d1ba1d6f7036f4d85 skychart-3.10-2854-src-nopatents.tar.xz abf0b88cfaf9986b3abce5827ad62196 catalog_gcm.tgz 3031ca90157c291bfdd5a841dc926e64 catalog_gcvs.tgz 399cf42d7653bbebfa4fa11530df9901 catalog_gpn.tgz From 14beab02b7e85b3515b5fd7a25be77b438f64845 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Nov 2015 12:09:07 +0100 Subject: [PATCH 14/86] Add unpackaged file --- skychart.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/skychart.spec b/skychart.spec index 4633d73..26e05e1 100644 --- a/skychart.spec +++ b/skychart.spec @@ -170,6 +170,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/*/*/*/%{name}.png +%{_datadir}/icons/*/*/*/%{name}.svg %dir %{_datadir}/skychart %{_datadir}/skychart/data %{_datadir}/skychart/cat/DSoutlines From 3353e407f7c04ce7e68025dc7e92ebdcd1119497 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 27 Nov 2015 10:09:01 +0100 Subject: [PATCH 15/86] Set ExclusiveArch to prevent build on arm and s390x because no fpc and lazarus are available on those architectures --- skychart.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/skychart.spec b/skychart.spec index 26e05e1..6c33d0d 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 1.%{svnversion}svn%{?dist} +Release: 2.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -30,9 +30,8 @@ Source11: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_o Patch1: skychart-3.11-strip.patch Patch2: skychart-wgetdata.patch -# no fpc and lazarus on s390(x) -# no lazarus on sparc(64) -ExcludeArch: s390 s390x sparc sparc64 +# At this moment fpc and lazarus are not working on arm and s390x +ExclusiveArch: %{ix86} x86_64 ppc64 ppc64le BuildRequires: fpc >= 2.4.4 @@ -218,6 +217,9 @@ fi %changelog +* Fri Nov 27 2015 Mattia Verga - 3.11-2.3141svn +- Set ExclusiveArch to prevent build on arm and s390x + * Sat Nov 14 2015 Mattia Verga - 3.11-1.3141svn - Update to 3.11svn to fix incompatibility with lazarus 1.4.2 From 1841f6f50c1c487f80903d6d2e7007d444b82a3e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 11 Dec 2015 17:41:39 +0100 Subject: [PATCH 16/86] Revert back to ExcludeArch --- skychart.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/skychart.spec b/skychart.spec index 6c33d0d..0a186af 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 2.%{svnversion}svn%{?dist} +Release: 3.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -30,8 +30,8 @@ Source11: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_o Patch1: skychart-3.11-strip.patch Patch2: skychart-wgetdata.patch -# At this moment fpc and lazarus are not working on arm and s390x -ExclusiveArch: %{ix86} x86_64 ppc64 ppc64le +# fpc and lazarus are not working on s390 and ppc +ExcludeArch: s390 s390x ppc64 ppc64le BuildRequires: fpc >= 2.4.4 @@ -217,6 +217,9 @@ fi %changelog +* Fri Dec 11 2015 Mattia Verga - 3.11-3.3141svn +- Revert back to ExcludeArch + * Fri Nov 27 2015 Mattia Verga - 3.11-2.3141svn - Set ExclusiveArch to prevent build on arm and s390x From 9a18e2a1e4ef50410b550bb57745343e1b2bd2dd Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 20 Dec 2015 14:21:14 +0100 Subject: [PATCH 17/86] Properly set ExcludeArch --- skychart.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/skychart.spec b/skychart.spec index 0a186af..9b7f1f6 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 3.%{svnversion}svn%{?dist} +Release: 4.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -30,8 +30,8 @@ Source11: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_o Patch1: skychart-3.11-strip.patch Patch2: skychart-wgetdata.patch -# fpc and lazarus are not working on s390 and ppc -ExcludeArch: s390 s390x ppc64 ppc64le +# fpc and lazarus are not working on aarch64 s390 and ppc +ExcludeArch: aarch64 %{power64} s390 s390x BuildRequires: fpc >= 2.4.4 @@ -217,6 +217,9 @@ fi %changelog +* Sun Dec 20 2015 Mattia Verga - 3.11-4.3141svn +- Properly set ExcludeArch + * Fri Dec 11 2015 Mattia Verga - 3.11-3.3141svn - Revert back to ExcludeArch From 10ae04714e7ebf57782bbd0fb57a5456e97487d7 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 10 Jan 2016 15:08:49 +0100 Subject: [PATCH 18/86] Update svn revision, libraries are now in separate package libpasastro. Fix appdata file validation. Correct wrong FSF address in source headers. --- .gitignore | 1 + skychart-3.11-fix-appdata.patch | 35 +++++++++++++++++ skychart-3.11-strip.patch | 12 ++---- skychart.spec | 67 +++++++++++++++++++-------------- sources | 1 + 5 files changed, 78 insertions(+), 38 deletions(-) create mode 100644 skychart-3.11-fix-appdata.patch diff --git a/.gitignore b/.gitignore index e8c5bfd..38a77ed 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /catalog_lbn.tgz /catalog_ocl.tgz /skychart-3.11-3141-src-nopatents.tar.xz +/skychart-3.11-3157-src-nopatents.tar.xz diff --git a/skychart-3.11-fix-appdata.patch b/skychart-3.11-fix-appdata.patch new file mode 100644 index 0000000..ae0f574 --- /dev/null +++ b/skychart-3.11-fix-appdata.patch @@ -0,0 +1,35 @@ +--- a/system_integration/Linux/share/appdata/skychart.appdata.xml 2013-09-29 18:21:18.000000000 +0200 ++++ b/system_integration/Linux/share/appdata/skychart.appdata.xml 2016-01-10 13:23:20.892471882 +0100 +@@ -1,20 +1,30 @@ + + + skychart.desktop +- CC0 ++ CC0-1.0 ++ GPL-2.0+ ++ Skychart ++ Planetarium software for the advanced amateur astronomer + +

+ Skychart is a free and advanced planetarium software for drawing sky charts + for specific places and times with nicely graphic and for controlling + telescopes by connecting them to pc. ++

++

+ It can also calculate Solar System objects visibility and data, like planets, + comets and asteroids, and display moon and planets in realistic mode. ++

++

+ Skychart also includes VarObs, a software to help astronomers to get data + for variable stars observation. +

+ + +- http://www.ap-i.net/skychart/_media/en/screenshot/vo_m101.jpg ++ ++ http://www.ap-i.net/skychart/_media/en/screenshot/vo_m101.jpg ++ The main window of Skychart in action. ++ + + http://www.ap-i.net/skychart/ + pch@ap-i.net diff --git a/skychart-3.11-strip.patch b/skychart-3.11-strip.patch index 5d23910..e5aac7e 100644 --- a/skychart-3.11-strip.patch +++ b/skychart-3.11-strip.patch @@ -1,6 +1,6 @@ ---- a/install.sh 2013-09-29 18:20:08.000000000 +0200 -+++ b/install.sh 2014-04-03 19:00:07.580486108 +0200 -@@ -26,13 +26,13 @@ +--- a/install.sh 2015-12-18 11:06:30.000000000 +0100 ++++ b/install.sh 2016-01-09 19:06:49.424399488 +0100 +@@ -25,10 +25,10 @@ install -m 755 -d $destdir/share/icons/hicolor/scalable install -m 755 -d $destdir/share/icons/hicolor/scalable/apps @@ -8,16 +8,10 @@ -install -v -m 755 -s skychart/cdcicon $destdir/bin/cdcicon -install -v -m 755 -s varobs/varobs $destdir/bin/varobs -install -v -m 755 -s varobs/varobs_lpv_bulletin $destdir/bin/varobs_lpv_bulletin --install -v -m 644 -s skychart/library/getdss/libgetdss.so $destdir/lib/libgetdss.so --install -v -m 644 -s skychart/library/plan404/libplan404.so $destdir/lib/libplan404.so --install -v -m 644 -s skychart/library/wcs/libcdcwcs.so $destdir/lib/libcdcwcs.so +install -v -m 755 skychart/cdc $destdir/bin/skychart +install -v -m 755 skychart/cdcicon $destdir/bin/cdcicon +install -v -m 755 varobs/varobs $destdir/bin/varobs +install -v -m 755 varobs/varobs_lpv_bulletin $destdir/bin/varobs_lpv_bulletin -+install -v -m 644 skychart/library/getdss/libgetdss.so $destdir/lib/libgetdss.so -+install -v -m 644 skychart/library/plan404/libplan404.so $destdir/lib/libplan404.so -+install -v -m 644 skychart/library/wcs/libcdcwcs.so $destdir/lib/libcdcwcs.so install -v -m 644 system_integration/Linux/share/applications/skychart.desktop $destdir/share/applications/skychart.desktop install -v -m 644 system_integration/Linux/share/appdata/skychart.appdata.xml $destdir/share/appdata/skychart.appdata.xml install -v -m 644 system_integration/Linux/share/doc/skychart/changelog $destdir/share/doc/skychart/changelog diff --git a/skychart.spec b/skychart.spec index 9b7f1f6..7fcfc4a 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 3141 +%global svnversion 3157 Name: skychart Version: 3.11 -Release: 4.%{svnversion}svn%{?dist} +Release: 5.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -11,7 +11,7 @@ URL: http://www.ap-i.net/skychart/ # we remove it from sources. # Download upstream tarball and invoke this script # while in tarballs directory: -# ./generate-tarball.sh 3.11-3141 +# ./generate-tarball.sh 3.11-3157 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -27,10 +27,22 @@ Source9: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gp 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 +# Avoid stripping debuginfo from executables +# This is Fedora specific and not reported upstream Patch1: skychart-3.11-strip.patch + +# Disable wget in install script +# This is Fedora specific and not reported upstream Patch2: skychart-wgetdata.patch -# fpc and lazarus are not working on aarch64 s390 and ppc +# Fix appdata file validation +# Reported upstream +Patch3: skychart-3.11-fix-appdata.patch + +# fpc isn't available on aarch64 and s390 +# lazarus isn't available on ppc and s390 +# so ccdciel could not build +# https://bugzilla.redhat.com/show_bug.cgi?id=### ExcludeArch: aarch64 %{power64} s390 s390x @@ -38,7 +50,8 @@ BuildRequires: fpc >= 2.4.4 BuildRequires: lazarus >= 1.0.4 BuildRequires: ImageMagick desktop-file-utils dos2unix gtk2-devel BuildRequires: libappstream-glib -Requires: xdg-utils tzdata xplanet + +Requires: libpasastro xdg-utils tzdata xplanet %description This program enables you to draw sky charts, making use of the data in 16 @@ -87,19 +100,19 @@ Lynds Bright Nebulae; Open Cluster Data; Globular Clusters in the Milky Way; Galactic Planetary Nebulae. %prep -%setup -q -n %{name}-%{version}-%{svnversion}-src +%setup0 -q -n %{name}-%{version}-%{svnversion}-src %patch1 -p1 -# Disable wget for documentation and ephemeris data %patch2 -p1 -find skychart -type f -print0 |xargs -0 chmod 644 +%patch3 -p1 -# Fix exotic EOL encodings -dos2unix -q -k tools/doc/html_doc/en/feature_class_fichiers/common.css -dos2unix -q -k tools/doc/html_doc/en/feature_class_fichiers/custom.css -dos2unix -q -k tools/doc/releasenotes*.txt +# Fix executable bit set on sources +find skychart -type f -print0 |xargs -0 chmod -x + +# Fix wrong FSF address in source headers +grep -rl '59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.' * | xargs -i@ sed -i 's/59 Temple Place - Suite 330, Boston, MA 02111-1307, USA./51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA./g' @ # Put additional catalogs files where where required for installation cp -p %SOURCE2 ./BaseData @@ -127,12 +140,9 @@ mkdir ./varobs/units/powerpc64-linux-gtk2 %build ./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix} -# We build these separately so that we can apply optflags -make %{_smp_mflags} arch_flags="%{optflags}" -C skychart/library/getdss -make %{_smp_mflags} arch_flags="%{optflags}" -C skychart/library/plan404 -make %{_smp_mflags} arch_flags="%{optflags}" -C skychart/library/wcs - -make # not concurrency-safe +# Skychart doesn't like parallel building so we don't use macro. +# We pass options to fpc compiler for generate debug info. +make fpcopts="-O1 -g -gl -OoREGVAR -Ch2000000 -CX -XX" %install # Install main program @@ -148,12 +158,7 @@ make install install_doc PREFIX=%{buildroot}%{_prefix} make install install_cat1 PREFIX=%{buildroot}%{_prefix} make install install_cat2 PREFIX=%{buildroot}%{_prefix} -# Fix multilib path -[ %{_lib} = lib ] || mv %{buildroot}%{_prefix}/{lib,%{_lib}} - -# Fix debuginfo -chmod +x %{buildroot}%{_libdir}/* - +%check # Menu entry desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop @@ -163,8 +168,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %files %license skychart/gpl.txt +%doc %{_datadir}/doc/skychart/changelog +%doc %{_datadir}/doc/skychart/copyright %{_bindir}/* -%{_libdir}/*.so %{_datadir}/applications/%{name}.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/pixmaps/%{name}.png @@ -181,8 +187,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/skychart/doc/html_doc %{_datadir}/skychart/doc/releasenotes*.txt %{_datadir}/skychart/doc/varobs -%exclude /usr/share/doc/skychart/changelog -%exclude /usr/share/doc/skychart/copyright + %files doc %doc %{_datadir}/skychart/doc/wiki_doc @@ -202,11 +207,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/skychart/cat/gpn %post -/sbin/ldconfig /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -217,6 +220,12 @@ fi %changelog +* Sun Jan 10 2016 Mattia Verga - 3.11-5.3157svn +- Update svn version +- Libraries are now in separate package libpasastro +- Fix wrong FSF address in source headers +- Fix appdata file validation + * Sun Dec 20 2015 Mattia Verga - 3.11-4.3141svn - Properly set ExcludeArch diff --git a/sources b/sources index f299a98..c754473 100644 --- a/sources +++ b/sources @@ -9,3 +9,4 @@ de9e5492d4d29cd505e4a2fb2ffdfdff catalog_lbn.tgz eb41098f194574662b147e4891ef261e catalog_tycho2.tgz 00d206019a86098d79c1e89b32103792 catalog_wds.tgz a34d0d2f86bfa01d86353198893cb538 skychart-3.11-3141-src-nopatents.tar.xz +93f8af8b9ea57606b531dcc0947275c1 skychart-3.11-3157-src-nopatents.tar.xz From 75f62e3a5989b0bb35e459f2e422f78b1ee9f74e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 12 Jan 2016 17:22:32 +0100 Subject: [PATCH 19/86] Add .metainfo.xml files to subpackages --- skychart-data-dso.metainfo.xml | 11 +++++++++++ skychart-data-stars.metainfo.xml | 11 +++++++++++ skychart.spec | 18 +++++++++++++++--- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 skychart-data-dso.metainfo.xml create mode 100644 skychart-data-stars.metainfo.xml diff --git a/skychart-data-dso.metainfo.xml b/skychart-data-dso.metainfo.xml new file mode 100644 index 0000000..25e26fc --- /dev/null +++ b/skychart-data-dso.metainfo.xml @@ -0,0 +1,11 @@ + +​ +​ skychart-data-dso +​ skychart.desktop +​ Additional Nebulae Catalogs +​ Standard nebulae catalogs: New General Catalogue; Principal + Galaxies Catalogue; Lynds Bright Nebulae; Open Cluster Data; + Globular Clusters in the Milky Way; Galactic Planetary Nebulae. +​ CC0-1.0 +​ Public Domain +​ \ No newline at end of file diff --git a/skychart-data-stars.metainfo.xml b/skychart-data-stars.metainfo.xml new file mode 100644 index 0000000..d1d6aaf --- /dev/null +++ b/skychart-data-stars.metainfo.xml @@ -0,0 +1,11 @@ + +​ +​ skychart-data-stars +​ skychart.desktop +​ Additional Star Catalogs +​ Additional stars catalog down to magnitude 12, variable and + double stars: Tycho 2; General Catalogue of Variable Stars; + Washington Double Stars. +​ CC0-1.0 +​ Public Domain +​ \ No newline at end of file diff --git a/skychart.spec b/skychart.spec index 7fcfc4a..dd02e0d 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 5.%{svnversion}svn%{?dist} +Release: 6.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -26,6 +26,9 @@ Source8: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gc 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 +# Metainfo.xml files for subpackages +Source12: skychart-data-stars.metainfo.xml +Source13: skychart-data-dso.metainfo.xml # Avoid stripping debuginfo from executables # This is Fedora specific and not reported upstream @@ -40,9 +43,9 @@ Patch2: skychart-wgetdata.patch Patch3: skychart-3.11-fix-appdata.patch # fpc isn't available on aarch64 and s390 -# lazarus isn't available on ppc and s390 +# lazarus isn't available on aarch64 ppc and s390 # so ccdciel could not build -# https://bugzilla.redhat.com/show_bug.cgi?id=### +# https://bugzilla.redhat.com/show_bug.cgi?id=1287833 ExcludeArch: aarch64 %{power64} s390 s390x @@ -158,6 +161,10 @@ make install install_doc PREFIX=%{buildroot}%{_prefix} make install install_cat1 PREFIX=%{buildroot}%{_prefix} make install install_cat2 PREFIX=%{buildroot}%{_prefix} +# Put .metainfo.xml files in appdata dir +cp %SOURCE12 %{buildroot}%{_datadir}/appdata/ +cp %SOURCE13 %{buildroot}%{_datadir}/appdata/ + %check # Menu entry desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop @@ -197,6 +204,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/skychart/cat/tycho2 %{_datadir}/skychart/cat/wds %{_datadir}/skychart/cat/bsc5 +%{_datadir}/appdata/%{name}-data-stars.metainfo.xml %files data-dso %{_datadir}/skychart/cat/ngc2000/*.dat @@ -205,6 +213,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/skychart/cat/ocl %{_datadir}/skychart/cat/gcm %{_datadir}/skychart/cat/gpn +%{_datadir}/appdata/%{name}-data-dso.metainfo.xml %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -220,6 +229,9 @@ fi %changelog +* Mon Jan 11 2016 Mattia Verga - 3.11-6.3157svn +- Add .metainfo.xml files to subpackages + * Sun Jan 10 2016 Mattia Verga - 3.11-5.3157svn - Update svn version - Libraries are now in separate package libpasastro From 5131195e2a3a8cf96804bea22117caf16bc66e88 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 15 Jan 2016 11:45:51 +0000 Subject: [PATCH 20/86] Fix the metainfo files by removing zero-width space chars --- skychart-data-dso.metainfo.xml | 16 ++++++++-------- skychart-data-stars.metainfo.xml | 16 ++++++++-------- skychart.spec | 5 ++++- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/skychart-data-dso.metainfo.xml b/skychart-data-dso.metainfo.xml index 25e26fc..e785909 100644 --- a/skychart-data-dso.metainfo.xml +++ b/skychart-data-dso.metainfo.xml @@ -1,11 +1,11 @@ -​ -​ skychart-data-dso -​ skychart.desktop -​ Additional Nebulae Catalogs -​ Standard nebulae catalogs: New General Catalogue; Principal + + skychart-data-dso + skychart.desktop + Additional Nebulae Catalogs + Standard nebulae catalogs: New General Catalogue; Principal Galaxies Catalogue; Lynds Bright Nebulae; Open Cluster Data; Globular Clusters in the Milky Way; Galactic Planetary Nebulae. -​ CC0-1.0 -​ Public Domain -​ \ No newline at end of file + CC0-1.0 + Public Domain + diff --git a/skychart-data-stars.metainfo.xml b/skychart-data-stars.metainfo.xml index d1d6aaf..e74b315 100644 --- a/skychart-data-stars.metainfo.xml +++ b/skychart-data-stars.metainfo.xml @@ -1,11 +1,11 @@ -​ -​ skychart-data-stars -​ skychart.desktop -​ Additional Star Catalogs -​ Additional stars catalog down to magnitude 12, variable and + + skychart-data-stars + skychart.desktop + Additional Star Catalogs + Additional stars catalog down to magnitude 12, variable and double stars: Tycho 2; General Catalogue of Variable Stars; Washington Double Stars. -​ CC0-1.0 -​ Public Domain -​ \ No newline at end of file + CC0-1.0 + Public Domain + diff --git a/skychart.spec b/skychart.spec index dd02e0d..531f2b6 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 6.%{svnversion}svn%{?dist} +Release: 7.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -229,6 +229,9 @@ fi %changelog +* Fri Jan 15 2016 Richard Hughes - 3.11-7.3157svn +- Fix the metainfo files by removing zero-width space chars + * Mon Jan 11 2016 Mattia Verga - 3.11-6.3157svn - Add .metainfo.xml files to subpackages From 72a67fe215f5488b4d9112af75cb6ffd0bab30be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 00:08:17 +0000 Subject: [PATCH 21/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 531f2b6..e42db35 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 7.%{svnversion}svn%{?dist} +Release: 8.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -229,6 +229,9 @@ fi %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.11-8.3157svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jan 15 2016 Richard Hughes - 3.11-7.3157svn - Fix the metainfo files by removing zero-width space chars From b4952c3f08aa0d00a80cc47c4c29dc5b68425550 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 16 Feb 2016 17:12:23 +0100 Subject: [PATCH 22/86] New upstream sources and new patches --- .gitignore | 1 + generate-tarball.sh | 14 ++++++++++++- skychart-3.11-fix-appdata.patch | 35 --------------------------------- skychart-3.11-noupdate.patch | 11 +++++++++++ skychart-3.11-satmessage.patch | 13 ++++++++++++ sources | 2 ++ 6 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 skychart-3.11-fix-appdata.patch create mode 100644 skychart-3.11-noupdate.patch create mode 100644 skychart-3.11-satmessage.patch diff --git a/.gitignore b/.gitignore index 38a77ed..f05eaf2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /catalog_ocl.tgz /skychart-3.11-3141-src-nopatents.tar.xz /skychart-3.11-3157-src-nopatents.tar.xz +/skychart-3.11-3238-src-nopatents.tar.xz diff --git a/generate-tarball.sh b/generate-tarball.sh index 02ae0e5..eee8c0c 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -7,7 +7,19 @@ tar -xJvf skychart-$VERSION-src.tar.xz #Remove pre-built software rm -rf skychart-$VERSION-src/tools/data/iridflar rm -rf skychart-$VERSION-src/tools/data/quicksat -rm -rf skychart-$VERSION-src/system_integration/Windows/data +rm -rf skychart-$VERSION-src/skychart/sample_client/astrolabe/*.dll +rm -rf skychart-$VERSION-src/skychart/sample_client/ds2cdc/*.dll.zip + +#Remove Mac and Windows unneeded stuff +rm -rf skychart-$VERSION-src/system_integration/Windows +rm -rf skychart-$VERSION-src/system_integration/MacOSX + +#Remove libraries provided by separate package libpasastro +#they are here only for building the Win version +rm -rf skychart-$VERSION-src/skychart/library/getdss +rm -rf skychart-$VERSION-src/skychart/library/plan404 +rm -rf skychart-$VERSION-src/skychart/library/wcs + tar -cJvf skychart-$VERSION-src-nopatents.tar.xz skychart-$VERSION-src diff --git a/skychart-3.11-fix-appdata.patch b/skychart-3.11-fix-appdata.patch deleted file mode 100644 index ae0f574..0000000 --- a/skychart-3.11-fix-appdata.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/system_integration/Linux/share/appdata/skychart.appdata.xml 2013-09-29 18:21:18.000000000 +0200 -+++ b/system_integration/Linux/share/appdata/skychart.appdata.xml 2016-01-10 13:23:20.892471882 +0100 -@@ -1,20 +1,30 @@ - - - skychart.desktop -- CC0 -+ CC0-1.0 -+ GPL-2.0+ -+ Skychart -+ Planetarium software for the advanced amateur astronomer - -

- Skychart is a free and advanced planetarium software for drawing sky charts - for specific places and times with nicely graphic and for controlling - telescopes by connecting them to pc. -+

-+

- It can also calculate Solar System objects visibility and data, like planets, - comets and asteroids, and display moon and planets in realistic mode. -+

-+

- Skychart also includes VarObs, a software to help astronomers to get data - for variable stars observation. -

- - -- http://www.ap-i.net/skychart/_media/en/screenshot/vo_m101.jpg -+ -+ http://www.ap-i.net/skychart/_media/en/screenshot/vo_m101.jpg -+ The main window of Skychart in action. -+ - - http://www.ap-i.net/skychart/ - pch@ap-i.net diff --git a/skychart-3.11-noupdate.patch b/skychart-3.11-noupdate.patch new file mode 100644 index 0000000..65fa87b --- /dev/null +++ b/skychart-3.11-noupdate.patch @@ -0,0 +1,11 @@ +--- a/skychart/Makefile.in 2016-02-14 11:58:11.000000000 +0100 ++++ b/skychart/Makefile.in 2016-02-15 18:59:17.956482359 +0100 +@@ -17,7 +17,7 @@ + [compiler] + unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) + includedir=./ +-options= $(opt_target) $(fpcopts) -CF64 -dWithUpdateMenu -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l ++options= $(opt_target) $(fpcopts) -CF64 -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l + unitdir=library/catalog/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/jdcalendar/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/bgrabitmap/lib/$(CPU_TARGET)-$(OS_TARGET) component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/mrecsort/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/multiframe/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/radec/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/zoomimage/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/indiclient/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vo/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vosamp/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/xmlparser/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ + + [clean] diff --git a/skychart-3.11-satmessage.patch b/skychart-3.11-satmessage.patch new file mode 100644 index 0000000..3518db8 --- /dev/null +++ b/skychart-3.11-satmessage.patch @@ -0,0 +1,13 @@ +--- a/skychart/u_satellite.pas 2016-01-27 12:11:49.000000000 +0100 ++++ b/skychart/u_satellite.pas 2016-02-14 10:43:53.444002970 +0100 +@@ -99,9 +99,8 @@ + buf:=''; + for j:=0 to r.Count-1 do buf:=buf+r[j]; + end else buf:=''; +- ShowMessage(rsPleaseInstWine+crlf+rsIfItIsNotIns+crlf+'apt-get install wine'+crlf +- +'yum install wine'+crlf+'wine return: '+buf); + end; ++ShowMessage('Artificial satellites calculation has been removed due to Fedora policies.'+crlf+'If you need it, please uninstall Skychart provided by Fedora repositories and download Skychart rpms from the author site.'); + r.free; + end; + diff --git a/sources b/sources index c754473..50a106b 100644 --- a/sources +++ b/sources @@ -10,3 +10,5 @@ eb41098f194574662b147e4891ef261e catalog_tycho2.tgz 00d206019a86098d79c1e89b32103792 catalog_wds.tgz a34d0d2f86bfa01d86353198893cb538 skychart-3.11-3141-src-nopatents.tar.xz 93f8af8b9ea57606b531dcc0947275c1 skychart-3.11-3157-src-nopatents.tar.xz +9c0efcab1cd214ab20e44b5c81f10c36 catalog_wds.tgz +1fdd3897f9f46e73fd6adfd1387a3755 skychart-3.11-3238-src-nopatents.tar.xz From 49873f395a56652eef28767ad60a14d6cb0240e6 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 16 Feb 2016 17:20:17 +0100 Subject: [PATCH 23/86] Update .spec file for the new version --- skychart.spec | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/skychart.spec b/skychart.spec index e42db35..587e7af 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,17 +1,20 @@ -%global svnversion 3157 +%global svnversion 3238 Name: skychart Version: 3.11 -Release: 8.%{svnversion}svn%{?dist} +Release: 10.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ -# Skychart contains iridflare.exe -# Since it is pre-built code and the license is not clear -# we remove it from sources. -# Download upstream tarball and invoke this script -# while in tarballs directory: -# ./generate-tarball.sh 3.11-3157 +# Upstream sources are modified to: +# - Remove pre-built software (iridflare.exe, quicksat.exe, dll files) +# - Remove unneeded Windows and MacOS stuff +# - Remove libraries provided by libpasastro package +# (they still are in sources only for compiling the Windows version) +# To do this we use the generate-tarball.sh script +# Download upstream tarball in the same directory of the script +# and run: +# ./generate-tarball.sh 3.11-3238 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -38,9 +41,14 @@ Patch1: skychart-3.11-strip.patch # This is Fedora specific and not reported upstream Patch2: skychart-wgetdata.patch -# Fix appdata file validation -# Reported upstream -Patch3: skychart-3.11-fix-appdata.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 +Patch3: skychart-3.11-satmessage.patch + +# Disable software update menu item +# This feature was asked upstream specifically for Fedora +Patch4: skychart-3.11-noupdate.patch # fpc isn't available on aarch64 and s390 # lazarus isn't available on aarch64 ppc and s390 @@ -111,12 +119,11 @@ Galactic Planetary Nebulae. %patch3 -p1 +%patch4 -p1 + # Fix executable bit set on sources find skychart -type f -print0 |xargs -0 chmod -x -# Fix wrong FSF address in source headers -grep -rl '59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.' * | xargs -i@ sed -i 's/59 Temple Place - Suite 330, Boston, MA 02111-1307, USA./51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA./g' @ - # Put additional catalogs files where where required for installation cp -p %SOURCE2 ./BaseData cp -p %SOURCE3 ./BaseData @@ -229,6 +236,19 @@ fi %changelog +* Mon Feb 15 2016 Mattia Verga - 3.11-10.3238svn +- Update svn version +- Remove remnants of pre built .dll files in sources +- Remove libraries from sources that are now provided externally +- Patch to inform user about artificial satellites calculation removal +- Patch to set option to disable software update menu item + +* Fri Feb 12 2016 Mattia Verga - 3.11-9.3229svn +- Update svn version +- FSF address in sources is now fixed upstream +- Appdata file is now fixed upstream +- Updated catalog_wds source file from upstream + * Fri Feb 05 2016 Fedora Release Engineering - 3.11-8.3157svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From f9e57227708d18ec62a9b4ac3cb05555ce4c1f11 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 16 Feb 2016 17:32:56 +0100 Subject: [PATCH 24/86] Remove old file catalog_wds.tgz from sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 50a106b..98bf3f3 100644 --- a/sources +++ b/sources @@ -7,7 +7,6 @@ de9e5492d4d29cd505e4a2fb2ffdfdff catalog_lbn.tgz 6df410542ed914df41514b64a427233f catalog_ocl.tgz 7ab9842429d0407e7dff1946a166a685 catalog_pgc.tgz eb41098f194574662b147e4891ef261e catalog_tycho2.tgz -00d206019a86098d79c1e89b32103792 catalog_wds.tgz a34d0d2f86bfa01d86353198893cb538 skychart-3.11-3141-src-nopatents.tar.xz 93f8af8b9ea57606b531dcc0947275c1 skychart-3.11-3157-src-nopatents.tar.xz 9c0efcab1cd214ab20e44b5c81f10c36 catalog_wds.tgz From 3a06f06bcf8272f67f3649b6933cd90f3c8d23ea Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 17 Apr 2016 11:06:21 +0200 Subject: [PATCH 25/86] Remove additional NGC catalog due to incompatible license --- skychart-data-dso.metainfo.xml | 2 +- skychart.spec | 12 ++++++++---- sources | 3 --- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/skychart-data-dso.metainfo.xml b/skychart-data-dso.metainfo.xml index e785909..c7f8115 100644 --- a/skychart-data-dso.metainfo.xml +++ b/skychart-data-dso.metainfo.xml @@ -3,7 +3,7 @@ skychart-data-dso skychart.desktop Additional Nebulae Catalogs - Standard nebulae catalogs: New General Catalogue; Principal + Standard nebulae catalogs: Principal Galaxies Catalogue; Lynds Bright Nebulae; Open Cluster Data; Globular Clusters in the Milky Way; Galactic Planetary Nebulae. CC0-1.0 diff --git a/skychart.spec b/skychart.spec index 587e7af..d240bdf 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 10.%{svnversion}svn%{?dist} +Release: 11.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -24,7 +24,8 @@ Source4: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_wd Source5: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_idx.tgz # Source data for skychart-data-dso Source6: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_pgc.tgz -Source7: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_ngc.tgz +# Catalog NGC removed due to incompatible license +#Source7: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_ngc.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 @@ -130,7 +131,7 @@ 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 @@ -194,6 +195,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/skychart/data %{_datadir}/skychart/cat/DSoutlines %{_datadir}/skychart/cat/milkyway +%dir %{_datadir}/skychart/cat/ngc2000 %{_datadir}/skychart/cat/ngc2000/*.idx %{_datadir}/skychart/cat/RealSky %{_datadir}/skychart/cat/sac @@ -214,7 +216,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/appdata/%{name}-data-stars.metainfo.xml %files data-dso -%{_datadir}/skychart/cat/ngc2000/*.dat %{_datadir}/skychart/cat/pgc %{_datadir}/skychart/cat/lbn %{_datadir}/skychart/cat/ocl @@ -236,6 +237,9 @@ fi %changelog +* Sun Apr 17 2016 Mattia Verga - 3.11-11.3238svn +- Remove additional NGC catalog due to incompatible license + * Mon Feb 15 2016 Mattia Verga - 3.11-10.3238svn - Update svn version - Remove remnants of pre built .dll files in sources diff --git a/sources b/sources index 98bf3f3..409f7bc 100644 --- a/sources +++ b/sources @@ -3,11 +3,8 @@ abf0b88cfaf9986b3abce5827ad62196 catalog_gcm.tgz 399cf42d7653bbebfa4fa11530df9901 catalog_gpn.tgz d0d475e4f7c8aea172247d4160562612 catalog_idx.tgz de9e5492d4d29cd505e4a2fb2ffdfdff catalog_lbn.tgz -81001f378ded89e298c7c4cdacd90e95 catalog_ngc.tgz 6df410542ed914df41514b64a427233f catalog_ocl.tgz 7ab9842429d0407e7dff1946a166a685 catalog_pgc.tgz eb41098f194574662b147e4891ef261e catalog_tycho2.tgz -a34d0d2f86bfa01d86353198893cb538 skychart-3.11-3141-src-nopatents.tar.xz -93f8af8b9ea57606b531dcc0947275c1 skychart-3.11-3157-src-nopatents.tar.xz 9c0efcab1cd214ab20e44b5c81f10c36 catalog_wds.tgz 1fdd3897f9f46e73fd6adfd1387a3755 skychart-3.11-3238-src-nopatents.tar.xz From 8a8784456519011cecf17c42322cefc6b19c799f Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 17 Apr 2016 11:52:46 +0200 Subject: [PATCH 26/86] Use new fpc_arches macro as ExclusiveArch --- skychart.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/skychart.spec b/skychart.spec index d240bdf..2467d7b 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 11.%{svnversion}svn%{?dist} +Release: 12.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -51,11 +51,8 @@ Patch3: skychart-3.11-satmessage.patch # This feature was asked upstream specifically for Fedora Patch4: skychart-3.11-noupdate.patch -# fpc isn't available on aarch64 and s390 -# lazarus isn't available on aarch64 ppc and s390 -# so ccdciel could not build -# https://bugzilla.redhat.com/show_bug.cgi?id=1287833 -ExcludeArch: aarch64 %{power64} s390 s390x + +ExclusiveArch: %{fpc_arches} BuildRequires: fpc >= 2.4.4 @@ -107,7 +104,7 @@ BuildArch: noarch %description data-dso Additional DSO catalogs for Skychart. This package install all the standard -nebulae catalogs: New General Catalogue; Principal Galaxies Catalogue; +nebulae catalogs: Principal Galaxies Catalogue; Lynds Bright Nebulae; Open Cluster Data; Globular Clusters in the Milky Way; Galactic Planetary Nebulae. @@ -237,6 +234,9 @@ fi %changelog +* Sun Apr 17 2016 Mattia Verga - 3.11-12.3238svn +- Use new fpc_arches macro as ExclusiveArch + * Sun Apr 17 2016 Mattia Verga - 3.11-11.3238svn - Remove additional NGC catalog due to incompatible license From 871a290bf897b72e9a00716ae6e415f8b8993dd7 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 17 Sep 2016 10:50:40 +0200 Subject: [PATCH 27/86] Update svn version --- .gitignore | 1 + skychart-data-dso.metainfo.xml | 11 ----------- skychart-data-stars.metainfo.xml | 11 ----------- skychart.spec | 26 +++++++++++++++----------- sources | 2 +- 5 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 skychart-data-dso.metainfo.xml delete mode 100644 skychart-data-stars.metainfo.xml diff --git a/.gitignore b/.gitignore index f05eaf2..991dc49 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /skychart-3.11-3141-src-nopatents.tar.xz /skychart-3.11-3157-src-nopatents.tar.xz /skychart-3.11-3238-src-nopatents.tar.xz +/skychart-3.11-3287-src-nopatents.tar.xz diff --git a/skychart-data-dso.metainfo.xml b/skychart-data-dso.metainfo.xml deleted file mode 100644 index c7f8115..0000000 --- a/skychart-data-dso.metainfo.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - skychart-data-dso - skychart.desktop - Additional Nebulae Catalogs - Standard nebulae catalogs: Principal - Galaxies Catalogue; Lynds Bright Nebulae; Open Cluster Data; - Globular Clusters in the Milky Way; Galactic Planetary Nebulae. - CC0-1.0 - Public Domain - diff --git a/skychart-data-stars.metainfo.xml b/skychart-data-stars.metainfo.xml deleted file mode 100644 index e74b315..0000000 --- a/skychart-data-stars.metainfo.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - skychart-data-stars - skychart.desktop - Additional Star Catalogs - Additional stars catalog down to magnitude 12, variable and - double stars: Tycho 2; General Catalogue of Variable Stars; - Washington Double Stars. - CC0-1.0 - Public Domain - diff --git a/skychart.spec b/skychart.spec index 2467d7b..efe3c8a 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 3238 +%global svnversion 3287 Name: skychart Version: 3.11 -Release: 12.%{svnversion}svn%{?dist} +Release: 13.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 3.11-3238 +# ./generate-tarball.sh 3.11-3287 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -30,9 +30,7 @@ Source8: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gc 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 -# Metainfo.xml files for subpackages -Source12: skychart-data-stars.metainfo.xml -Source13: skychart-data-dso.metainfo.xml + # Avoid stripping debuginfo from executables # This is Fedora specific and not reported upstream @@ -57,10 +55,16 @@ ExclusiveArch: %{fpc_arches} BuildRequires: fpc >= 2.4.4 BuildRequires: lazarus >= 1.0.4 -BuildRequires: ImageMagick desktop-file-utils dos2unix gtk2-devel +BuildRequires: desktop-file-utils +BuildRequires: dos2unix +BuildRequires: gtk2-devel +BuildRequires: ImageMagick BuildRequires: libappstream-glib -Requires: libpasastro xdg-utils tzdata xplanet +Requires: libpasastro +Requires: tzdata +Requires: xdg-utils +Requires: xplanet %description This program enables you to draw sky charts, making use of the data in 16 @@ -166,9 +170,6 @@ make install install_doc PREFIX=%{buildroot}%{_prefix} make install install_cat1 PREFIX=%{buildroot}%{_prefix} make install install_cat2 PREFIX=%{buildroot}%{_prefix} -# Put .metainfo.xml files in appdata dir -cp %SOURCE12 %{buildroot}%{_datadir}/appdata/ -cp %SOURCE13 %{buildroot}%{_datadir}/appdata/ %check # Menu entry @@ -234,6 +235,9 @@ fi %changelog +* Sat Sep 17 2016 Mattia Verga - 3.11-13.3287svn +- Update svn version + * Sun Apr 17 2016 Mattia Verga - 3.11-12.3238svn - Use new fpc_arches macro as ExclusiveArch diff --git a/sources b/sources index 409f7bc..8b17993 100644 --- a/sources +++ b/sources @@ -7,4 +7,4 @@ de9e5492d4d29cd505e4a2fb2ffdfdff catalog_lbn.tgz 7ab9842429d0407e7dff1946a166a685 catalog_pgc.tgz eb41098f194574662b147e4891ef261e catalog_tycho2.tgz 9c0efcab1cd214ab20e44b5c81f10c36 catalog_wds.tgz -1fdd3897f9f46e73fd6adfd1387a3755 skychart-3.11-3238-src-nopatents.tar.xz +349b3707bcdc570ddab4d2a5b2f8f822 skychart-3.11-3287-src-nopatents.tar.xz From 8b5f0401349e153e96d55c9f3c040dfe9129eb12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:34:19 +0000 Subject: [PATCH 28/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index efe3c8a..5292c0a 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 13.%{svnversion}svn%{?dist} +Release: 14.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -235,6 +235,9 @@ fi %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.11-14.3287svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Sep 17 2016 Mattia Verga - 3.11-13.3287svn - Update svn version From 6f60da2640027a5ffea5724a419a1ee32dacb736 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 12 Feb 2017 18:00:44 +0100 Subject: [PATCH 29/86] Exclude ppc64 from building architectures due to lazarus limitations --- skychart.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 5292c0a..bb659f5 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 14.%{svnversion}svn%{?dist} +Release: 15.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -51,6 +51,9 @@ Patch4: skychart-3.11-noupdate.patch ExclusiveArch: %{fpc_arches} +# fpc is available on ppc64, but lazarus has some limitations that +# prevents this package to build +ExcludeArch: ppc64 BuildRequires: fpc >= 2.4.4 @@ -235,6 +238,9 @@ fi %changelog +* Sun Feb 12 2017 Mattia Verga - 3.11-15.3287svn +- Set ExcludeArch ppc64 due to lazarus limitations + * Sat Feb 11 2017 Fedora Release Engineering - 3.11-14.3287svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 01504d284293758e9a50bb84cd0569b80416540f Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 28 Feb 2017 12:04:46 +0100 Subject: [PATCH 30/86] Update to 3.11.svn3549 (4.0beta) --- .gitignore | 4 ++ generate-tarball.sh | 4 +- skychart-3.11-satmessage.patch | 39 +++++++++++++------ skychart.spec | 71 ++++++++++++++++++---------------- sources | 22 ++++++----- 5 files changed, 85 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 991dc49..589e921 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,7 @@ /skychart-3.11-3157-src-nopatents.tar.xz /skychart-3.11-3238-src-nopatents.tar.xz /skychart-3.11-3287-src-nopatents.tar.xz +/catalog_barnard.tgz +/catalog_leda.tgz +/catalog_sh2.tgz +/skychart-3.11-3549-src-nopatents.tar.xz diff --git a/generate-tarball.sh b/generate-tarball.sh index eee8c0c..69775e9 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -20,8 +20,10 @@ rm -rf skychart-$VERSION-src/skychart/library/getdss rm -rf skychart-$VERSION-src/skychart/library/plan404 rm -rf skychart-$VERSION-src/skychart/library/wcs +#Remove NGC2000 catalog with license problem and no more used +rm -rf skychart-$VERSION-src/tools/cat/ngc2000 tar -cJvf skychart-$VERSION-src-nopatents.tar.xz skychart-$VERSION-src #Remove temporary directory -rm -rf skychart-$VERSION-src \ No newline at end of file +rm -rf skychart-$VERSION-src diff --git a/skychart-3.11-satmessage.patch b/skychart-3.11-satmessage.patch index 3518db8..cecee13 100644 --- a/skychart-3.11-satmessage.patch +++ b/skychart-3.11-satmessage.patch @@ -1,13 +1,30 @@ ---- a/skychart/u_satellite.pas 2016-01-27 12:11:49.000000000 +0100 -+++ b/skychart/u_satellite.pas 2016-02-14 10:43:53.444002970 +0100 -@@ -99,9 +99,8 @@ - buf:=''; - for j:=0 to r.Count-1 do buf:=buf+r[j]; - end else buf:=''; -- ShowMessage(rsPleaseInstWine+crlf+rsIfItIsNotIns+crlf+'apt-get install wine'+crlf -- +'yum install wine'+crlf+'wine return: '+buf); - end; -+ShowMessage('Artificial satellites calculation has been removed due to Fedora policies.'+crlf+'If you need it, please uninstall Skychart provided by Fedora repositories and download Skychart rpms from the author site.'); - r.free; +--- a/skychart/u_satellite.pas 2017-02-20 18:48:05.000000000 +0100 ++++ b/skychart/u_satellite.pas 2017-02-27 19:15:57.825178736 +0100 +@@ -86,26 +86,8 @@ end; + function CheckWine: boolean; +-var cmd,buf,msg: string; +- i,j: integer; +- r: Tstringlist; + begin +-r:=Tstringlist.Create; +-cmd:='wine --version'; +-i:=execprocess(cmd,r); +-result:=(i=0); +-if not result then begin +- if r.Count>0 then begin +- buf:=''; +- for j:=0 to r.Count-1 do buf:=buf+r[j]; +- end else buf:=''; +- msg:=rsPleaseInstWine; +- {$ifdef linux} +- msg:=msg+crlf+rsIfItIsNotIns+crlf+'apt-get install wine'+crlf+'yum install wine'; +- {$endif} +- ShowMessage(msg+crlf+'wine return: '+buf); +-end; +-r.free; ++ShowMessage('Artificial satellites calculation has been removed due to Fedora policies.'+crlf+'If you need it, please uninstall Skychart provided by Fedora repositories and download Skychart rpms from the author site.'); + end; + + function CheckDosbox: boolean; diff --git a/skychart.spec b/skychart.spec index bb659f5..470d8b2 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 3287 +%global svnversion 3549 Name: skychart Version: 3.11 -Release: 15.%{svnversion}svn%{?dist} +Release: 16.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 3.11-3287 +# ./generate-tarball.sh 3.11-3549 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -23,13 +23,13 @@ Source3: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_ty 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 -Source6: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_pgc.tgz -# Catalog NGC removed due to incompatible license -#Source7: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_ngc.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 @@ -56,8 +56,8 @@ ExclusiveArch: %{fpc_arches} ExcludeArch: ppc64 -BuildRequires: fpc >= 2.4.4 -BuildRequires: lazarus >= 1.0.4 +BuildRequires: fpc +BuildRequires: lazarus BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: gtk2-devel @@ -111,9 +111,9 @@ BuildArch: noarch %description data-dso Additional DSO catalogs for Skychart. This package install all the standard -nebulae catalogs: Principal Galaxies Catalogue; -Lynds Bright Nebulae; Open Cluster Data; Globular Clusters in the Milky Way; -Galactic Planetary Nebulae. +nebulae catalogs: LEDA Catalogue; Lynds Bright Nebulae; Open Cluster Data; +Globular Clusters in the Milky Way; Galactic Planetary Nebulae; +Barnard Catalogue of Dark Nebulae; Sharpless Catalog. %prep %setup0 -q -n %{name}-%{version}-%{svnversion}-src @@ -130,27 +130,28 @@ Galactic Planetary Nebulae. find skychart -type f -print0 |xargs -0 chmod -x # 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 %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 + +# 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 -cp -p %SOURCE8 ./BaseData -cp -p %SOURCE9 ./BaseData -cp -p %SOURCE10 ./BaseData -cp -p %SOURCE11 ./BaseData -# Add directories to fix builds for arm and ppc architectures -mkdir ./skychart/component/lib/arm-linux-gtk2 -mkdir ./skychart/units/arm-linux-gtk2 -mkdir ./varobs/units/arm-linux-gtk2 -mkdir ./skychart/component/lib/powerpc-linux-gtk2 -mkdir ./skychart/units/powerpc-linux-gtk2 -mkdir ./varobs/units/powerpc-linux-gtk2 -mkdir ./skychart/component/lib/powerpc64-linux-gtk2 -mkdir ./skychart/units/powerpc64-linux-gtk2 -mkdir ./varobs/units/powerpc64-linux-gtk2 %build ./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix} @@ -196,8 +197,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/skychart/data %{_datadir}/skychart/cat/DSoutlines %{_datadir}/skychart/cat/milkyway -%dir %{_datadir}/skychart/cat/ngc2000 -%{_datadir}/skychart/cat/ngc2000/*.idx +%{_datadir}/skychart/cat/openngc %{_datadir}/skychart/cat/RealSky %{_datadir}/skychart/cat/sac %{_datadir}/skychart/cat/xhip @@ -217,11 +217,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/appdata/%{name}-data-stars.metainfo.xml %files data-dso -%{_datadir}/skychart/cat/pgc +%{_datadir}/skychart/cat/leda %{_datadir}/skychart/cat/lbn %{_datadir}/skychart/cat/ocl %{_datadir}/skychart/cat/gcm %{_datadir}/skychart/cat/gpn +%{_datadir}/skychart/cat/barnard +%{_datadir}/skychart/cat/sh2 %{_datadir}/appdata/%{name}-data-dso.metainfo.xml %post @@ -238,6 +240,9 @@ fi %changelog +* Mon Feb 27 2017 Mattia Verga - 3.11-16.3549svn +- Update svn version + * Sun Feb 12 2017 Mattia Verga - 3.11-15.3287svn - Set ExcludeArch ppc64 due to lazarus limitations diff --git a/sources b/sources index 8b17993..a723096 100644 --- a/sources +++ b/sources @@ -1,10 +1,12 @@ -abf0b88cfaf9986b3abce5827ad62196 catalog_gcm.tgz -3031ca90157c291bfdd5a841dc926e64 catalog_gcvs.tgz -399cf42d7653bbebfa4fa11530df9901 catalog_gpn.tgz -d0d475e4f7c8aea172247d4160562612 catalog_idx.tgz -de9e5492d4d29cd505e4a2fb2ffdfdff catalog_lbn.tgz -6df410542ed914df41514b64a427233f catalog_ocl.tgz -7ab9842429d0407e7dff1946a166a685 catalog_pgc.tgz -eb41098f194574662b147e4891ef261e catalog_tycho2.tgz -9c0efcab1cd214ab20e44b5c81f10c36 catalog_wds.tgz -349b3707bcdc570ddab4d2a5b2f8f822 skychart-3.11-3287-src-nopatents.tar.xz +SHA512 (catalog_barnard.tgz) = 7b91c80dfc25e006cd0cfad6a64fab78aea9b9ded1e8f75b2c54851be788b6512be96bf8891692d9b52825a90fc27d6ae262d1dd3ccc9ff76318f4d91330bf02 +SHA512 (catalog_gcm.tgz) = 957e87b81a23b64b5e40a6f3a55908637e86b01bba0fc36c9dd293966a9870faf7de22d548b324bf9a6c15641cd09d10f76a7200b52eab48fa4c7836115518ce +SHA512 (catalog_gcvs.tgz) = de2878a4ebe35c864d10354378ff033b0f8d261a818e5f66d6c39be28933501a94a662ed7dc85b40ec38270efe567cbd63a637c778aa386eb68584b32c4844f9 +SHA512 (catalog_gpn.tgz) = d0e83773f1dd59d45e9465e6bc0bb0110631f7956fa01f37c5de763be0f7048c22abf3dccc4333c126272f270485b37084d8e22cd02db08e7bb8412da9c66bb4 +SHA512 (catalog_idx.tgz) = 3b144993de14b73edaffd43a35b8404adb166c5b4edc223dd78e8db361ca9a61da2e9c3d29a0af97960c1cdcb94b307ce0824f1fda3b74b518f611666d1e362e +SHA512 (catalog_lbn.tgz) = bddc2cf48c2e575440ed114bb447187e2f30c87312a552ff63d40e88a08e05c31da1d45cb96a5bb0216093a07e4d16336a0a664a66d6e586221217ae45d803da +SHA512 (catalog_leda.tgz) = d8d1587ab937b1a14b6daa0a32dc1ee2238f13e198940c182abcfa73f27c89fe7657dd0f8c5a23372a847adfc76ce08276b41fbef13995b8713bef3dde0e1397 +SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13e0e86cf09e4a2ff3d915e5618940e9d8b2ab4a4198b59cd05302322a5862f53535449f343e7 +SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 +SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 +SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c +SHA512 (skychart-3.11-3549-src-nopatents.tar.xz) = 950b914af63a544de37ab6b710160a6eb26170f021d2a2ebe16bd99099bf4f69e86823c230bbb4775535ca73715459cb7fa0e52c520abbc8625c967148b55015 From 573f2081c30ad88397667719130af8ea4d8f3337 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 5 Mar 2017 11:31:18 +0100 Subject: [PATCH 31/86] Patch to fix libssl and libcrypto links --- skychart-3.11-libssl.patch | 13 +++++++++++++ skychart.spec | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 skychart-3.11-libssl.patch diff --git a/skychart-3.11-libssl.patch b/skychart-3.11-libssl.patch new file mode 100644 index 0000000..76a616a --- /dev/null +++ b/skychart-3.11-libssl.patch @@ -0,0 +1,13 @@ +--- a/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2015-07-31 10:48:21.000000000 +0200 ++++ b/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2017-03-02 19:06:19.869930572 +0100 +@@ -125,8 +125,8 @@ + DLLUtilName: string = 'crypto.dll'; + {$ENDIF OS2GCC} + {$ELSE OS2} +- DLLSSLName: string = 'libssl.so'; +- DLLUtilName: string = 'libcrypto.so'; ++ DLLSSLName: string = 'libssl.so.10'; ++ DLLUtilName: string = 'libcrypto.so.10'; + {$ENDIF OS2} + {$ENDIF} + {$ELSE} diff --git a/skychart.spec b/skychart.spec index 470d8b2..fe21bb4 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.11 -Release: 16.%{svnversion}svn%{?dist} +Release: 17.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -49,6 +49,10 @@ Patch3: skychart-3.11-satmessage.patch # This feature was asked upstream specifically for Fedora Patch4: skychart-3.11-noupdate.patch +# Fix libssl and libcrypto links +# http://www.ap-i.net/mantis/view.php?id=1668 +Patch4: skychart-3.11-libssl.patch + ExclusiveArch: %{fpc_arches} # fpc is available on ppc64, but lazarus has some limitations that @@ -69,6 +73,8 @@ Requires: tzdata Requires: xdg-utils Requires: xplanet +Recommends: openssl-libs + %description This program enables you to draw sky charts, making use of the data in 16 catalogs of stars and nebulae. In addition the position of planets, @@ -126,6 +132,8 @@ Barnard Catalogue of Dark Nebulae; Sharpless Catalog. %patch4 -p1 +%patch5 -p1 + # Fix executable bit set on sources find skychart -type f -print0 |xargs -0 chmod -x @@ -240,6 +248,9 @@ fi %changelog +* Sun Mar 05 2017 Mattia Verga - 3.11-17.3549svn +- Patch to fix libssl and libcrypto links + * Mon Feb 27 2017 Mattia Verga - 3.11-16.3549svn - Update svn version From 607cd049d591a63189025023c9a99aba974427dd Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 5 Mar 2017 11:33:10 +0100 Subject: [PATCH 32/86] Fix version in libssl patch for F26> --- skychart-3.11-libssl.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skychart-3.11-libssl.patch b/skychart-3.11-libssl.patch index 76a616a..48cf019 100644 --- a/skychart-3.11-libssl.patch +++ b/skychart-3.11-libssl.patch @@ -6,8 +6,8 @@ {$ELSE OS2} - DLLSSLName: string = 'libssl.so'; - DLLUtilName: string = 'libcrypto.so'; -+ DLLSSLName: string = 'libssl.so.10'; -+ DLLUtilName: string = 'libcrypto.so.10'; ++ DLLSSLName: string = 'libssl.so.1.1'; ++ DLLUtilName: string = 'libcrypto.so.1.1'; {$ENDIF OS2} {$ENDIF} {$ELSE} From a36147e92fdf999298f6e5a26096800d0b83a3b2 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 5 Mar 2017 11:38:55 +0100 Subject: [PATCH 33/86] Fix patch number in .spec --- skychart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index fe21bb4..e3083fe 100644 --- a/skychart.spec +++ b/skychart.spec @@ -51,7 +51,7 @@ Patch4: skychart-3.11-noupdate.patch # Fix libssl and libcrypto links # http://www.ap-i.net/mantis/view.php?id=1668 -Patch4: skychart-3.11-libssl.patch +Patch5: skychart-3.11-libssl.patch ExclusiveArch: %{fpc_arches} From eec531f1744d42df6dae71541677bdc9b0729155 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 19 Mar 2017 16:23:46 +0100 Subject: [PATCH 34/86] Release ver 4.0 --- .gitignore | 1 + skychart.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 589e921..2c0dbf3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /catalog_leda.tgz /catalog_sh2.tgz /skychart-3.11-3549-src-nopatents.tar.xz +/skychart-4.0-3575-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index e3083fe..adc3c91 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 3549 +%global svnversion 3575 Name: skychart -Version: 3.11 -Release: 17.%{svnversion}svn%{?dist} +Version: 4.0 +Release: 1%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 3.11-3549 +# ./generate-tarball.sh 4.0-3575 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -248,6 +248,9 @@ fi %changelog +* Sun Mar 19 2017 Mattia Verga - 4.0-1 +- Release ver 4.0 + * Sun Mar 05 2017 Mattia Verga - 3.11-17.3549svn - Patch to fix libssl and libcrypto links diff --git a/sources b/sources index a723096..297082d 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-3.11-3549-src-nopatents.tar.xz) = 950b914af63a544de37ab6b710160a6eb26170f021d2a2ebe16bd99099bf4f69e86823c230bbb4775535ca73715459cb7fa0e52c520abbc8625c967148b55015 +SHA512 (skychart-4.0-3575-src-nopatents.tar.xz) = 8c8ce72c177f804b2a2a42255e91303954b8a40cc4995330018add67f073cfff29da2c3ad35c0ba3dec275283a75db5a831365875ae4607fad1ff8611a3a763c From 2e4bc7b78566703d93747c8d746d6a501d631298 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 12 Apr 2017 09:36:44 +0200 Subject: [PATCH 35/86] Fix for OpenSSL 1.1 --- skychart-3.11-libssl.patch | 13 --- skychart-4.0-libssl.patch | 173 +++++++++++++++++++++++++++++++++++++ skychart.spec | 9 +- 3 files changed, 180 insertions(+), 15 deletions(-) delete mode 100644 skychart-3.11-libssl.patch create mode 100644 skychart-4.0-libssl.patch diff --git a/skychart-3.11-libssl.patch b/skychart-3.11-libssl.patch deleted file mode 100644 index 48cf019..0000000 --- a/skychart-3.11-libssl.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2015-07-31 10:48:21.000000000 +0200 -+++ b/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2017-03-02 19:06:19.869930572 +0100 -@@ -125,8 +125,8 @@ - DLLUtilName: string = 'crypto.dll'; - {$ENDIF OS2GCC} - {$ELSE OS2} -- DLLSSLName: string = 'libssl.so'; -- DLLUtilName: string = 'libcrypto.so'; -+ DLLSSLName: string = 'libssl.so.1.1'; -+ DLLUtilName: string = 'libcrypto.so.1.1'; - {$ENDIF OS2} - {$ENDIF} - {$ELSE} diff --git a/skychart-4.0-libssl.patch b/skychart-4.0-libssl.patch new file mode 100644 index 0000000..e8ac073 --- /dev/null +++ b/skychart-4.0-libssl.patch @@ -0,0 +1,173 @@ +diff -U 3 -dHrN -- a/skychart/component/synapse/source/lib/blcksock.pas b/skychart/component/synapse/source/lib/blcksock.pas +--- a/skychart/component/synapse/source/lib/blcksock.pas 2017-04-12 09:21:36.872249313 +0200 ++++ b/skychart/component/synapse/source/lib/blcksock.pas 2017-04-12 09:21:58.686247010 +0200 +@@ -240,7 +240,7 @@ + {:Specify requested SSL/TLS version for secure connection.} + TSSLType = ( + LT_all, +- LT_SSLv2, ++ LT_SSLv23, + LT_SSLv3, + LT_TLSv1, + LT_TLSv1_1, +diff -U 3 -dHrN -- a/skychart/component/synapse/source/lib/ssl_openssl_lib.pas b/skychart/component/synapse/source/lib/ssl_openssl_lib.pas +--- a/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2017-03-05 10:27:48.000000000 +0100 ++++ b/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2017-04-12 09:16:06.067282537 +0200 +@@ -125,8 +125,8 @@ + DLLUtilName: string = 'crypto.dll'; + {$ENDIF OS2GCC} + {$ELSE OS2} +- DLLSSLName: string = 'libssl.so'; +- DLLUtilName: string = 'libcrypto.so'; ++ DLLSSLName: string = 'libssl.so.1.1'; ++ DLLUtilName: string = 'libcrypto.so.1.1'; + {$ENDIF OS2} + {$ENDIF} + {$ELSE} +@@ -283,11 +283,6 @@ + + [DllImport(DLLSSLName, CharSet = CharSet.Ansi, + SetLastError = False, CallingConvention= CallingConvention.cdecl, +- EntryPoint = 'SSLv2_method')] +- function SslMethodV2 : PSSL_METHOD; external; +- +- [DllImport(DLLSSLName, CharSet = CharSet.Ansi, +- SetLastError = False, CallingConvention= CallingConvention.cdecl, + EntryPoint = 'SSLv3_method')] + function SslMethodV3 : PSSL_METHOD; external; + +@@ -313,6 +308,11 @@ + + [DllImport(DLLSSLName, CharSet = CharSet.Ansi, + SetLastError = False, CallingConvention= CallingConvention.cdecl, ++ EntryPoint = 'TLS_method')] ++ function SslMethodTLS : PSSL_METHOD; external; ++ ++ [DllImport(DLLSSLName, CharSet = CharSet.Ansi, ++ SetLastError = False, CallingConvention= CallingConvention.cdecl, + EntryPoint = 'SSL_CTX_use_PrivateKey')] + function SslCtxUsePrivateKey(ctx: PSSL_CTX; pkey: SslPtr):Integer; external; + +@@ -713,12 +713,12 @@ + function SslCtxNew(meth: PSSL_METHOD):PSSL_CTX; + procedure SslCtxFree(arg0: PSSL_CTX); + function SslSetFd(s: PSSL; fd: Integer):Integer; +- function SslMethodV2:PSSL_METHOD; + function SslMethodV3:PSSL_METHOD; + function SslMethodTLSV1:PSSL_METHOD; + function SslMethodTLSV11:PSSL_METHOD; + function SslMethodTLSV12:PSSL_METHOD; + function SslMethodV23:PSSL_METHOD; ++ function SslMethodTLS:PSSL_METHOD; + function SslCtxUsePrivateKey(ctx: PSSL_CTX; pkey: SslPtr):Integer; + function SslCtxUsePrivateKeyASN1(pk: integer; ctx: PSSL_CTX; d: AnsiString; len: integer):Integer; + // function SslCtxUsePrivateKeyFile(ctx: PSSL_CTX; const _file: PChar; _type: Integer):Integer; +@@ -841,12 +841,12 @@ + TSslCtxNew = function(meth: PSSL_METHOD):PSSL_CTX; cdecl; + TSslCtxFree = procedure(arg0: PSSL_CTX); cdecl; + TSslSetFd = function(s: PSSL; fd: Integer):Integer; cdecl; +- TSslMethodV2 = function:PSSL_METHOD; cdecl; + TSslMethodV3 = function:PSSL_METHOD; cdecl; + TSslMethodTLSV1 = function:PSSL_METHOD; cdecl; + TSslMethodTLSV11 = function:PSSL_METHOD; cdecl; + TSslMethodTLSV12 = function:PSSL_METHOD; cdecl; + TSslMethodV23 = function:PSSL_METHOD; cdecl; ++ TSslMethodTLS = function:PSSL_METHOD; cdecl; + TSslCtxUsePrivateKey = function(ctx: PSSL_CTX; pkey: sslptr):Integer; cdecl; + TSslCtxUsePrivateKeyASN1 = function(pk: integer; ctx: PSSL_CTX; d: sslptr; len: integer):Integer; cdecl; + TSslCtxUsePrivateKeyFile = function(ctx: PSSL_CTX; const _file: PAnsiChar; _type: Integer):Integer; cdecl; +@@ -948,12 +948,12 @@ + _SslCtxNew: TSslCtxNew = nil; + _SslCtxFree: TSslCtxFree = nil; + _SslSetFd: TSslSetFd = nil; +- _SslMethodV2: TSslMethodV2 = nil; + _SslMethodV3: TSslMethodV3 = nil; + _SslMethodTLSV1: TSslMethodTLSV1 = nil; + _SslMethodTLSV11: TSslMethodTLSV11 = nil; + _SslMethodTLSV12: TSslMethodTLSV12 = nil; + _SslMethodV23: TSslMethodV23 = nil; ++ _SslMethodTLS: TSslMethodTLS = nil; + _SslCtxUsePrivateKey: TSslCtxUsePrivateKey = nil; + _SslCtxUsePrivateKeyASN1: TSslCtxUsePrivateKeyASN1 = nil; + _SslCtxUsePrivateKeyFile: TSslCtxUsePrivateKeyFile = nil; +@@ -1106,14 +1106,6 @@ + Result := 0; + end; + +-function SslMethodV2:PSSL_METHOD; +-begin +- if InitSSLInterface and Assigned(_SslMethodV2) then +- Result := _SslMethodV2 +- else +- Result := nil; +-end; +- + function SslMethodV3:PSSL_METHOD; + begin + if InitSSLInterface and Assigned(_SslMethodV3) then +@@ -1154,6 +1146,14 @@ + Result := nil; + end; + ++function SslMethodTLS:PSSL_METHOD; ++begin ++ if InitSSLInterface and Assigned(_SslMethodTLS) then ++ Result := _SslMethodTLS ++ else ++ Result := nil; ++end; ++ + function SslCtxUsePrivateKey(ctx: PSSL_CTX; pkey: SslPtr):Integer; + begin + if InitSSLInterface and Assigned(_SslCtxUsePrivateKey) then +@@ -1901,12 +1901,12 @@ + _SslCtxNew := GetProcAddr(SSLLibHandle, 'SSL_CTX_new'); + _SslCtxFree := GetProcAddr(SSLLibHandle, 'SSL_CTX_free'); + _SslSetFd := GetProcAddr(SSLLibHandle, 'SSL_set_fd'); +- _SslMethodV2 := GetProcAddr(SSLLibHandle, 'SSLv2_method'); + _SslMethodV3 := GetProcAddr(SSLLibHandle, 'SSLv3_method'); + _SslMethodTLSV1 := GetProcAddr(SSLLibHandle, 'TLSv1_method'); + _SslMethodTLSV11 := GetProcAddr(SSLLibHandle, 'TLSv1_1_method'); + _SslMethodTLSV12 := GetProcAddr(SSLLibHandle, 'TLSv1_2_method'); + _SslMethodV23 := GetProcAddr(SSLLibHandle, 'SSLv23_method'); ++ _SslMethodTLS := GetProcAddr(SSLLibHandle, 'TLS_method'); + _SslCtxUsePrivateKey := GetProcAddr(SSLLibHandle, 'SSL_CTX_use_PrivateKey'); + _SslCtxUsePrivateKeyASN1 := GetProcAddr(SSLLibHandle, 'SSL_CTX_use_PrivateKey_ASN1'); + //use SSL_CTX_use_RSAPrivateKey_file instead SSL_CTX_use_PrivateKey_file, +@@ -2098,12 +2098,12 @@ + _SslCtxNew := nil; + _SslCtxFree := nil; + _SslSetFd := nil; +- _SslMethodV2 := nil; + _SslMethodV3 := nil; + _SslMethodTLSV1 := nil; + _SslMethodTLSV11 := nil; + _SslMethodTLSV12 := nil; + _SslMethodV23 := nil; ++ _SslMethodTLS := nil; + _SslCtxUsePrivateKey := nil; + _SslCtxUsePrivateKeyASN1 := nil; + _SslCtxUsePrivateKeyFile := nil; +diff -U 3 -dHrN -- a/skychart/component/synapse/source/lib/ssl_openssl.pas b/skychart/component/synapse/source/lib/ssl_openssl.pas +--- a/skychart/component/synapse/source/lib/ssl_openssl.pas 2015-07-31 10:48:21.000000000 +0200 ++++ b/skychart/component/synapse/source/lib/ssl_openssl.pas 2017-04-12 09:07:20.000000000 +0200 +@@ -420,8 +420,8 @@ + FLastError := 0; + Fctx := nil; + case FSSLType of +- LT_SSLv2: +- Fctx := SslCtxNew(SslMethodV2); ++ LT_SSLv23: ++ Fctx := SslCtxNew(SslMethodV23); + LT_SSLv3: + Fctx := SslCtxNew(SslMethodV3); + LT_TLSv1: +@@ -431,7 +431,7 @@ + LT_TLSv1_2: + Fctx := SslCtxNew(SslMethodTLSV12); + LT_all: +- Fctx := SslCtxNew(SslMethodV23); ++ Fctx := SslCtxNew(SslMethodTLS); + else + Exit; + end; diff --git a/skychart.spec b/skychart.spec index adc3c91..930a5ab 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -51,7 +51,9 @@ Patch4: skychart-3.11-noupdate.patch # Fix libssl and libcrypto links # http://www.ap-i.net/mantis/view.php?id=1668 -Patch5: skychart-3.11-libssl.patch +# Fix for OpenSSL 1.1 +# http://www.ap-i.net/mantis/view.php?id=1702 +Patch5: skychart-4.0-libssl.patch ExclusiveArch: %{fpc_arches} @@ -248,6 +250,9 @@ fi %changelog +* Wed Apr 12 2017 Mattia Verga - 4.0-2 +- Fix for OpenSSL 1.1 + * Sun Mar 19 2017 Mattia Verga - 4.0-1 - Release ver 4.0 From 87f6859ed4b56971145f9d0fd66c09f6cd13f347 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:45:41 +0000 Subject: [PATCH 36/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 930a5ab..8d19552 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -250,6 +250,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Apr 12 2017 Mattia Verga - 4.0-2 - Fix for OpenSSL 1.1 From 6a8c5a34f217db77f1ec08fbe8251d72033e554b Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 29 Jul 2017 18:13:43 +0200 Subject: [PATCH 37/86] Change FPC compiler options to fix debuginfo package build --- skychart.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/skychart.spec b/skychart.spec index 8d19552..0a7d925 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -168,7 +168,7 @@ done # Skychart doesn't like parallel building so we don't use macro. # We pass options to fpc compiler for generate debug info. -make fpcopts="-O1 -g -gl -OoREGVAR -Ch2000000 -CX -XX" +make fpcopts="-O1 -gw3 -fPIC" %install # Install main program @@ -250,6 +250,9 @@ fi %changelog +* Sat Jul 29 2017 Mattia Verga - 4.0-4 +- Change FPC compiler options to fix debuginfo package build + * Thu Jul 27 2017 Fedora Release Engineering - 4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 37c0c74c1086192f4cb412524801701c9458824a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:32:57 +0000 Subject: [PATCH 38/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 0a7d925..fb6b40a 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -250,6 +250,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Sat Jul 29 2017 Mattia Verga - 4.0-4 - Change FPC compiler options to fix debuginfo package build From fc479ca26f992254bacb1fcb087a9445ecfcf396 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:27:40 +0100 Subject: [PATCH 39/86] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- skychart.spec | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/skychart.spec b/skychart.spec index fb6b40a..5a46d2c 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -236,20 +236,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/skychart/cat/sh2 %{_datadir}/appdata/%{name}-data-dso.metainfo.xml -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %changelog +* Thu Jan 18 2018 Igor Gnatenko - 4.0-6 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From c8504f470e3b8384260246d8c59ec90eac06aa29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:57:55 +0000 Subject: [PATCH 40/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 5a46d2c..bc265f4 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -237,6 +237,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/appdata/%{name}-data-dso.metainfo.xml %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 4.0-6 - Remove obsolete scriptlets From b4da629847c135b4cf870dcc9440710f208f4bce Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 25 Feb 2018 10:58:43 +0100 Subject: [PATCH 41/86] Rebuild for FPC 3.0.4 / Lazarus 1.8.0 --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index bc265f4..48ea59d 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -237,6 +237,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/appdata/%{name}-data-dso.metainfo.xml %changelog +* Sun Feb 25 2018 Mattia Verga - 4.0-8 +- Rebuild for fpc 3.0.4 and lazarus 1.8 + * Fri Feb 09 2018 Fedora Release Engineering - 4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 13a899e26e9af931d827e874dd357152770ea72d Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 25 Feb 2018 14:44:24 +0100 Subject: [PATCH 42/86] Upgrade to development version to fix build failures. --- .gitignore | 1 + skychart-3.11-satmessage.patch | 30 --- skychart-4.0-libssl.patch | 173 ------------------ ...-strip.patch => skychart-4.1-nostrip.patch | 7 +- skychart-4.1-satmessage.patch | 41 +++++ ...tdata.patch => skychart-4.1-wgetdata.patch | 0 skychart.spec | 31 ++-- sources | 2 +- 8 files changed, 60 insertions(+), 225 deletions(-) delete mode 100644 skychart-3.11-satmessage.patch delete mode 100644 skychart-4.0-libssl.patch rename skychart-3.11-strip.patch => skychart-4.1-nostrip.patch (76%) create mode 100644 skychart-4.1-satmessage.patch rename skychart-wgetdata.patch => skychart-4.1-wgetdata.patch (100%) diff --git a/.gitignore b/.gitignore index 2c0dbf3..834c5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /catalog_sh2.tgz /skychart-3.11-3549-src-nopatents.tar.xz /skychart-4.0-3575-src-nopatents.tar.xz +/skychart-4.1-3730-src-nopatents.tar.xz diff --git a/skychart-3.11-satmessage.patch b/skychart-3.11-satmessage.patch deleted file mode 100644 index cecee13..0000000 --- a/skychart-3.11-satmessage.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/skychart/u_satellite.pas 2017-02-20 18:48:05.000000000 +0100 -+++ b/skychart/u_satellite.pas 2017-02-27 19:15:57.825178736 +0100 -@@ -86,26 +86,8 @@ - end; - - function CheckWine: boolean; --var cmd,buf,msg: string; -- i,j: integer; -- r: Tstringlist; - begin --r:=Tstringlist.Create; --cmd:='wine --version'; --i:=execprocess(cmd,r); --result:=(i=0); --if not result then begin -- if r.Count>0 then begin -- buf:=''; -- for j:=0 to r.Count-1 do buf:=buf+r[j]; -- end else buf:=''; -- msg:=rsPleaseInstWine; -- {$ifdef linux} -- msg:=msg+crlf+rsIfItIsNotIns+crlf+'apt-get install wine'+crlf+'yum install wine'; -- {$endif} -- ShowMessage(msg+crlf+'wine return: '+buf); --end; --r.free; -+ShowMessage('Artificial satellites calculation has been removed due to Fedora policies.'+crlf+'If you need it, please uninstall Skychart provided by Fedora repositories and download Skychart rpms from the author site.'); - end; - - function CheckDosbox: boolean; diff --git a/skychart-4.0-libssl.patch b/skychart-4.0-libssl.patch deleted file mode 100644 index e8ac073..0000000 --- a/skychart-4.0-libssl.patch +++ /dev/null @@ -1,173 +0,0 @@ -diff -U 3 -dHrN -- a/skychart/component/synapse/source/lib/blcksock.pas b/skychart/component/synapse/source/lib/blcksock.pas ---- a/skychart/component/synapse/source/lib/blcksock.pas 2017-04-12 09:21:36.872249313 +0200 -+++ b/skychart/component/synapse/source/lib/blcksock.pas 2017-04-12 09:21:58.686247010 +0200 -@@ -240,7 +240,7 @@ - {:Specify requested SSL/TLS version for secure connection.} - TSSLType = ( - LT_all, -- LT_SSLv2, -+ LT_SSLv23, - LT_SSLv3, - LT_TLSv1, - LT_TLSv1_1, -diff -U 3 -dHrN -- a/skychart/component/synapse/source/lib/ssl_openssl_lib.pas b/skychart/component/synapse/source/lib/ssl_openssl_lib.pas ---- a/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2017-03-05 10:27:48.000000000 +0100 -+++ b/skychart/component/synapse/source/lib/ssl_openssl_lib.pas 2017-04-12 09:16:06.067282537 +0200 -@@ -125,8 +125,8 @@ - DLLUtilName: string = 'crypto.dll'; - {$ENDIF OS2GCC} - {$ELSE OS2} -- DLLSSLName: string = 'libssl.so'; -- DLLUtilName: string = 'libcrypto.so'; -+ DLLSSLName: string = 'libssl.so.1.1'; -+ DLLUtilName: string = 'libcrypto.so.1.1'; - {$ENDIF OS2} - {$ENDIF} - {$ELSE} -@@ -283,11 +283,6 @@ - - [DllImport(DLLSSLName, CharSet = CharSet.Ansi, - SetLastError = False, CallingConvention= CallingConvention.cdecl, -- EntryPoint = 'SSLv2_method')] -- function SslMethodV2 : PSSL_METHOD; external; -- -- [DllImport(DLLSSLName, CharSet = CharSet.Ansi, -- SetLastError = False, CallingConvention= CallingConvention.cdecl, - EntryPoint = 'SSLv3_method')] - function SslMethodV3 : PSSL_METHOD; external; - -@@ -313,6 +308,11 @@ - - [DllImport(DLLSSLName, CharSet = CharSet.Ansi, - SetLastError = False, CallingConvention= CallingConvention.cdecl, -+ EntryPoint = 'TLS_method')] -+ function SslMethodTLS : PSSL_METHOD; external; -+ -+ [DllImport(DLLSSLName, CharSet = CharSet.Ansi, -+ SetLastError = False, CallingConvention= CallingConvention.cdecl, - EntryPoint = 'SSL_CTX_use_PrivateKey')] - function SslCtxUsePrivateKey(ctx: PSSL_CTX; pkey: SslPtr):Integer; external; - -@@ -713,12 +713,12 @@ - function SslCtxNew(meth: PSSL_METHOD):PSSL_CTX; - procedure SslCtxFree(arg0: PSSL_CTX); - function SslSetFd(s: PSSL; fd: Integer):Integer; -- function SslMethodV2:PSSL_METHOD; - function SslMethodV3:PSSL_METHOD; - function SslMethodTLSV1:PSSL_METHOD; - function SslMethodTLSV11:PSSL_METHOD; - function SslMethodTLSV12:PSSL_METHOD; - function SslMethodV23:PSSL_METHOD; -+ function SslMethodTLS:PSSL_METHOD; - function SslCtxUsePrivateKey(ctx: PSSL_CTX; pkey: SslPtr):Integer; - function SslCtxUsePrivateKeyASN1(pk: integer; ctx: PSSL_CTX; d: AnsiString; len: integer):Integer; - // function SslCtxUsePrivateKeyFile(ctx: PSSL_CTX; const _file: PChar; _type: Integer):Integer; -@@ -841,12 +841,12 @@ - TSslCtxNew = function(meth: PSSL_METHOD):PSSL_CTX; cdecl; - TSslCtxFree = procedure(arg0: PSSL_CTX); cdecl; - TSslSetFd = function(s: PSSL; fd: Integer):Integer; cdecl; -- TSslMethodV2 = function:PSSL_METHOD; cdecl; - TSslMethodV3 = function:PSSL_METHOD; cdecl; - TSslMethodTLSV1 = function:PSSL_METHOD; cdecl; - TSslMethodTLSV11 = function:PSSL_METHOD; cdecl; - TSslMethodTLSV12 = function:PSSL_METHOD; cdecl; - TSslMethodV23 = function:PSSL_METHOD; cdecl; -+ TSslMethodTLS = function:PSSL_METHOD; cdecl; - TSslCtxUsePrivateKey = function(ctx: PSSL_CTX; pkey: sslptr):Integer; cdecl; - TSslCtxUsePrivateKeyASN1 = function(pk: integer; ctx: PSSL_CTX; d: sslptr; len: integer):Integer; cdecl; - TSslCtxUsePrivateKeyFile = function(ctx: PSSL_CTX; const _file: PAnsiChar; _type: Integer):Integer; cdecl; -@@ -948,12 +948,12 @@ - _SslCtxNew: TSslCtxNew = nil; - _SslCtxFree: TSslCtxFree = nil; - _SslSetFd: TSslSetFd = nil; -- _SslMethodV2: TSslMethodV2 = nil; - _SslMethodV3: TSslMethodV3 = nil; - _SslMethodTLSV1: TSslMethodTLSV1 = nil; - _SslMethodTLSV11: TSslMethodTLSV11 = nil; - _SslMethodTLSV12: TSslMethodTLSV12 = nil; - _SslMethodV23: TSslMethodV23 = nil; -+ _SslMethodTLS: TSslMethodTLS = nil; - _SslCtxUsePrivateKey: TSslCtxUsePrivateKey = nil; - _SslCtxUsePrivateKeyASN1: TSslCtxUsePrivateKeyASN1 = nil; - _SslCtxUsePrivateKeyFile: TSslCtxUsePrivateKeyFile = nil; -@@ -1106,14 +1106,6 @@ - Result := 0; - end; - --function SslMethodV2:PSSL_METHOD; --begin -- if InitSSLInterface and Assigned(_SslMethodV2) then -- Result := _SslMethodV2 -- else -- Result := nil; --end; -- - function SslMethodV3:PSSL_METHOD; - begin - if InitSSLInterface and Assigned(_SslMethodV3) then -@@ -1154,6 +1146,14 @@ - Result := nil; - end; - -+function SslMethodTLS:PSSL_METHOD; -+begin -+ if InitSSLInterface and Assigned(_SslMethodTLS) then -+ Result := _SslMethodTLS -+ else -+ Result := nil; -+end; -+ - function SslCtxUsePrivateKey(ctx: PSSL_CTX; pkey: SslPtr):Integer; - begin - if InitSSLInterface and Assigned(_SslCtxUsePrivateKey) then -@@ -1901,12 +1901,12 @@ - _SslCtxNew := GetProcAddr(SSLLibHandle, 'SSL_CTX_new'); - _SslCtxFree := GetProcAddr(SSLLibHandle, 'SSL_CTX_free'); - _SslSetFd := GetProcAddr(SSLLibHandle, 'SSL_set_fd'); -- _SslMethodV2 := GetProcAddr(SSLLibHandle, 'SSLv2_method'); - _SslMethodV3 := GetProcAddr(SSLLibHandle, 'SSLv3_method'); - _SslMethodTLSV1 := GetProcAddr(SSLLibHandle, 'TLSv1_method'); - _SslMethodTLSV11 := GetProcAddr(SSLLibHandle, 'TLSv1_1_method'); - _SslMethodTLSV12 := GetProcAddr(SSLLibHandle, 'TLSv1_2_method'); - _SslMethodV23 := GetProcAddr(SSLLibHandle, 'SSLv23_method'); -+ _SslMethodTLS := GetProcAddr(SSLLibHandle, 'TLS_method'); - _SslCtxUsePrivateKey := GetProcAddr(SSLLibHandle, 'SSL_CTX_use_PrivateKey'); - _SslCtxUsePrivateKeyASN1 := GetProcAddr(SSLLibHandle, 'SSL_CTX_use_PrivateKey_ASN1'); - //use SSL_CTX_use_RSAPrivateKey_file instead SSL_CTX_use_PrivateKey_file, -@@ -2098,12 +2098,12 @@ - _SslCtxNew := nil; - _SslCtxFree := nil; - _SslSetFd := nil; -- _SslMethodV2 := nil; - _SslMethodV3 := nil; - _SslMethodTLSV1 := nil; - _SslMethodTLSV11 := nil; - _SslMethodTLSV12 := nil; - _SslMethodV23 := nil; -+ _SslMethodTLS := nil; - _SslCtxUsePrivateKey := nil; - _SslCtxUsePrivateKeyASN1 := nil; - _SslCtxUsePrivateKeyFile := nil; -diff -U 3 -dHrN -- a/skychart/component/synapse/source/lib/ssl_openssl.pas b/skychart/component/synapse/source/lib/ssl_openssl.pas ---- a/skychart/component/synapse/source/lib/ssl_openssl.pas 2015-07-31 10:48:21.000000000 +0200 -+++ b/skychart/component/synapse/source/lib/ssl_openssl.pas 2017-04-12 09:07:20.000000000 +0200 -@@ -420,8 +420,8 @@ - FLastError := 0; - Fctx := nil; - case FSSLType of -- LT_SSLv2: -- Fctx := SslCtxNew(SslMethodV2); -+ LT_SSLv23: -+ Fctx := SslCtxNew(SslMethodV23); - LT_SSLv3: - Fctx := SslCtxNew(SslMethodV3); - LT_TLSv1: -@@ -431,7 +431,7 @@ - LT_TLSv1_2: - Fctx := SslCtxNew(SslMethodTLSV12); - LT_all: -- Fctx := SslCtxNew(SslMethodV23); -+ Fctx := SslCtxNew(SslMethodTLS); - else - Exit; - end; diff --git a/skychart-3.11-strip.patch b/skychart-4.1-nostrip.patch similarity index 76% rename from skychart-3.11-strip.patch rename to skychart-4.1-nostrip.patch index e5aac7e..572b3f5 100644 --- a/skychart-3.11-strip.patch +++ b/skychart-4.1-nostrip.patch @@ -1,5 +1,6 @@ ---- a/install.sh 2015-12-18 11:06:30.000000000 +0100 -+++ b/install.sh 2016-01-09 19:06:49.424399488 +0100 +diff -U 3 -dHrN -- a/install.sh b/install.sh +--- a/install.sh 2017-10-03 11:01:35.000000000 +0200 ++++ b/install.sh 2017-10-10 17:54:25.410030788 +0200 @@ -25,10 +25,10 @@ install -m 755 -d $destdir/share/icons/hicolor/scalable install -m 755 -d $destdir/share/icons/hicolor/scalable/apps @@ -13,5 +14,5 @@ +install -v -m 755 varobs/varobs $destdir/bin/varobs +install -v -m 755 varobs/varobs_lpv_bulletin $destdir/bin/varobs_lpv_bulletin install -v -m 644 system_integration/Linux/share/applications/skychart.desktop $destdir/share/applications/skychart.desktop - install -v -m 644 system_integration/Linux/share/appdata/skychart.appdata.xml $destdir/share/appdata/skychart.appdata.xml + install -v -m 644 system_integration/Linux/share/metainfo/skychart.appdata.xml $destdir/share/metainfo/skychart.appdata.xml install -v -m 644 system_integration/Linux/share/doc/skychart/changelog $destdir/share/doc/skychart/changelog diff --git a/skychart-4.1-satmessage.patch b/skychart-4.1-satmessage.patch new file mode 100644 index 0000000..a07454d --- /dev/null +++ b/skychart-4.1-satmessage.patch @@ -0,0 +1,41 @@ +diff -U 3 -dHrN -- a/skychart/u_satellite.pas b/skychart/u_satellite.pas +--- a/skychart/u_satellite.pas 2017-07-21 15:35:21.000000000 +0200 ++++ b/skychart/u_satellite.pas 2017-10-02 19:18:40.648161937 +0200 +@@ -110,36 +110,8 @@ + end; + + function CheckWine: boolean; +-var +- cmd, buf, msg: string; +- i, j: integer; +- r: TStringList; + begin +- r := TStringList.Create; +- cmd := 'wine --version'; +- i := execprocess(cmd, r); +- Result := (i = 0); +- +- if not Result then +- begin +- +- if r.Count > 0 then +- begin +- buf := ''; +- for j := 0 to r.Count - 1 do +- buf := buf + r[j]; +- end +- else +- buf := ''; +- +- msg := rsPleaseInstWine; +- {$ifdef linux} +- msg := msg + crlf + rsIfItIsNotIns + crlf + 'apt-get install wine' + +- crlf + 'yum install wine'; +- {$endif} +- ShowMessage(msg + crlf + 'wine return: ' + buf); +- end; +- r.Free; ++ShowMessage('Artificial satellites calculation has been removed due to Fedora policies.'+crlf+'If you need it, please uninstall Skychart provided by Fedora repositories and download Skychart rpms from the author site.'); + end; + + function CheckDosbox: boolean; diff --git a/skychart-wgetdata.patch b/skychart-4.1-wgetdata.patch similarity index 100% rename from skychart-wgetdata.patch rename to skychart-4.1-wgetdata.patch diff --git a/skychart.spec b/skychart.spec index 48ea59d..7a0be65 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 3575 +%global svnversion 3730 Name: skychart -Version: 4.0 -Release: 8%{?dist} +Version: 4.1 +Release: 1.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.0-3575 +# ./generate-tarball.sh 4.1-3730 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -34,27 +34,21 @@ Source12: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_s # Avoid stripping debuginfo from executables # This is Fedora specific and not reported upstream -Patch1: skychart-3.11-strip.patch +Patch1: skychart-4.1-nostrip.patch # Disable wget in install script # This is Fedora specific and not reported upstream -Patch2: skychart-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 -Patch3: skychart-3.11-satmessage.patch +Patch3: skychart-4.1-satmessage.patch # Disable software update menu item # This feature was asked upstream specifically for Fedora Patch4: skychart-3.11-noupdate.patch -# Fix libssl and libcrypto links -# http://www.ap-i.net/mantis/view.php?id=1668 -# Fix for OpenSSL 1.1 -# http://www.ap-i.net/mantis/view.php?id=1702 -Patch5: skychart-4.0-libssl.patch - ExclusiveArch: %{fpc_arches} # fpc is available on ppc64, but lazarus has some limitations that @@ -134,10 +128,8 @@ Barnard Catalogue of Dark Nebulae; Sharpless Catalog. %patch4 -p1 -%patch5 -p1 - # Fix executable bit set on sources -find skychart -type f -print0 |xargs -0 chmod -x +find skychart -type f -print0 | xargs -0 chmod -x # Put additional catalogs files where where required for installation %{__cp} -p %SOURCE2 ./BaseData @@ -190,7 +182,7 @@ make install install_cat2 PREFIX=%{buildroot}%{_prefix} desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop # Appdata file check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml %files @@ -199,7 +191,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %doc %{_datadir}/doc/skychart/copyright %{_bindir}/* %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.appdata.xml %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/*/*/*/%{name}.png %{_datadir}/icons/*/*/*/%{name}.svg @@ -237,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/appdata/%{name}-data-dso.metainfo.xml %changelog +* Sun Feb 25 2018 Mattia Verga - 4.1-1.3730svn +- Upgrade to development version to fix build failures + * Sun Feb 25 2018 Mattia Verga - 4.0-8 - Rebuild for fpc 3.0.4 and lazarus 1.8 diff --git a/sources b/sources index 297082d..ff820be 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.0-3575-src-nopatents.tar.xz) = 8c8ce72c177f804b2a2a42255e91303954b8a40cc4995330018add67f073cfff29da2c3ad35c0ba3dec275283a75db5a831365875ae4607fad1ff8611a3a763c +SHA512 (skychart-4.1-3730-src-nopatents.tar.xz) = 35f735dcca03309c5fc2da3f3f49c1f125a0bcb77f84f7701b6b04c8e22202b00c6d5de852c75121a5ce8176a1fdc7bd3610514e0d202b316124ef46593f4681 From 1f0a341a4990ac430b6c285ee12414d0e48371fb Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 25 Feb 2018 15:13:16 +0100 Subject: [PATCH 43/86] Fix appdata files location --- skychart.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skychart.spec b/skychart.spec index 7a0be65..02cfe9a 100644 --- a/skychart.spec +++ b/skychart.spec @@ -216,7 +216,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/skychart/cat/tycho2 %{_datadir}/skychart/cat/wds %{_datadir}/skychart/cat/bsc5 -%{_datadir}/appdata/%{name}-data-stars.metainfo.xml +%{_datadir}/metainfo/%{name}-data-stars.metainfo.xml %files data-dso %{_datadir}/skychart/cat/leda @@ -226,7 +226,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/skychart/cat/gpn %{_datadir}/skychart/cat/barnard %{_datadir}/skychart/cat/sh2 -%{_datadir}/appdata/%{name}-data-dso.metainfo.xml +%{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog * Sun Feb 25 2018 Mattia Verga - 4.1-1.3730svn From 54c240166ada4a9d31436faea1edc9337c8b8160 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:15:58 +0000 Subject: [PATCH 44/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 02cfe9a..36047a3 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.1 -Release: 1.%{svnversion}svn%{?dist} +Release: 2.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.1-2.3730svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 25 2018 Mattia Verga - 4.1-1.3730svn - Upgrade to development version to fix build failures From 8cb5af07f6ce9e21f60e31253951d0950dba3975 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 3 Nov 2018 13:35:48 +0100 Subject: [PATCH 45/86] Update svn version. --- .gitignore | 1 + skychart.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 834c5f0..68da989 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /skychart-3.11-3549-src-nopatents.tar.xz /skychart-4.0-3575-src-nopatents.tar.xz /skychart-4.1-3730-src-nopatents.tar.xz +/skychart-4.1.1-3792-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index 36047a3..3a22eb5 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 3730 +%global svnversion 3792 Name: skychart -Version: 4.1 -Release: 2.%{svnversion}svn%{?dist} +Version: 4.1.1 +Release: 1.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.1-3730 +# ./generate-tarball.sh 4.1.1-3792 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Sat Nov 03 2018 Mattia Verga - 4.1.1-1.3792svn +- Update svn version + * Sat Jul 14 2018 Fedora Release Engineering - 4.1-2.3730svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index ff820be..c95fba2 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.1-3730-src-nopatents.tar.xz) = 35f735dcca03309c5fc2da3f3f49c1f125a0bcb77f84f7701b6b04c8e22202b00c6d5de852c75121a5ce8176a1fdc7bd3610514e0d202b316124ef46593f4681 +SHA512 (skychart-4.1.1-3792-src-nopatents.tar.xz) = 23e7701b8b9272e3d130136f855121976568ef5fe3bbce73f87f142a97ff356da943e8bc9ec42fc08282c398e158f42f37a1f312fb9ed4093c17c310ad635db2 From e427b251954c0d85201ed7e992bc663c31cf16ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:35:52 +0000 Subject: [PATCH 46/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 3a22eb5..947396f 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.1.1 -Release: 1.%{svnversion}svn%{?dist} +Release: 2.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 4.1.1-2.3792svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Nov 03 2018 Mattia Verga - 4.1.1-1.3792svn - Update svn version From e6e6332bd33e05a28c6248f36e6e6a5f8e5fd06b Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 27 Apr 2019 14:48:20 +0200 Subject: [PATCH 47/86] Update to svn commit #4925 --- .gitignore | 1 + skychart.spec | 56 +++++++++++++++++++++++++-------------------------- sources | 2 +- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 68da989..1253622 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /skychart-4.0-3575-src-nopatents.tar.xz /skychart-4.1-3730-src-nopatents.tar.xz /skychart-4.1.1-3792-src-nopatents.tar.xz +/skychart-4.1.1-3925-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index 947396f..028485f 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,11 +1,11 @@ -%global svnversion 3792 +%global svnversion 3925 -Name: skychart -Version: 4.1.1 -Release: 2.%{svnversion}svn%{?dist} -Summary: Planetarium software for the advanced amateur astronomer -License: GPLv2+ -URL: http://www.ap-i.net/skychart/ +Name: skychart +Version: 4.1.1 +Release: 3.%{svnversion}svn%{?dist} +Summary: Planetarium software for the advanced amateur astronomer +License: GPLv2+ +URL: http://www.ap-i.net/skychart/ # Upstream sources are modified to: # - Remove pre-built software (iridflare.exe, quicksat.exe, dll files) # - Remove unneeded Windows and MacOS stuff @@ -14,46 +14,43 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.1.1-3792 -Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz -Source1: generate-tarball.sh +# ./generate-tarball.sh 4.1.1-3925 +Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz +Source1: generate-tarball.sh # Source data for skychart-data-stars -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 +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 -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 +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 -Patch1: skychart-4.1-nostrip.patch +Patch1: skychart-4.1-nostrip.patch # Disable wget in install script # This is Fedora specific and not reported upstream -Patch2: 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 -Patch3: skychart-4.1-satmessage.patch +Patch3: skychart-4.1-satmessage.patch # Disable software update menu item # This feature was asked upstream specifically for Fedora -Patch4: skychart-3.11-noupdate.patch +Patch4: skychart-3.11-noupdate.patch ExclusiveArch: %{fpc_arches} -# fpc is available on ppc64, but lazarus has some limitations that -# prevents this package to build -ExcludeArch: ppc64 BuildRequires: fpc @@ -229,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Sat Apr 27 2019 Mattia Verga - 4.1.1-3.3925svn +- Update svn version + * Sat Feb 02 2019 Fedora Release Engineering - 4.1.1-2.3792svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index c95fba2..28742d9 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.1.1-3792-src-nopatents.tar.xz) = 23e7701b8b9272e3d130136f855121976568ef5fe3bbce73f87f142a97ff356da943e8bc9ec42fc08282c398e158f42f37a1f312fb9ed4093c17c310ad635db2 +SHA512 (skychart-4.1.1-3925-src-nopatents.tar.xz) = c8f1115be50a4259345bb5677093bdc767e0838c243b09e4637cf8c40cc56d236361bbb3d2f2304bf124cf8f7bd1709c5257b4b9bfdc3be4d3e0b58d9fc4f399 From 35f3141630ebb234636f168db35abcfd4f8535d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:30:05 +0000 Subject: [PATCH 48/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 028485f..f3b8b00 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.1.1 -Release: 3.%{svnversion}svn%{?dist} +Release: 4.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 4.1.1-4.3925svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Apr 27 2019 Mattia Verga - 4.1.1-3.3925svn - Update svn version From 6f3f29e179c1a71898caf09381f785d51dfef0ae Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 29 Aug 2019 08:41:51 +0200 Subject: [PATCH 49/86] Update svn version to 4000 --- .gitignore | 1 + skychart.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1253622..00f647b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /skychart-4.1-3730-src-nopatents.tar.xz /skychart-4.1.1-3792-src-nopatents.tar.xz /skychart-4.1.1-3925-src-nopatents.tar.xz +/skychart-4.1.1-4000-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index f3b8b00..21f38af 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 3925 +%global svnversion 4000 Name: skychart Version: 4.1.1 -Release: 4.%{svnversion}svn%{?dist} +Release: 5.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.1.1-3925 +# ./generate-tarball.sh 4.1.1-4000 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Thu Aug 29 2019 Mattia Verga - 4.1.1-5.4000svn +- Update svn version + * Fri Jul 26 2019 Fedora Release Engineering - 4.1.1-4.3925svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 28742d9..0b04590 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.1.1-3925-src-nopatents.tar.xz) = c8f1115be50a4259345bb5677093bdc767e0838c243b09e4637cf8c40cc56d236361bbb3d2f2304bf124cf8f7bd1709c5257b4b9bfdc3be4d3e0b58d9fc4f399 +SHA512 (skychart-4.1.1-4000-src-nopatents.tar.xz) = b12ae55224c94bb6c12b5c4099effcfeef1c949c92c66cea0eff53ba906f8d81e7ed36c994330f57750dbaf628248f0488ff6fc33e6bb348dd05490c6269a093 From b8a6e65b14ab7e73de7c3b06d04064b97f6f7aec Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 18 Oct 2019 09:51:27 +0200 Subject: [PATCH 50/86] Release 4.2 stable --- .gitignore | 1 + ...e.patch => skychart-4.2-noupdatemenu.patch | 7 +- skychart.spec | 138 +----------------- sources | 2 +- 4 files changed, 14 insertions(+), 134 deletions(-) rename skychart-3.11-noupdate.patch => skychart-4.2-noupdatemenu.patch (82%) diff --git a/.gitignore b/.gitignore index 00f647b..d7e0f1c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /skychart-4.1.1-3792-src-nopatents.tar.xz /skychart-4.1.1-3925-src-nopatents.tar.xz /skychart-4.1.1-4000-src-nopatents.tar.xz +/skychart-4.2-4046-src-nopatents.tar.xz diff --git a/skychart-3.11-noupdate.patch b/skychart-4.2-noupdatemenu.patch similarity index 82% rename from skychart-3.11-noupdate.patch rename to skychart-4.2-noupdatemenu.patch index 65fa87b..9546719 100644 --- a/skychart-3.11-noupdate.patch +++ b/skychart-4.2-noupdatemenu.patch @@ -1,11 +1,12 @@ ---- a/skychart/Makefile.in 2016-02-14 11:58:11.000000000 +0100 -+++ b/skychart/Makefile.in 2016-02-15 18:59:17.956482359 +0100 +diff -U 3 -dHrN -- a/skychart/Makefile.in b/skychart/Makefile.in +--- a/skychart/Makefile.in 2019-10-13 14:25:41.000000000 +0200 ++++ b/skychart/Makefile.in 2019-10-14 18:03:35.121425627 +0200 @@ -17,7 +17,7 @@ [compiler] unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) includedir=./ -options= $(opt_target) $(fpcopts) -CF64 -dWithUpdateMenu -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l +options= $(opt_target) $(fpcopts) -CF64 -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l - unitdir=library/catalog/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/jdcalendar/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/bgrabitmap/lib/$(CPU_TARGET)-$(OS_TARGET) component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/mrecsort/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/multiframe/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/radec/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/zoomimage/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/indiclient/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vo/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vosamp/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/xmlparser/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ + unitdir=library/catalog/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/jdcalendar/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/bgrabitmap/lib/$(CPU_TARGET)-$(OS_TARGET) component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/mrecsort/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/multiframe/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/radec/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/zoomimage/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/indiclient/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vo/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vosamp/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/xmlparser/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ [clean] diff --git a/skychart.spec b/skychart.spec index 21f38af..9d1212b 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 4000 +%global svnversion 4046 Name: skychart -Version: 4.1.1 -Release: 5.%{svnversion}svn%{?dist} +Version: 4.2 +Release: 1.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.1.1-4000 +# ./generate-tarball.sh 4.2-4046 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -47,7 +47,7 @@ Patch3: skychart-4.1-satmessage.patch # Disable software update menu item # This feature was asked upstream specifically for Fedora -Patch4: skychart-3.11-noupdate.patch +Patch4: skychart-4.2-noupdatemenu.patch ExclusiveArch: %{fpc_arches} @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Fri Oct 18 2019 Mattia Verga - 4.2-1.4046svn +- Release stable 4.2 + * Thu Aug 29 2019 Mattia Verga - 4.1.1-5.4000svn - Update svn version @@ -353,128 +356,3 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata * Thu Apr 03 2014 Mattia Verga - 3.10-1 - Update to 3.10 - -* Mon Aug 12 2013 Mattia Verga - 3.8-7 -- Manually create needed directories to fix arm and ppc builds - -* Mon Aug 12 2013 Mattia Verga - 3.8-6 -- Enable arm build -- Enable ppc and ppc64 build - -* Sun Aug 04 2013 Fedora Release Engineering - 3.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Aug 02 2013 Mattia Verga - 3.8-4 -- Use xz to compress source file instead of bzip - -* Thu May 16 2013 Mattia Verga - 3.8-3 -- Make available additional dso catalogs as subpackage -- Modify patch to disable wget in catalog installation scripts - -* Sun May 05 2013 Mattia Verga - 3.8-2 -- Make doc package platform independent -- Remove unneeded buildroot and files declarations -- Remove Group tag -- Make available additional star catalogs as subpackage - -* Sat Mar 16 2013 Mattia Verga - 3.8-1 -- Update to 3.8 -- Requires Lazarus >= 1.0.4 - -* Sun Mar 10 2013 Mattia Verga - 3.7-0.3.2268svn -- Exclude armv7hl architecture - -* Fri Feb 15 2013 Fedora Release Engineering - 3.7-0.2.2268svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Oct 06 2012 Mattia Verga - 3.7-0.1.2268svn -- Update to 3.7 testing version - -* Sat Jul 21 2012 Fedora Release Engineering - 3.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Apr 20 2012 Mattia Verga - 3.6-3 -- Rebuild with lazarus 0.9.30.4 fix bug #799711 -- Correct patch - -* Sat Mar 17 2012 Mattia Verga - 3.6-1 -- Update to 3.6 version -- Modify sources to remove iridflar.exe -- Remove patches merged upstream -- Make sure fpc >= 2.4.4 to avoid execstack errors -- Add scriptlets for icon cache -- Make sure lazarus >= 0.9.30.4 to work with F17 and higher - -* Sun Jan 22 2012 Mattia Verga - 3.4-4 -- Added wiki documentation as subpackage -- Fix old FSF address in license file -- Remove binary software quicksat.exe and IRIDFLAR.EXE -- Excluded ppc architecture, since lazarus < 0.9.30 - -* Sat Jan 21 2012 Mattia Verga - 3.4-3 -- Patch to make it compile with gcc 4.7 - -* Fri Jan 20 2012 Sergio Pascual - 3.4-2 -- Added missing source tarball -- Renamed patches - -* Thu Jan 19 2012 Sergio Pascual - 3.4-1 -- New upstream source -- New source with ephemeris - -* Sat Jan 14 2012 Fedora Release Engineering - 3.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue May 03 2011 Dan Horák - 3.2-5 -- no lazarus on s390(x) - -* Thu Apr 28 2011 Sergio Pascual - 3.2-4 -- Rebuilding with lazarus 0.9.30 - -* Wed Mar 09 2011 Sergio Pascual - 3.2-3 -- Patch from upstream to make skychart work with lazarus 0.9.28 - -* Wed Feb 16 2011 Sergio Pascual - 3.2-2 -- Missing patch added - -* Sat Feb 12 2011 Sergio Pascual - 3.2-1 -- New upstream source - -* Wed Feb 09 2011 Fedora Release Engineering - 3.0.1.6-5.20100724svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 13 2011 Sergio Pascual - 3.0.1.6-4.20100724svn -- Using d-f-validate instead od d-f-install (Fixes bz #662472) -- Changed RPM_BUILD_ROOT macro to lower case form - -* Sat Jul 24 2010 Lubomir Rintel (Fedora Astronomy) - 3.0.1.6-3.20100724svn -- Update to a later snapshot - -* Sun Jul 26 2009 Fedora Release Engineering - 3.0.1.6-2.20090408svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) - 3.0.1.6-1.20090408svn -- Update to post latest beta -- Drop the unzip patch -- Upstream did the datadir and xdg-open chage as well, drop patches - -* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) - 3.0.1.5-6.20081026svn -- Enable GTK2 UI - -* Fri Mar 27 2009 Lubomir Rintel (Fedora Astronomy) - 3.0.1.5-5.20081026svn -- Fix desktop entry categories - -* Wed Feb 25 2009 Fedora Release Engineering - 3.0.1.5-4.20081026svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Dec 01 2008 Lubomir Rintel (Fedora Astronomy) - 3.0.1.5-3.20081026svn -- Own /usr/share/skychart (#474037) - -* Thu Nov 06 2008 Lubomir Rintel (Fedora Astronomy) - 3.0.1.5-2.20081026svn -- Temporarily disable ppc64 build due to a compiler bug - -* Wed Oct 29 2008 Lubomir Rintel (Fedora Astronomy) - 3.0.1.5-1.20081026svn -- Rebase to later upstream, since we have more recent fpc and lazarus now - -* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) - 3.0.1.3-1.20071015svn -- Initial packaging attempt diff --git a/sources b/sources index 0b04590..dd18b2e 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.1.1-4000-src-nopatents.tar.xz) = b12ae55224c94bb6c12b5c4099effcfeef1c949c92c66cea0eff53ba906f8d81e7ed36c994330f57750dbaf628248f0488ff6fc33e6bb348dd05490c6269a093 +SHA512 (skychart-4.2-4046-src-nopatents.tar.xz) = 817aa99047f29e5911010fa5747bc5e3f28531e750bf96aa6fb0e3d8afb0788417a902b98d10e8c9bc7296697930c53a1ba401dc01d572c2f7de33dfc9983573 From 510e2b531a760a0713de32ff6efd61baf41f8e64 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 18 Oct 2019 11:17:24 +0200 Subject: [PATCH 51/86] Fix unowned directories --- skychart.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skychart.spec b/skychart.spec index 9d1212b..fe7e775 100644 --- a/skychart.spec +++ b/skychart.spec @@ -194,12 +194,14 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/icons/*/*/*/%{name}.svg %dir %{_datadir}/skychart %{_datadir}/skychart/data +%dir %{_datadir}/skychart/cat %{_datadir}/skychart/cat/DSoutlines %{_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 %{_datadir}/skychart/doc/releasenotes*.txt %{_datadir}/skychart/doc/varobs From 2423e1681b46bd88d6631f40236a3c2676713db8 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 18 Oct 2019 11:27:25 +0200 Subject: [PATCH 52/86] Add rpmlint whitelist --- skychart.rpmlintrc | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 skychart.rpmlintrc diff --git a/skychart.rpmlintrc b/skychart.rpmlintrc new file mode 100644 index 0000000..ba09904 --- /dev/null +++ b/skychart.rpmlintrc @@ -0,0 +1,5 @@ +# libpasastro is not a library +addFilter(r'explicit-lib-dependency libpasastro') + +# some catalog files are zero length, not an error +addFilter(r'zero-length %{_datadir}/skychart/cat/cat/.*/.*\.dat') From 977441fc3643f3bfbcf470ca5522b0fab8e2a0c9 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 26 Nov 2019 18:35:12 +0100 Subject: [PATCH 53/86] Update to stable 4.2.1 --- .gitignore | 1 + skychart.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d7e0f1c..a7d128e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /skychart-4.1.1-3925-src-nopatents.tar.xz /skychart-4.1.1-4000-src-nopatents.tar.xz /skychart-4.2-4046-src-nopatents.tar.xz +/skychart-4.2.1-4073-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index fe7e775..be035ba 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,7 +1,7 @@ -%global svnversion 4046 +%global svnversion 4073 Name: skychart -Version: 4.2 +Version: 4.2.1 Release: 1.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.2-4046 +# ./generate-tarball.sh 4.2.1-4073 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -228,6 +228,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Tue Nov 26 2019 Mattia Verga - 4.2.1-1.4073svn +- Update to stable 4.2.1 + * Fri Oct 18 2019 Mattia Verga - 4.2-1.4046svn - Release stable 4.2 diff --git a/sources b/sources index dd18b2e..001bb74 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.2-4046-src-nopatents.tar.xz) = 817aa99047f29e5911010fa5747bc5e3f28531e750bf96aa6fb0e3d8afb0788417a902b98d10e8c9bc7296697930c53a1ba401dc01d572c2f7de33dfc9983573 +SHA512 (skychart-4.2.1-4073-src-nopatents.tar.xz) = c498af5e4e265bfe204f736bbd0c5b24d499c03e92681b1933e842081c22f12fc7e80156338a8f99a754d777f841b42d420fddbb35e129c0ccfa96921324c2ed From 1eda79a111c5c88cb64b3163b15ef25d22a876d6 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 26 Nov 2019 18:07:53 +0000 Subject: [PATCH 54/86] Update skychart.rpmlintrc Correct regex for catalog files --- skychart.rpmlintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skychart.rpmlintrc b/skychart.rpmlintrc index ba09904..fcd5453 100644 --- a/skychart.rpmlintrc +++ b/skychart.rpmlintrc @@ -2,4 +2,4 @@ addFilter(r'explicit-lib-dependency libpasastro') # some catalog files are zero length, not an error -addFilter(r'zero-length %{_datadir}/skychart/cat/cat/.*/.*\.dat') +addFilter(r'zero-length %{_datadir}/skychart/cat/.*/.*\.dat') From 3a9ec30d4c13dd0e7a54400b4c4d72b5a52a0453 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:39:15 +0000 Subject: [PATCH 55/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index be035ba..650729f 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.2.1 -Release: 1.%{svnversion}svn%{?dist} +Release: 2.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -228,6 +228,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 4.2.1-2.4073svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 26 2019 Mattia Verga - 4.2.1-1.4073svn - Update to stable 4.2.1 From 52c3de496dad216122ca423ae44d5b8481487724 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 1 Feb 2020 11:52:18 +0100 Subject: [PATCH 56/86] Update to 4.3 svn --- .gitignore | 1 + skychart-4.1-satmessage.patch | 41 ----------------------------------- skychart.spec | 13 ++++++----- sources | 2 +- 4 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 skychart-4.1-satmessage.patch diff --git a/.gitignore b/.gitignore index a7d128e..bfa2fa9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /skychart-4.1.1-4000-src-nopatents.tar.xz /skychart-4.2-4046-src-nopatents.tar.xz /skychart-4.2.1-4073-src-nopatents.tar.xz +/skychart-4.3-4108-src-nopatents.tar.xz diff --git a/skychart-4.1-satmessage.patch b/skychart-4.1-satmessage.patch deleted file mode 100644 index a07454d..0000000 --- a/skychart-4.1-satmessage.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -U 3 -dHrN -- a/skychart/u_satellite.pas b/skychart/u_satellite.pas ---- a/skychart/u_satellite.pas 2017-07-21 15:35:21.000000000 +0200 -+++ b/skychart/u_satellite.pas 2017-10-02 19:18:40.648161937 +0200 -@@ -110,36 +110,8 @@ - end; - - function CheckWine: boolean; --var -- cmd, buf, msg: string; -- i, j: integer; -- r: TStringList; - begin -- r := TStringList.Create; -- cmd := 'wine --version'; -- i := execprocess(cmd, r); -- Result := (i = 0); -- -- if not Result then -- begin -- -- if r.Count > 0 then -- begin -- buf := ''; -- for j := 0 to r.Count - 1 do -- buf := buf + r[j]; -- end -- else -- buf := ''; -- -- msg := rsPleaseInstWine; -- {$ifdef linux} -- msg := msg + crlf + rsIfItIsNotIns + crlf + 'apt-get install wine' + -- crlf + 'yum install wine'; -- {$endif} -- ShowMessage(msg + crlf + 'wine return: ' + buf); -- end; -- r.Free; -+ShowMessage('Artificial satellites calculation has been removed due to Fedora policies.'+crlf+'If you need it, please uninstall Skychart provided by Fedora repositories and download Skychart rpms from the author site.'); - end; - - function CheckDosbox: boolean; diff --git a/skychart.spec b/skychart.spec index 650729f..c400b77 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 4073 +%global svnversion 4108 Name: skychart -Version: 4.2.1 -Release: 2.%{svnversion}svn%{?dist} +Version: 4.3 +Release: 1.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.2.1-4073 +# ./generate-tarball.sh 4.3-4108 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -43,7 +43,7 @@ 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 -Patch3: skychart-4.1-satmessage.patch +Patch3: skychart-4.3-satmessage.patch # Disable software update menu item # This feature was asked upstream specifically for Fedora @@ -228,6 +228,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Sat Feb 01 2020 Mattia Verga - 4.3-1.4108svn +- Update to 4.3 svn + * Thu Jan 30 2020 Fedora Release Engineering - 4.2.1-2.4073svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 001bb74..996e714 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.2.1-4073-src-nopatents.tar.xz) = c498af5e4e265bfe204f736bbd0c5b24d499c03e92681b1933e842081c22f12fc7e80156338a8f99a754d777f841b42d420fddbb35e129c0ccfa96921324c2ed +SHA512 (skychart-4.3-4108-src-nopatents.tar.xz) = ebaaac53fe5c0573e4d909592924d09c484ae9bd6f62d51aebfeba96ae1d4badd4854e83ea54ec9aed4c6098a86481372042e5859fe4ddb1f99c64b74d39f10c From 30875b4ef0c3e46cab73ad5f1f88fe92c64e4ba1 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 1 Feb 2020 11:52:49 +0100 Subject: [PATCH 57/86] Add patch file --- skychart-4.3-satmessage.patch | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 skychart-4.3-satmessage.patch diff --git a/skychart-4.3-satmessage.patch b/skychart-4.3-satmessage.patch new file mode 100644 index 0000000..b3874cb --- /dev/null +++ b/skychart-4.3-satmessage.patch @@ -0,0 +1,41 @@ +diff -U 3 -dHrN -- a/skychart/u_satellite.pas b/skychart/u_satellite.pas +--- a/skychart/u_satellite.pas 2020-01-26 16:24:19.000000000 +0100 ++++ b/skychart/u_satellite.pas 2020-02-01 11:46:01.224703002 +0100 +@@ -100,36 +100,8 @@ + end; + + function CheckWine: boolean; +-var +- cmd, buf, msg: string; +- i, j: integer; +- r: TStringList; + begin +- r := TStringList.Create; +- cmd := 'wine --version'; +- i := execprocess(cmd, r); +- Result := (i = 0); +- +- if not Result then +- begin +- +- if r.Count > 0 then +- begin +- buf := ''; +- for j := 0 to r.Count - 1 do +- buf := buf + r[j]; +- end +- else +- buf := ''; +- +- msg := rsPleaseInstWine; +- {$ifdef linux} +- msg := msg + crlf + rsIfItIsNotIns + crlf + 'apt-get install wine' + +- crlf + 'yum install wine'; +- {$endif} +- ShowMessage(msg + crlf + 'wine return: ' + buf); +- end; +- r.Free; ++ ShowMessage('Artificial satellites calculation has been removed due to Fedora policies.'+crlf+'If you need it, please uninstall Skychart provided by Fedora repositories and download Skychart rpms from the author site.'); + end; + + procedure SatelliteList(y, m, startd, endd, maglimit, tle, tmpdir, From e9db6968d709b3225d7808fea8e35cfb2806974e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 8 Feb 2020 18:04:15 +0100 Subject: [PATCH 58/86] ExcludeArch ppc64le due to compilation errors --- skychart.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index c400b77..37bb260 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.3 -Release: 1.%{svnversion}svn%{?dist} +Release: 2.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -51,6 +51,7 @@ Patch4: skychart-4.2-noupdatemenu.patch ExclusiveArch: %{fpc_arches} +ExcludeArch: ppc64le BuildRequires: fpc @@ -228,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Sat Feb 08 2020 Mattia Verga - 4.3-2.4108svn +- ExcludeArch ppc64le due to compilation errors + * Sat Feb 01 2020 Mattia Verga - 4.3-1.4108svn - Update to 4.3 svn From e4fe302eb21fe70dee7f09e1bc2c7761d7b364fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:55:51 +0000 Subject: [PATCH 59/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 37bb260..5138ea6 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.3 -Release: 2.%{svnversion}svn%{?dist} +Release: 3.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.3-3.4108svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Feb 08 2020 Mattia Verga - 4.3-2.4108svn - ExcludeArch ppc64le due to compilation errors From 199e7c2df793568c5519b7d6a223b18405c02a8c Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 15 Dec 2020 15:26:24 +0100 Subject: [PATCH 60/86] Update svn version --- .gitignore | 1 + skychart.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bfa2fa9..2d72679 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /skychart-4.2-4046-src-nopatents.tar.xz /skychart-4.2.1-4073-src-nopatents.tar.xz /skychart-4.3-4108-src-nopatents.tar.xz +/skychart-4.3-4238-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index 5138ea6..499f9bb 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 4108 +%global svnversion 4238 Name: skychart Version: 4.3 -Release: 3.%{svnversion}svn%{?dist} +Release: 4.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.3-4108 +# ./generate-tarball.sh 4.3-4238 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -68,6 +68,8 @@ Requires: xdg-utils Requires: xplanet Recommends: openssl-libs +Recommends: calceph-libs + %description This program enables you to draw sky charts, making use of the data in 16 @@ -229,6 +231,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Tue Dec 15 2020 Mattia Verga - 4.3-4.4238svn +- Update svn version + * Wed Jul 29 2020 Fedora Release Engineering - 4.3-3.4108svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 996e714..44886dd 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.3-4108-src-nopatents.tar.xz) = ebaaac53fe5c0573e4d909592924d09c484ae9bd6f62d51aebfeba96ae1d4badd4854e83ea54ec9aed4c6098a86481372042e5859fe4ddb1f99c64b74d39f10c +SHA512 (skychart-4.3-4238-src-nopatents.tar.xz) = 54265a6fb4eb929d904f1dbce5933a0bf1faff6eb45b722de1d2ea9e52542982659cfc4e9a6cc01057cfeed1254460f7e60c9a4337e9980bd9b13b307d69c924 From dba62ee5d844ab801d0739f180c32854a499af93 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:35:21 +0000 Subject: [PATCH 61/86] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- skychart.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/skychart.spec b/skychart.spec index 499f9bb..3b20604 100644 --- a/skychart.spec +++ b/skychart.spec @@ -54,6 +54,7 @@ ExclusiveArch: %{fpc_arches} ExcludeArch: ppc64le +BuildRequires: make BuildRequires: fpc BuildRequires: lazarus BuildRequires: desktop-file-utils From 38aae281ea3d203a74d42d659066775aa004f249 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:33:41 +0000 Subject: [PATCH 62/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 3b20604..0d5ea30 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.3 -Release: 4.%{svnversion}svn%{?dist} +Release: 5.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -232,6 +232,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.3-5.4238svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 15 2020 Mattia Verga - 4.3-4.4238svn - Update svn version From be699354daf33d1f1f2c2f6538c003b4f5142279 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 2 May 2021 11:10:31 +0200 Subject: [PATCH 63/86] Update svn version to commit 4358 --- .gitignore | 1 + skychart.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2d72679..539ab7b 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /skychart-4.2.1-4073-src-nopatents.tar.xz /skychart-4.3-4108-src-nopatents.tar.xz /skychart-4.3-4238-src-nopatents.tar.xz +/skychart-4.3-4358-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index 0d5ea30..af25fa5 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 4238 +%global svnversion 4358 Name: skychart Version: 4.3 -Release: 5.%{svnversion}svn%{?dist} +Release: 6.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,7 +14,7 @@ URL: http://www.ap-i.net/skychart/ # To do this we use the generate-tarball.sh script # Download upstream tarball in the same directory of the script # and run: -# ./generate-tarball.sh 4.3-4238 +# ./generate-tarball.sh 4.3-4358 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -232,6 +232,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Sun May 02 2021 Mattia Verga - 4.3-6.4358svn +- Update svn version + * Wed Jan 27 2021 Fedora Release Engineering - 4.3-5.4238svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 44886dd..8448602 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.3-4238-src-nopatents.tar.xz) = 54265a6fb4eb929d904f1dbce5933a0bf1faff6eb45b722de1d2ea9e52542982659cfc4e9a6cc01057cfeed1254460f7e60c9a4337e9980bd9b13b307d69c924 +SHA512 (skychart-4.3-4358-src-nopatents.tar.xz) = 002b34eb95ff95f8be4b3aa905ea9a49cd5dcdac25fa6fe15af8dbc326d8b8b12aa482cf584f19e629cbbff1b8d0dc308f3477d3f61d36e7a5c6e7b5f17e7f52 From b579191ab5dd1b9857a3d4640039f0a845dc09e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:44:36 +0000 Subject: [PATCH 64/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index af25fa5..683cda9 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.3 -Release: 6.%{svnversion}svn%{?dist} +Release: 7.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -232,6 +232,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/metainfo/%{name}-data-dso.metainfo.xml %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.3-7.4358svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun May 02 2021 Mattia Verga - 4.3-6.4358svn - Update svn version From c9e99fff7991bfae6a3dcf7c8ee2c15c5e75e3e4 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 1 Nov 2021 14:04:57 +0100 Subject: [PATCH 65/86] Update svn version --- .gitignore | 1 + ...ostrip.patch => skychart-4.3-nostrip.patch | 14 ++++----- skychart.spec | 31 ++++++++++++------- sources | 2 +- 4 files changed, 28 insertions(+), 20 deletions(-) rename skychart-4.1-nostrip.patch => skychart-4.3-nostrip.patch (51%) diff --git a/.gitignore b/.gitignore index 539ab7b..bec6663 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /skychart-4.3-4108-src-nopatents.tar.xz /skychart-4.3-4238-src-nopatents.tar.xz /skychart-4.3-4358-src-nopatents.tar.xz +/skychart-4.3-4401-src-nopatents.tar.xz diff --git a/skychart-4.1-nostrip.patch b/skychart-4.3-nostrip.patch similarity index 51% rename from skychart-4.1-nostrip.patch rename to skychart-4.3-nostrip.patch index 572b3f5..9c0b2b4 100644 --- a/skychart-4.1-nostrip.patch +++ b/skychart-4.3-nostrip.patch @@ -1,7 +1,7 @@ -diff -U 3 -dHrN -- a/install.sh b/install.sh ---- a/install.sh 2017-10-03 11:01:35.000000000 +0200 -+++ b/install.sh 2017-10-10 17:54:25.410030788 +0200 -@@ -25,10 +25,10 @@ +diff -udHrN -- a/install.sh b/install.sh +--- a/install.sh 2021-10-22 09:47:36.000000000 +0200 ++++ b/install.sh 2021-10-22 20:28:25.389306148 +0200 +@@ -31,10 +31,10 @@ install -m 755 -d $destdir/share/icons/hicolor/scalable install -m 755 -d $destdir/share/icons/hicolor/scalable/apps @@ -13,6 +13,6 @@ diff -U 3 -dHrN -- a/install.sh b/install.sh +install -v -m 755 skychart/cdcicon $destdir/bin/cdcicon +install -v -m 755 varobs/varobs $destdir/bin/varobs +install -v -m 755 varobs/varobs_lpv_bulletin $destdir/bin/varobs_lpv_bulletin - install -v -m 644 system_integration/Linux/share/applications/skychart.desktop $destdir/share/applications/skychart.desktop - install -v -m 644 system_integration/Linux/share/metainfo/skychart.appdata.xml $destdir/share/metainfo/skychart.appdata.xml - install -v -m 644 system_integration/Linux/share/doc/skychart/changelog $destdir/share/doc/skychart/changelog + install -v -m 644 system_integration/Linux/share/applications/net.ap_i.skychart.desktop $destdir/share/applications/net.ap_i.skychart.desktop + install -v -m 644 system_integration/Linux/share/metainfo/net.ap_i.skychart.metainfo.xml $destdir/share/metainfo/net.ap_i.skychart.metainfo.xml + install -v -m 644 system_integration/Linux/share/mime/packages/net.ap_i.skychart.xml $destdir/share/mime/packages/net.ap_i.skychart.xml diff --git a/skychart.spec b/skychart.spec index 683cda9..583eab4 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 4358 +%global svnversion 4401 Name: skychart Version: 4.3 -Release: 7.%{svnversion}svn%{?dist} +Release: 8.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -12,9 +12,10 @@ URL: http://www.ap-i.net/skychart/ # - Remove libraries provided by libpasastro package # (they still are in sources only for compiling the Windows version) # To do this we use the generate-tarball.sh script -# Download upstream tarball in the same directory of the script -# and run: -# ./generate-tarball.sh 4.3-4358 +# 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-4401 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -34,7 +35,7 @@ Source12: http://sourceforge.net/projects/skychart/files/4-source_data/catalog # Avoid stripping debuginfo from executables # This is Fedora specific and not reported upstream -Patch1: skychart-4.1-nostrip.patch +Patch1: skychart-4.3-nostrip.patch # Disable wget in install script # This is Fedora specific and not reported upstream @@ -69,7 +70,10 @@ Requires: xdg-utils Requires: xplanet Recommends: openssl-libs +# Used for binary planetary ephemeris files Recommends: calceph-libs +# Used for Gaia catalog +Recommends: chealpix %description @@ -180,7 +184,7 @@ make install install_cat2 PREFIX=%{buildroot}%{_prefix} %check # Menu entry -desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/net.ap_i.skychart.desktop # Appdata file check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml @@ -191,8 +195,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %doc %{_datadir}/doc/skychart/changelog %doc %{_datadir}/doc/skychart/copyright %{_bindir}/* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/metainfo/%{name}.appdata.xml +%{_datadir}/applications/net.ap_i.%{name}.desktop +%{_datadir}/metainfo/net.ap_i.%{name}.metainfo.xml +%{_datadir}/mime/packages/net.ap_i.%{name}.xml %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/*/*/*/%{name}.png %{_datadir}/icons/*/*/*/%{name}.svg @@ -210,7 +215,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/skychart/doc/releasenotes*.txt %{_datadir}/skychart/doc/varobs - %files doc %doc %{_datadir}/skychart/doc/wiki_doc @@ -219,7 +223,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/skychart/cat/tycho2 %{_datadir}/skychart/cat/wds %{_datadir}/skychart/cat/bsc5 -%{_datadir}/metainfo/%{name}-data-stars.metainfo.xml +%{_datadir}/metainfo/net.ap_i.%{name}.%{name}_data_stars.metainfo.xml %files data-dso %{_datadir}/skychart/cat/leda @@ -229,9 +233,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_datadir}/skychart/cat/gpn %{_datadir}/skychart/cat/barnard %{_datadir}/skychart/cat/sh2 -%{_datadir}/metainfo/%{name}-data-dso.metainfo.xml +%{_datadir}/metainfo/net.ap_i.%{name}.%{name}_data_dso.metainfo.xml %changelog +* Mon Nov 01 2021 Mattia Verga - 4.3-8.4401svn +- Update svn version + * Fri Jul 23 2021 Fedora Release Engineering - 4.3-7.4358svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 8448602..631d432 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.3-4358-src-nopatents.tar.xz) = 002b34eb95ff95f8be4b3aa905ea9a49cd5dcdac25fa6fe15af8dbc326d8b8b12aa482cf584f19e629cbbff1b8d0dc308f3477d3f61d36e7a5c6e7b5f17e7f52 +SHA512 (skychart-4.3-4401-src-nopatents.tar.xz) = e86e9bbad828c82a9190b306aa3b2467bf3c24de4be598d07ed348cf831113284aa1603449c13b2b1a00da0e8dc0aa64852371224d2a1aadd624424f41cea8e7 From 0b1338ff819a1344ffd0da674e9da569c1571cae Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 1 Nov 2021 14:17:33 +0100 Subject: [PATCH 66/86] Update noupdatemenu patch --- ...-noupdatemenu.patch => skychart-4.3-noupdatemenu.patch | 8 ++++---- skychart.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename skychart-4.2-noupdatemenu.patch => skychart-4.3-noupdatemenu.patch (85%) diff --git a/skychart-4.2-noupdatemenu.patch b/skychart-4.3-noupdatemenu.patch similarity index 85% rename from skychart-4.2-noupdatemenu.patch rename to skychart-4.3-noupdatemenu.patch index 9546719..b3cbca3 100644 --- a/skychart-4.2-noupdatemenu.patch +++ b/skychart-4.3-noupdatemenu.patch @@ -1,12 +1,12 @@ -diff -U 3 -dHrN -- a/skychart/Makefile.in b/skychart/Makefile.in ---- a/skychart/Makefile.in 2019-10-13 14:25:41.000000000 +0200 -+++ b/skychart/Makefile.in 2019-10-14 18:03:35.121425627 +0200 +diff -udHrN -- a/skychart/Makefile.in b/skychart/Makefile.in +--- a/skychart/Makefile.in 2021-10-21 02:49:20.000000000 +0200 ++++ b/skychart/Makefile.in 2021-10-21 14:00:02.319281349 +0200 @@ -17,7 +17,7 @@ [compiler] unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) includedir=./ -options= $(opt_target) $(fpcopts) -CF64 -dWithUpdateMenu -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l +options= $(opt_target) $(fpcopts) -CF64 -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l - unitdir=library/catalog/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/jdcalendar/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/bgrabitmap/lib/$(CPU_TARGET)-$(OS_TARGET) component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/mrecsort/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/multiframe/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/radec/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/zoomimage/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/indiclient/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vo/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vosamp/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/xmlparser/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ + unitdir=library/catalog/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/jdcalendar/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/bgrabitmap/lib/$(CPU_TARGET)-$(OS_TARGET) component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/mrecsort/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/multiframe/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/radec/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/zoomimage/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/indiclient/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vo/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vosamp/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/xmlparser/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ [clean] diff --git a/skychart.spec b/skychart.spec index 583eab4..11e0985 100644 --- a/skychart.spec +++ b/skychart.spec @@ -48,7 +48,7 @@ Patch3: skychart-4.3-satmessage.patch # Disable software update menu item # This feature was asked upstream specifically for Fedora -Patch4: skychart-4.2-noupdatemenu.patch +Patch4: skychart-4.3-noupdatemenu.patch ExclusiveArch: %{fpc_arches} From f46ae03f978ce6ff94566e31dc641549c11ad187 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 1 Nov 2021 14:28:20 +0100 Subject: [PATCH 67/86] Fix appdata file name for validation --- skychart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 11e0985..62d04ea 100644 --- a/skychart.spec +++ b/skychart.spec @@ -187,7 +187,7 @@ make install install_cat2 PREFIX=%{buildroot}%{_prefix} desktop-file-validate %{buildroot}%{_datadir}/applications/net.ap_i.skychart.desktop # Appdata file check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml %files From 0e10221e12b03b45c6c9a073dad9a461cf53b432 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:05:15 +0000 Subject: [PATCH 68/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- skychart.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 62d04ea..921a185 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 4.3 -Release: 8.%{svnversion}svn%{?dist} +Release: 9.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -236,6 +236,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/net.ap_i.%{name}.%{name}_data_dso.metainfo.xml %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.3-9.4401svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Nov 01 2021 Mattia Verga - 4.3-8.4401svn - Update svn version From f2fc2cf49c83dae068e73ea229052abaca0c7601 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 5 Feb 2022 11:12:00 +0100 Subject: [PATCH 69/86] Update svn version --- .gitignore | 1 + skychart-4.3-nostrip.patch | 12 +++++------ skychart.spec | 41 +++++++++++++++++++++++++++++++++----- sources | 2 +- 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index bec6663..bf91440 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /skychart-4.3-4238-src-nopatents.tar.xz /skychart-4.3-4358-src-nopatents.tar.xz /skychart-4.3-4401-src-nopatents.tar.xz +/skychart-4.3-4466-src-nopatents.tar.xz diff --git a/skychart-4.3-nostrip.patch b/skychart-4.3-nostrip.patch index 9c0b2b4..bd05df2 100644 --- a/skychart-4.3-nostrip.patch +++ b/skychart-4.3-nostrip.patch @@ -1,18 +1,18 @@ diff -udHrN -- a/install.sh b/install.sh ---- a/install.sh 2021-10-22 09:47:36.000000000 +0200 -+++ b/install.sh 2021-10-22 20:28:25.389306148 +0200 +--- a/install.sh 2022-01-16 17:11:45.000000000 +0100 ++++ b/install.sh 2022-01-17 20:59:08.009725109 +0100 @@ -31,10 +31,10 @@ install -m 755 -d $destdir/share/icons/hicolor/scalable install -m 755 -d $destdir/share/icons/hicolor/scalable/apps -install -v -m 755 -s skychart/cdc $destdir/bin/skychart -install -v -m 755 -s skychart/cdcicon $destdir/bin/cdcicon +-install -v -m 755 -s skychart/catgen $destdir/bin/catgen -install -v -m 755 -s varobs/varobs $destdir/bin/varobs --install -v -m 755 -s varobs/varobs_lpv_bulletin $destdir/bin/varobs_lpv_bulletin +install -v -m 755 skychart/cdc $destdir/bin/skychart +install -v -m 755 skychart/cdcicon $destdir/bin/cdcicon ++install -v -m 755 skychart/catgen $destdir/bin/catgen +install -v -m 755 varobs/varobs $destdir/bin/varobs -+install -v -m 755 varobs/varobs_lpv_bulletin $destdir/bin/varobs_lpv_bulletin install -v -m 644 system_integration/Linux/share/applications/net.ap_i.skychart.desktop $destdir/share/applications/net.ap_i.skychart.desktop - install -v -m 644 system_integration/Linux/share/metainfo/net.ap_i.skychart.metainfo.xml $destdir/share/metainfo/net.ap_i.skychart.metainfo.xml - install -v -m 644 system_integration/Linux/share/mime/packages/net.ap_i.skychart.xml $destdir/share/mime/packages/net.ap_i.skychart.xml + install -v -m 644 system_integration/Linux/share/applications/net.ap_i.catgen.desktop $destdir/share/applications/net.ap_i.catgen.desktop + install -v -m 644 system_integration/Linux/share/applications/net.ap_i.varobs.desktop $destdir/share/applications/net.ap_i.varobs.desktop diff --git a/skychart.spec b/skychart.spec index 921a185..1e18bfa 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,8 @@ -%global svnversion 4401 +%global svnversion 4466 Name: skychart Version: 4.3 -Release: 9.%{svnversion}svn%{?dist} +Release: 10.%{svnversion}svn%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -15,7 +15,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-4401 +# ./generate-tarball.sh 4.3-4466 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -75,6 +75,9 @@ Recommends: calceph-libs # Used for Gaia catalog Recommends: chealpix +# Weak dependency on catgen +Recommends: skychart-catgen = %{version}-%{release} + %description This program enables you to draw sky charts, making use of the data in 16 @@ -122,6 +125,14 @@ nebulae catalogs: LEDA Catalogue; Lynds Bright Nebulae; Open Cluster Data; Globular Clusters in the Milky Way; Galactic Planetary Nebulae; Barnard Catalogue of Dark Nebulae; Sharpless Catalog. +%package catgen +Summary: Custom catalog builder for Skychart +License: GPLv2+ +Provides: catgen = %{version}-%{release} + +%description catgen +Custom catalog builder for Skychart. + %prep %setup0 -q -n %{name}-%{version}-%{svnversion}-src @@ -184,7 +195,7 @@ make install install_cat2 PREFIX=%{buildroot}%{_prefix} %check # Menu entry -desktop-file-validate %{buildroot}%{_datadir}/applications/net.ap_i.skychart.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/net.ap_i.*.desktop # Appdata file check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml @@ -194,13 +205,20 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %license skychart/gpl.txt %doc %{_datadir}/doc/skychart/changelog %doc %{_datadir}/doc/skychart/copyright -%{_bindir}/* +%{_bindir}/%{name} +%{_bindir}/cdcicon +%{_bindir}/varobs %{_datadir}/applications/net.ap_i.%{name}.desktop +%{_datadir}/applications/net.ap_i.varobs.desktop %{_datadir}/metainfo/net.ap_i.%{name}.metainfo.xml +%{_datadir}/metainfo/net.ap_i.varobs.metainfo.xml %{_datadir}/mime/packages/net.ap_i.%{name}.xml %{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/varobs.png %{_datadir}/icons/*/*/*/%{name}.png +%{_datadir}/icons/*/*/*/varobs.png %{_datadir}/icons/*/*/*/%{name}.svg +%{_datadir}/icons/*/*/*/varobs.svg %dir %{_datadir}/skychart %{_datadir}/skychart/data %dir %{_datadir}/skychart/cat @@ -235,7 +253,20 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/skychart/cat/sh2 %{_datadir}/metainfo/net.ap_i.%{name}.%{name}_data_dso.metainfo.xml +%files catgen +%{_bindir}/catgen +%{_datadir}/applications/net.ap_i.catgen.desktop +%{_datadir}/metainfo/net.ap_i.catgen.metainfo.xml +%{_datadir}/pixmaps/catgen.png +%{_datadir}/icons/*/*/*/catgen.png +%{_datadir}/icons/*/*/*/catgen.svg + + %changelog +* Sat Feb 05 2022 Mattia Verga - 4.3-10.4466svn +- Update svn version +- Provide catgen by separate standalone subpackage + * Sat Jan 22 2022 Fedora Release Engineering - 4.3-9.4401svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 631d432..d4d9e57 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.3-4401-src-nopatents.tar.xz) = e86e9bbad828c82a9190b306aa3b2467bf3c24de4be598d07ed348cf831113284aa1603449c13b2b1a00da0e8dc0aa64852371224d2a1aadd624424f41cea8e7 +SHA512 (skychart-4.3-4466-src-nopatents.tar.xz) = 2e9dfa16ac3d4dd1435c8be1800a906b189a9367b5be55f6ad9da7a35c7a84fd40044657b7c1c0a66771a77d2806cdf48b4daf5ab3beb129b6e7b315a903237c From 0b88577def42c12fddd71e521447c5856cd706d0 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 11 Apr 2022 15:35:45 +0200 Subject: [PATCH 70/86] Move old changelog to external file --- changelog | 167 +++++++++++++++++++++++++++++++++++++++++++++++++ skychart.spec | 168 +------------------------------------------------- 2 files changed, 168 insertions(+), 167 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..b4dccc7 --- /dev/null +++ b/changelog @@ -0,0 +1,167 @@ +* Sat Feb 05 2022 Mattia Verga - 4.3-10.4466svn +- Update svn version +- Provide catgen by separate standalone subpackage + +* Sat Jan 22 2022 Fedora Release Engineering - 4.3-9.4401svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 01 2021 Mattia Verga - 4.3-8.4401svn +- Update svn version + +* Fri Jul 23 2021 Fedora Release Engineering - 4.3-7.4358svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun May 02 2021 Mattia Verga - 4.3-6.4358svn +- Update svn version + +* Wed Jan 27 2021 Fedora Release Engineering - 4.3-5.4238svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 15 2020 Mattia Verga - 4.3-4.4238svn +- Update svn version + +* Wed Jul 29 2020 Fedora Release Engineering - 4.3-3.4108svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Feb 08 2020 Mattia Verga - 4.3-2.4108svn +- ExcludeArch ppc64le due to compilation errors + +* Sat Feb 01 2020 Mattia Verga - 4.3-1.4108svn +- Update to 4.3 svn + +* Thu Jan 30 2020 Fedora Release Engineering - 4.2.1-2.4073svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 26 2019 Mattia Verga - 4.2.1-1.4073svn +- Update to stable 4.2.1 + +* Fri Oct 18 2019 Mattia Verga - 4.2-1.4046svn +- Release stable 4.2 + +* Thu Aug 29 2019 Mattia Verga - 4.1.1-5.4000svn +- Update svn version + +* Fri Jul 26 2019 Fedora Release Engineering - 4.1.1-4.3925svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Apr 27 2019 Mattia Verga - 4.1.1-3.3925svn +- Update svn version + +* Sat Feb 02 2019 Fedora Release Engineering - 4.1.1-2.3792svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Nov 03 2018 Mattia Verga - 4.1.1-1.3792svn +- Update svn version + +* Sat Jul 14 2018 Fedora Release Engineering - 4.1-2.3730svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Feb 25 2018 Mattia Verga - 4.1-1.3730svn +- Upgrade to development version to fix build failures + +* Sun Feb 25 2018 Mattia Verga - 4.0-8 +- Rebuild for fpc 3.0.4 and lazarus 1.8 + +* Fri Feb 09 2018 Fedora Release Engineering - 4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 4.0-6 +- Remove obsolete scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Sat Jul 29 2017 Mattia Verga - 4.0-4 +- Change FPC compiler options to fix debuginfo package build + +* Thu Jul 27 2017 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Apr 12 2017 Mattia Verga - 4.0-2 +- Fix for OpenSSL 1.1 + +* Sun Mar 19 2017 Mattia Verga - 4.0-1 +- Release ver 4.0 + +* Sun Mar 05 2017 Mattia Verga - 3.11-17.3549svn +- Patch to fix libssl and libcrypto links + +* Mon Feb 27 2017 Mattia Verga - 3.11-16.3549svn +- Update svn version + +* Sun Feb 12 2017 Mattia Verga - 3.11-15.3287svn +- Set ExcludeArch ppc64 due to lazarus limitations + +* Sat Feb 11 2017 Fedora Release Engineering - 3.11-14.3287svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Sep 17 2016 Mattia Verga - 3.11-13.3287svn +- Update svn version + +* Sun Apr 17 2016 Mattia Verga - 3.11-12.3238svn +- Use new fpc_arches macro as ExclusiveArch + +* Sun Apr 17 2016 Mattia Verga - 3.11-11.3238svn +- Remove additional NGC catalog due to incompatible license + +* Mon Feb 15 2016 Mattia Verga - 3.11-10.3238svn +- Update svn version +- Remove remnants of pre built .dll files in sources +- Remove libraries from sources that are now provided externally +- Patch to inform user about artificial satellites calculation removal +- Patch to set option to disable software update menu item + +* Fri Feb 12 2016 Mattia Verga - 3.11-9.3229svn +- Update svn version +- FSF address in sources is now fixed upstream +- Appdata file is now fixed upstream +- Updated catalog_wds source file from upstream + +* Fri Feb 05 2016 Fedora Release Engineering - 3.11-8.3157svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 15 2016 Richard Hughes - 3.11-7.3157svn +- Fix the metainfo files by removing zero-width space chars + +* Mon Jan 11 2016 Mattia Verga - 3.11-6.3157svn +- Add .metainfo.xml files to subpackages + +* Sun Jan 10 2016 Mattia Verga - 3.11-5.3157svn +- Update svn version +- Libraries are now in separate package libpasastro +- Fix wrong FSF address in source headers +- Fix appdata file validation + +* Sun Dec 20 2015 Mattia Verga - 3.11-4.3141svn +- Properly set ExcludeArch + +* Fri Dec 11 2015 Mattia Verga - 3.11-3.3141svn +- Revert back to ExcludeArch + +* Fri Nov 27 2015 Mattia Verga - 3.11-2.3141svn +- Set ExclusiveArch to prevent build on arm and s390x + +* Sat Nov 14 2015 Mattia Verga - 3.11-1.3141svn +- Update to 3.11svn to fix incompatibility with lazarus 1.4.2 + +* Sun Jun 21 2015 Mattia Verga - 3.10-7 +- Validate appdata file +- Change license file location + +* Sat Jun 20 2015 Mattia Verga - 3.10-6 +- Added patch to fix build with lazarus 1.4 + +* Fri Jun 19 2015 Fedora Release Engineering - 3.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 3.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 3.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 03 2014 Mattia Verga - 3.10-2 +- Fix patch1 + +* Thu Apr 03 2014 Mattia Verga - 3.10-1 +- Update to 3.10 diff --git a/skychart.spec b/skychart.spec index 1e18bfa..6fdeb54 100644 --- a/skychart.spec +++ b/skychart.spec @@ -263,170 +263,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %changelog -* Sat Feb 05 2022 Mattia Verga - 4.3-10.4466svn -- Update svn version -- Provide catgen by separate standalone subpackage - -* Sat Jan 22 2022 Fedora Release Engineering - 4.3-9.4401svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 01 2021 Mattia Verga - 4.3-8.4401svn -- Update svn version - -* Fri Jul 23 2021 Fedora Release Engineering - 4.3-7.4358svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun May 02 2021 Mattia Verga - 4.3-6.4358svn -- Update svn version - -* Wed Jan 27 2021 Fedora Release Engineering - 4.3-5.4238svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 15 2020 Mattia Verga - 4.3-4.4238svn -- Update svn version - -* Wed Jul 29 2020 Fedora Release Engineering - 4.3-3.4108svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Feb 08 2020 Mattia Verga - 4.3-2.4108svn -- ExcludeArch ppc64le due to compilation errors - -* Sat Feb 01 2020 Mattia Verga - 4.3-1.4108svn -- Update to 4.3 svn - -* Thu Jan 30 2020 Fedora Release Engineering - 4.2.1-2.4073svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 26 2019 Mattia Verga - 4.2.1-1.4073svn -- Update to stable 4.2.1 - -* Fri Oct 18 2019 Mattia Verga - 4.2-1.4046svn -- Release stable 4.2 - -* Thu Aug 29 2019 Mattia Verga - 4.1.1-5.4000svn -- Update svn version - -* Fri Jul 26 2019 Fedora Release Engineering - 4.1.1-4.3925svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Apr 27 2019 Mattia Verga - 4.1.1-3.3925svn -- Update svn version - -* Sat Feb 02 2019 Fedora Release Engineering - 4.1.1-2.3792svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Nov 03 2018 Mattia Verga - 4.1.1-1.3792svn -- Update svn version - -* Sat Jul 14 2018 Fedora Release Engineering - 4.1-2.3730svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 25 2018 Mattia Verga - 4.1-1.3730svn -- Upgrade to development version to fix build failures - -* Sun Feb 25 2018 Mattia Verga - 4.0-8 -- Rebuild for fpc 3.0.4 and lazarus 1.8 - -* Fri Feb 09 2018 Fedora Release Engineering - 4.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 4.0-6 -- Remove obsolete scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 4.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Sat Jul 29 2017 Mattia Verga - 4.0-4 -- Change FPC compiler options to fix debuginfo package build - -* Thu Jul 27 2017 Fedora Release Engineering - 4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Apr 12 2017 Mattia Verga - 4.0-2 -- Fix for OpenSSL 1.1 - -* Sun Mar 19 2017 Mattia Verga - 4.0-1 -- Release ver 4.0 - -* Sun Mar 05 2017 Mattia Verga - 3.11-17.3549svn -- Patch to fix libssl and libcrypto links - -* Mon Feb 27 2017 Mattia Verga - 3.11-16.3549svn -- Update svn version - -* Sun Feb 12 2017 Mattia Verga - 3.11-15.3287svn -- Set ExcludeArch ppc64 due to lazarus limitations - -* Sat Feb 11 2017 Fedora Release Engineering - 3.11-14.3287svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Sep 17 2016 Mattia Verga - 3.11-13.3287svn -- Update svn version - -* Sun Apr 17 2016 Mattia Verga - 3.11-12.3238svn -- Use new fpc_arches macro as ExclusiveArch - -* Sun Apr 17 2016 Mattia Verga - 3.11-11.3238svn -- Remove additional NGC catalog due to incompatible license - -* Mon Feb 15 2016 Mattia Verga - 3.11-10.3238svn -- Update svn version -- Remove remnants of pre built .dll files in sources -- Remove libraries from sources that are now provided externally -- Patch to inform user about artificial satellites calculation removal -- Patch to set option to disable software update menu item - -* Fri Feb 12 2016 Mattia Verga - 3.11-9.3229svn -- Update svn version -- FSF address in sources is now fixed upstream -- Appdata file is now fixed upstream -- Updated catalog_wds source file from upstream - -* Fri Feb 05 2016 Fedora Release Engineering - 3.11-8.3157svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Richard Hughes - 3.11-7.3157svn -- Fix the metainfo files by removing zero-width space chars - -* Mon Jan 11 2016 Mattia Verga - 3.11-6.3157svn -- Add .metainfo.xml files to subpackages - -* Sun Jan 10 2016 Mattia Verga - 3.11-5.3157svn -- Update svn version -- Libraries are now in separate package libpasastro -- Fix wrong FSF address in source headers -- Fix appdata file validation - -* Sun Dec 20 2015 Mattia Verga - 3.11-4.3141svn -- Properly set ExcludeArch - -* Fri Dec 11 2015 Mattia Verga - 3.11-3.3141svn -- Revert back to ExcludeArch - -* Fri Nov 27 2015 Mattia Verga - 3.11-2.3141svn -- Set ExclusiveArch to prevent build on arm and s390x - -* Sat Nov 14 2015 Mattia Verga - 3.11-1.3141svn -- Update to 3.11svn to fix incompatibility with lazarus 1.4.2 - -* Sun Jun 21 2015 Mattia Verga - 3.10-7 -- Validate appdata file -- Change license file location - -* Sat Jun 20 2015 Mattia Verga - 3.10-6 -- Added patch to fix build with lazarus 1.4 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 3.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 3.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 03 2014 Mattia Verga - 3.10-2 -- Fix patch1 - -* Thu Apr 03 2014 Mattia Verga - 3.10-1 -- Update to 3.10 +%autochangelog From 14a1ffe848f015ed47382dc3916c76c9c51b0119 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 11 Apr 2022 15:40:02 +0200 Subject: [PATCH 71/86] Update to 4.3-4486 - Add support for OpenSSL3 --- .gitignore | 1 + skychart-4.3-noupdatemenu.patch | 6 +++--- skychart.spec | 23 ++++++++++++++--------- sources | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index bf91440..6d6f599 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /skychart-4.3-4358-src-nopatents.tar.xz /skychart-4.3-4401-src-nopatents.tar.xz /skychart-4.3-4466-src-nopatents.tar.xz +/skychart-4.3-4486-src-nopatents.tar.xz diff --git a/skychart-4.3-noupdatemenu.patch b/skychart-4.3-noupdatemenu.patch index b3cbca3..b3a13bd 100644 --- a/skychart-4.3-noupdatemenu.patch +++ b/skychart-4.3-noupdatemenu.patch @@ -1,12 +1,12 @@ diff -udHrN -- a/skychart/Makefile.in b/skychart/Makefile.in ---- a/skychart/Makefile.in 2021-10-21 02:49:20.000000000 +0200 -+++ b/skychart/Makefile.in 2021-10-21 14:00:02.319281349 +0200 +--- a/skychart/Makefile.in 2022-04-09 11:57:49.000000000 +0200 ++++ b/skychart/Makefile.in 2022-04-11 15:01:56.238713121 +0200 @@ -17,7 +17,7 @@ [compiler] unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) includedir=./ -options= $(opt_target) $(fpcopts) -CF64 -dWithUpdateMenu -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l +options= $(opt_target) $(fpcopts) -CF64 -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -vewni -l - unitdir=library/catalog/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/jdcalendar/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/bgrabitmap/lib/$(CPU_TARGET)-$(OS_TARGET) component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/mrecsort/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/multiframe/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/radec/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/zoomimage/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/indiclient/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vo/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vosamp/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/xmlparser/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ + unitdir=library/catalog/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ component/jdcalendar/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/bgrabitmap/lib/$(CPU_TARGET)-$(OS_TARGET) component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/mrecsort/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/multiframe/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/radec/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/zoomimage/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/indiclient/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vo/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/vosamp/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/synapse/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ component/xmlparser/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/freetype/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ [clean] diff --git a/skychart.spec b/skychart.spec index 6fdeb54..90a1ee0 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,8 +1,10 @@ -%global svnversion 4466 +%global svnversion 4486 +%global date 20220411 +%global maj_ver 4.3 Name: skychart -Version: 4.3 -Release: 10.%{svnversion}svn%{?dist} +Version: %{maj_ver}^%{date}svn%{svnversion} +Release: %autorelease Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -15,8 +17,8 @@ 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-4466 -Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz +# ./generate-tarball.sh 4.3-4486 +Source0: %{name}-%{maj_ver}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars Source2: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gcvs.tgz @@ -134,7 +136,7 @@ Provides: catgen = %{version}-%{release} Custom catalog builder for Skychart. %prep -%setup0 -q -n %{name}-%{version}-%{svnversion}-src +%setup0 -q -n %{name}-%{maj_ver}-%{svnversion}-src %patch1 -p1 @@ -170,13 +172,16 @@ do done - %build ./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix} # Skychart doesn't like parallel building so we don't use macro. -# We pass options to fpc compiler for generate debug info. -make fpcopts="-O1 -gw3 -fPIC" +# We pass the following options to fpc compiler: +# - O2 for code optimization level +# - gw4 for generating dwarf 4 debug symbols +# - Cg to generate PIC code +make fpcopts="-O2 -gw4 -Cg" + %install # Install main program diff --git a/sources b/sources index d4d9e57..e3e2bb4 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.3-4466-src-nopatents.tar.xz) = 2e9dfa16ac3d4dd1435c8be1800a906b189a9367b5be55f6ad9da7a35c7a84fd40044657b7c1c0a66771a77d2806cdf48b4daf5ab3beb129b6e7b315a903237c +SHA512 (skychart-4.3-4486-src-nopatents.tar.xz) = fd3e786605f8032905a2843e3ac8e75b79cf69282f935ccfaecce8ab5f000de9384005a4de01dd942a1d57510caeb3a5e1e29c193626720848d3473a581a4a82 From 8ad45ec29603bed3d63ee08d692515edca25ebf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:48:13 +0000 Subject: [PATCH 72/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 185bf6293acf41c239debb2f74b723e2650f9706 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 3 Dec 2022 09:44:22 +0100 Subject: [PATCH 73/86] Update to svn4558 ... - Add VdB catalog to data-dso --- .gitignore | 2 ++ skychart.spec | 9 ++++++--- sources | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6d6f599..541a9df 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /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 diff --git a/skychart.spec b/skychart.spec index 90a1ee0..1127752 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,5 +1,5 @@ -%global svnversion 4486 -%global date 20220411 +%global svnversion 4558 +%global date 20221203 %global maj_ver 4.3 Name: skychart @@ -17,7 +17,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-4486 +# ./generate-tarball.sh 4.3-4558 Source0: %{name}-%{maj_ver}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Source data for skychart-data-stars @@ -33,6 +33,7 @@ Source9: http://sourceforge.net/projects/skychart/files/4-source_data/catalog 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 +Source13: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_vdb.tgz # Avoid stripping debuginfo from executables @@ -161,6 +162,7 @@ find skychart -type f -print0 | xargs -0 chmod -x %{__cp} -p %SOURCE10 ./BaseData %{__cp} -p %SOURCE11 ./BaseData %{__cp} -p %SOURCE12 ./BaseData +%{__cp} -p %SOURCE13 ./BaseData # Add directories to fix builds on arm and ppc architectures declare -a arches=("arm-linux-gtk2" "powerpc-linux-gtk2" "powerpc64-linux-gtk2") @@ -256,6 +258,7 @@ 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 diff --git a/sources b/sources index e3e2bb4..2b287cd 100644 --- a/sources +++ b/sources @@ -9,4 +9,5 @@ SHA512 (catalog_ocl.tgz) = 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13 SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a8936fc4f069f33b8b0e8cbd7ef3980e5c1dff8b4ac5427f30e73260e1a24d49b779b0713e1e56 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c -SHA512 (skychart-4.3-4486-src-nopatents.tar.xz) = fd3e786605f8032905a2843e3ac8e75b79cf69282f935ccfaecce8ab5f000de9384005a4de01dd942a1d57510caeb3a5e1e29c193626720848d3473a581a4a82 +SHA512 (catalog_vdb.tgz) = d3df026a2b5a1de6c41c7ec4202da48784d12a9a0adc6e6069a1b5f50b3beb6c80a66fd1be26fdf60fbbccbf32d392bffd0c020a867fe5d276231ecceaaa8528 +SHA512 (skychart-4.3-4558-src-nopatents.tar.xz) = e08bbb7744b370e6932713476b66252eb139fd24ea206737baecf2742ff620ee254ed0fec076e65fc789e37c675c613f25a8a3ebf8eeda4b203a4effb37926fa From 6a2e49749833a24daa0dd9a777ffe3d5067d3f7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:27:29 +0000 Subject: [PATCH 74/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e10e4642f5f7f092421688d97d117ae5b012a8a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:53:10 +0000 Subject: [PATCH 75/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 37ec51b563ef719be8c5037d3cd8d622dca2dd56 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 10 Sep 2023 10:01:32 +0200 Subject: [PATCH 76/86] Migrate to SPDX license --- skychart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skychart.spec b/skychart.spec index 1127752..1ba1c9a 100644 --- a/skychart.spec +++ b/skychart.spec @@ -6,7 +6,7 @@ Name: skychart Version: %{maj_ver}^%{date}svn%{svnversion} Release: %autorelease Summary: Planetarium software for the advanced amateur astronomer -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.ap-i.net/skychart/ # Upstream sources are modified to: # - Remove pre-built software (iridflare.exe, quicksat.exe, dll files) From 91ee701e6388fa0b89adda98f3dd44ada28dcba4 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 2 Oct 2023 18:19:26 +0200 Subject: [PATCH 77/86] Update to latest snapshot --- .gitignore | 2 + skychart.spec | 105 ++++++++++++++++++++++++-------------------------- sources | 3 +- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 541a9df..9ebd651 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ /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 diff --git a/skychart.spec b/skychart.spec index 1ba1c9a..edaef2b 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,12 +1,13 @@ -%global svnversion 4558 -%global date 20221203 +%global svnversion 4630 +%global date 20230918 %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 -License: GPL-2.0-or-later +# 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 URL: http://www.ap-i.net/skychart/ # Upstream sources are modified to: # - Remove pre-built software (iridflare.exe, quicksat.exe, dll files) @@ -17,50 +18,59 @@ 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-4558 +# ./generate-tarball.sh 4.3-4630 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 -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 +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 # Source data for skychart-data-dso -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 -Source13: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_vdb.tgz +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 # Avoid stripping debuginfo from executables # This is Fedora specific and not reported upstream -Patch1: skychart-4.3-nostrip.patch +Patch: skychart-4.3-nostrip.patch # Disable wget in install script # This is Fedora specific and not reported upstream -Patch2: skychart-4.1-wgetdata.patch +Patch: 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 -Patch3: skychart-4.3-satmessage.patch +Patch: skychart-4.3-satmessage.patch # Disable software update menu item # This feature was asked upstream specifically for Fedora -Patch4: skychart-4.3-noupdatemenu.patch +Patch: skychart-4.3-noupdatemenu.patch ExclusiveArch: %{fpc_arches} -ExcludeArch: ppc64le +ExcludeArch: %{ix86} BuildRequires: make BuildRequires: fpc -BuildRequires: lazarus +%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 @@ -97,7 +107,7 @@ atlas more complete than a conventional planetarium. %package doc Summary: Documentation files for Skychart -License: CC-BY-SA or GFDL +License: CC-BY-SA-3.0 OR GFDL-1.3-no-invariants-or-later Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -107,7 +117,7 @@ within the program as an offline copy. %package data-stars Summary: Additional star catalogs for Skychart -License: Public Domain +License: LicenseRef-Fedora-Public-Domain Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -118,7 +128,7 @@ Tycho 2; General Catalogue of Variable Stars; Washington Double Stars. %package data-dso Summary: Additional Deep Sky Object catalogs for Skychart -License: Public Domain +License: LicenseRef-Fedora-Public-Domain Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -130,7 +140,7 @@ Barnard Catalogue of Dark Nebulae; Sharpless Catalog. %package catgen Summary: Custom catalog builder for Skychart -License: GPLv2+ +License: GPL-2.0-or-later Provides: catgen = %{version}-%{release} %description catgen @@ -139,39 +149,26 @@ Custom catalog builder for Skychart. %prep %setup0 -q -n %{name}-%{maj_ver}-%{svnversion}-src -%patch1 -p1 - -%patch2 -p1 - -%patch3 -p1 - -%patch4 -p1 +%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 -%{__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 -# 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 +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 %build diff --git a/sources b/sources index 2b287cd..e17501f 100644 --- a/sources +++ b/sources @@ -10,4 +10,5 @@ SHA512 (catalog_sh2.tgz) = c6501a6382d21b2508157a0921f3f6628e024f5228e2c87e56a89 SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c SHA512 (catalog_vdb.tgz) = d3df026a2b5a1de6c41c7ec4202da48784d12a9a0adc6e6069a1b5f50b3beb6c80a66fd1be26fdf60fbbccbf32d392bffd0c020a867fe5d276231ecceaaa8528 -SHA512 (skychart-4.3-4558-src-nopatents.tar.xz) = e08bbb7744b370e6932713476b66252eb139fd24ea206737baecf2742ff620ee254ed0fec076e65fc789e37c675c613f25a8a3ebf8eeda4b203a4effb37926fa +SHA512 (data_spicesun.tgz) = 6656d6dd089025cb4cbbb1a76e2a5ae219b1be4ee87d8ceb8ce6abff9d59ed813939928baed2bd8eb4a1a48ec374c76527a5e70e53584bc3612aa12002604706 +SHA512 (skychart-4.3-4630-src-nopatents.tar.xz) = 9b9d6eafbf40078e23b46553d91dd3b53ced693785df7045d8fd99ea0d43945a19e71a47fc421670cfae417c2c6520d65b4b3fff2ae20a3a03f96d5ae1a785f1 From c8afa8c3e19c1be7b9cec797e589866ce5285b52 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 22 Nov 2023 18:11:35 +0100 Subject: [PATCH 78/86] Update to latest svn snapshot --- .gitignore | 1 + skychart.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9ebd651..dad6452 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /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 diff --git a/skychart.spec b/skychart.spec index edaef2b..fb215dc 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,5 +1,5 @@ -%global svnversion 4630 -%global date 20230918 +%global svnversion 4639 +%global date 20231122 %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-4630 +# ./generate-tarball.sh 4.3-4639 Source0: %{name}-%{maj_ver}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Base source data diff --git a/sources b/sources index e17501f..7d48cfa 100644 --- a/sources +++ b/sources @@ -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-4630-src-nopatents.tar.xz) = 9b9d6eafbf40078e23b46553d91dd3b53ced693785df7045d8fd99ea0d43945a19e71a47fc421670cfae417c2c6520d65b4b3fff2ae20a3a03f96d5ae1a785f1 +SHA512 (skychart-4.3-4639-src-nopatents.tar.xz) = 8c6176d8cdd9e2d8cd8b7d4cba695993456830a922209e48e35dce9217490f081295aa524bc833bb7bd542bf4f5827698e101fe8a01af7058a35099ebe050d3f From 4bf60622da3ef9afa67ded0a6e6f9394e185af35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:29:30 +0000 Subject: [PATCH 79/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c1a1464affe875716cf4444ef1c37f876bdded5c Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 8 Feb 2024 17:50:22 +0100 Subject: [PATCH 80/86] Update to latest svn version --- .gitignore | 1 + skychart.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dad6452..3f2f12f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /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 diff --git a/skychart.spec b/skychart.spec index fb215dc..0626edb 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,5 +1,5 @@ -%global svnversion 4639 -%global date 20231122 +%global svnversion 4719 +%global date 20240205 %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-4639 +# ./generate-tarball.sh 4.3-4719 Source0: %{name}-%{maj_ver}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Base source data diff --git a/sources b/sources index 7d48cfa..1ce5e58 100644 --- a/sources +++ b/sources @@ -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-4639-src-nopatents.tar.xz) = 8c6176d8cdd9e2d8cd8b7d4cba695993456830a922209e48e35dce9217490f081295aa524bc833bb7bd542bf4f5827698e101fe8a01af7058a35099ebe050d3f +SHA512 (skychart-4.3-4719-src-nopatents.tar.xz) = 8b08e337a6f5ffb97b3f09c212fa1a26c1761ddd24296fc4a8214e949cba3161034bd29417796c0754b6c4e09d5ef179480d2b63a729935f8e3716111232eec3 From 9e8fda5da78e336d8e221f56b396379a2f94e1c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:47:55 +0000 Subject: [PATCH 81/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c7cacc4ff6936d1023913fda9dfad4321daa2582 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 2 Aug 2024 18:49:24 +0200 Subject: [PATCH 82/86] Fix F41 FTB (Fedora#2301274) --- skychart.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/skychart.spec b/skychart.spec index 0626edb..e813c32 100644 --- a/skychart.spec +++ b/skychart.spec @@ -63,14 +63,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 +143,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 From 7e0d8b2261ef9ecd77b6ea4558c0136e385be430 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:55:20 +0000 Subject: [PATCH 83/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 83f39af43bd6ee91b606515b0918efca521c0cdf Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 9 Mar 2025 15:53:05 +0100 Subject: [PATCH 84/86] Update to svn4974 --- .gitignore | 1 + skychart.spec | 7 +++---- sources | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3f2f12f..307e9be 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/skychart.spec b/skychart.spec index e813c32..2af587f 100644 --- a/skychart.spec +++ b/skychart.spec @@ -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 @@ -226,7 +226,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 diff --git a/sources b/sources index 1ce5e58..c87be5e 100644 --- a/sources +++ b/sources @@ -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 From e349e4daf303d6946f7b3e0ef27ee626af3d3efe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:23:58 +0000 Subject: [PATCH 85/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a1f9b40e251e612d47cca1b29341533084433513 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 15 Aug 2025 10:35:00 +0200 Subject: [PATCH 86/86] Fix build with FPC 3.2.4 --- skychart-4.3-fpc-3.2.4.patch | 15 +++++++++++++++ skychart.spec | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 skychart-4.3-fpc-3.2.4.patch diff --git a/skychart-4.3-fpc-3.2.4.patch b/skychart-4.3-fpc-3.2.4.patch new file mode 100644 index 0000000..f4b928c --- /dev/null +++ b/skychart-4.3-fpc-3.2.4.patch @@ -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 diff --git a/skychart.spec b/skychart.spec index 2af587f..25ef4a9 100644 --- a/skychart.spec +++ b/skychart.spec @@ -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}