From f2fc2cf49c83dae068e73ea229052abaca0c7601 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 5 Feb 2022 11:12:00 +0100 Subject: [PATCH] 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