diff --git a/.gitignore b/.gitignore index 68da989..307e9be 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,20 @@ /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 +/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 +/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 +/skychart-4.3-4486-src-nopatents.tar.xz +/catalog_vdb.tgz +/skychart-4.3-4558-src-nopatents.tar.xz +/data_spicesun.tgz +/skychart-4.3-4630-src-nopatents.tar.xz +/skychart-4.3-4639-src-nopatents.tar.xz +/skychart-4.3-4719-src-nopatents.tar.xz +/skychart-4.3-4974-src-nopatents.tar.xz 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-4.1-nostrip.patch b/skychart-4.1-nostrip.patch deleted file mode 100644 index 572b3f5..0000000 --- a/skychart-4.1-nostrip.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 - --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 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 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 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-4.3-nostrip.patch b/skychart-4.3-nostrip.patch new file mode 100644 index 0000000..bd05df2 --- /dev/null +++ b/skychart-4.3-nostrip.patch @@ -0,0 +1,18 @@ +diff -udHrN -- a/install.sh b/install.sh +--- 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 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 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/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-3.11-noupdate.patch b/skychart-4.3-noupdatemenu.patch similarity index 51% rename from skychart-3.11-noupdate.patch rename to skychart-4.3-noupdatemenu.patch index 65fa87b..b3a13bd 100644 --- a/skychart-3.11-noupdate.patch +++ b/skychart-4.3-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 -udHrN -- a/skychart/Makefile.in b/skychart/Makefile.in +--- 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/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/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-4.1-satmessage.patch b/skychart-4.3-satmessage.patch similarity index 62% rename from skychart-4.1-satmessage.patch rename to skychart-4.3-satmessage.patch index a07454d..b3874cb 100644 --- a/skychart-4.1-satmessage.patch +++ b/skychart-4.3-satmessage.patch @@ -1,7 +1,7 @@ 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 @@ +--- 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; @@ -35,7 +35,7 @@ diff -U 3 -dHrN -- a/skychart/u_satellite.pas b/skychart/u_satellite.pas - 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.'); ++ 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; + procedure SatelliteList(y, m, startd, endd, maglimit, tle, tmpdir, diff --git a/skychart.rpmlintrc b/skychart.rpmlintrc new file mode 100644 index 0000000..fcd5453 --- /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/.*/.*\.dat') diff --git a/skychart.spec b/skychart.spec index 3a22eb5..25ef4a9 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,63 +1,74 @@ -%global svnversion 3792 +%global svnversion 4974 +%global date 20250303 +%global maj_ver 4.3 -Name: skychart -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/ +Name: skychart +Version: %{maj_ver}^%{date}.svn%{svnversion} +Release: %autorelease +Summary: Planetarium software for the advanced amateur astronomer +# bgrabitmap code is licensed LGPL-3.0-only WITH LGPL-3.0-linking-exception +License: GPL-2.0-or-later AND LGPL-3.0-only WITH LGPL-3.0-linking-exception +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 # - 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.1.1-3792 -Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.xz -Source1: generate-tarball.sh +# Download upstream tarball from +# https://sourceforge.net/projects/skychart/files/0-beta/ +# in the same directory of the script and run: +# ./generate-tarball.sh 4.3-4974 +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 +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.1-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.1-satmessage.patch +Patch: skychart-4.3-satmessage.patch # Disable software update menu item # This feature was asked upstream specifically for Fedora -Patch4: skychart-3.11-noupdate.patch +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} -# fpc is available on ppc64, but lazarus has some limitations that -# prevents this package to build -ExcludeArch: ppc64 +ExcludeArch: %{ix86} +BuildRequires: make BuildRequires: fpc -BuildRequires: lazarus +BuildRequires: fpc-src +BuildRequires: lazarus-lcl-nogui +BuildRequires: lazarus-lcl-qt5 +BuildRequires: lazarus-tools BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: gtk2-devel @@ -70,6 +81,14 @@ Requires: xdg-utils Requires: xplanet Recommends: openssl-libs +# Used for binary planetary ephemeris files +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 @@ -86,7 +105,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 @@ -96,7 +115,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 @@ -107,7 +126,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 @@ -117,50 +136,49 @@ 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: GPL-2.0-or-later +Provides: catgen = %{version}-%{release} + +%description catgen +Custom catalog builder for Skychart. + %prep -%setup0 -q -n %{name}-%{version}-%{svnversion}-src +%setup -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 - -# 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 +# Put additional catalogs files where are 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 +cp -p %SOURCE14 ./BaseData %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 @@ -179,35 +197,43 @@ 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.*.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 %license skychart/gpl.txt %doc %{_datadir}/doc/skychart/changelog %doc %{_datadir}/doc/skychart/copyright -%{_bindir}/* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/metainfo/%{name}.appdata.xml +%{_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 %{_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 - %files doc %doc %{_datadir}/skychart/doc/wiki_doc @@ -216,7 +242,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 @@ -226,246 +252,17 @@ 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}/skychart/cat/vdb +%{_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 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 - -* 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 +%autochangelog diff --git a/sources b/sources index c95fba2..c87be5e 100644 --- a/sources +++ b/sources @@ -9,4 +9,6 @@ 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 (catalog_vdb.tgz) = d3df026a2b5a1de6c41c7ec4202da48784d12a9a0adc6e6069a1b5f50b3beb6c80a66fd1be26fdf60fbbccbf32d392bffd0c020a867fe5d276231ecceaaa8528 +SHA512 (data_spicesun.tgz) = 6656d6dd089025cb4cbbb1a76e2a5ae219b1be4ee87d8ceb8ce6abff9d59ed813939928baed2bd8eb4a1a48ec374c76527a5e70e53584bc3612aa12002604706 +SHA512 (skychart-4.3-4974-src-nopatents.tar.xz) = 89e5c5c4294b5472b7640d094c498c5be1845616a8b9fd40a5e70b7defe268ddd86cf86e2454bb85dd00b3173fc162eceeddfba54c2cb4f9f0f6f83083b4d13b