[skychart] Make available additional star catalogs as subpackage

mattia mattia at fedoraproject.org
Sun May 5 09:03:34 UTC 2013


commit 63ff51d967c918b2da1c71d14e10ddd428fa8ed3
Author: Mattia Verga <mattia.verga at tiscali.it>
Date:   Sun May 5 09:02:49 2013 +0200

    Make available additional star catalogs as subpackage

 .gitignore    |    4 ++++
 skychart.spec |   39 +++++++++++++++++++++++++++++++++++++--
 sources       |    5 ++++-
 3 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 36f6959..210a7ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ skychart-3.0.1.6.tar.gz
 /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
+/catalog_wds.tgz
diff --git a/skychart.spec b/skychart.spec
index 9b21cf4..49a1f02 100644
--- a/skychart.spec
+++ b/skychart.spec
@@ -6,14 +6,18 @@ Release: 2%{?dist}
 Summary: Planetarium software for the advanced amateur astronomer
 License: GPLv2+
 URL: http://www.ap-i.net/skychart/
-Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.bz2
 # 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.8-2450
+Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.bz2
 Source1: generate-tarball.sh
+Source2: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_gcvs.tgz
+Source3: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_idx.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
 Patch1: skychart-3.8-strip.patch
 Patch2: skychart-wgetdata.patch
 
@@ -53,6 +57,16 @@ BuildArch:      noarch
 Documentation files from the official Skychart wiki provided
 within the program as an offline copy.
 
+%package data-stars
+Summary:        Additional star catalogs for Skychart
+License:        Public Domain
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description data-stars
+Additional star catalogs for Skychart. This package install all the standard
+stars catalog down to magnitude 12, variable and double stars:
+Tycho 2; General Catalogue of Variable Stars; Washington Double Stars; Sky2000.
 
 %prep
 %setup -q -n %{name}-%{version}-%{svnversion}-src
@@ -72,6 +86,12 @@ dos2unix -q -k tools/doc/releasenotes*.txt
 # Remove pre-compiled software quicksat.exe
 rm -R --force tools/data/quicksat
 
+# Put additional catalogs files where they should be for installation
+cp -p %SOURCE2 ./BaseData
+cp -p %SOURCE3 ./BaseData
+cp -p %SOURCE4 ./BaseData
+cp -p %SOURCE5 ./BaseData
+
 %build
 ./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix}
 
@@ -92,6 +112,9 @@ make install install_data PREFIX=%{buildroot}%{_prefix}
 # Install wiki documentation
 make install install_doc PREFIX=%{buildroot}%{_prefix}
 
+# Install additional catalogs
+make install install_cat1 PREFIX=%{buildroot}%{_prefix}
+
 # Fix multilib path
 [ %{_lib} = lib ] || mv %{buildroot}%{_prefix}/{lib,%{_lib}}
 
@@ -111,7 +134,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop
 %{_datadir}/icons/*
 %dir %{_datadir}/skychart
 %{_datadir}/skychart/data
-%{_datadir}/skychart/cat
+%{_datadir}/skychart/cat/DSoutlines
+%{_datadir}/skychart/cat/milkyway
+%{_datadir}/skychart/cat/ngc2000
+%{_datadir}/skychart/cat/RealSky
+%{_datadir}/skychart/cat/sac
+%{_datadir}/skychart/cat/xhip
 %{_datadir}/skychart/doc/html_doc
 %{_datadir}/skychart/doc/releasenotes*.txt
 %{_datadir}/skychart/doc/varobs
@@ -121,6 +149,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop
 %files doc
 %doc %{_datadir}/skychart/doc/wiki_doc
 
+%files data-stars
+%{_datadir}/skychart/cat/bsc5
+%{_datadir}/skychart/cat/gcvs
+%{_datadir}/skychart/cat/tycho2
+%{_datadir}/skychart/cat/wds
+
 %post
 /sbin/ldconfig
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -141,6 +175,7 @@ fi
 - 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 <mattia.verga at tiscali.it> - 3.8-1
 - Update to 3.8
diff --git a/sources b/sources
index 378bc22..b99cf42 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
-7cbb142fd82e9cc74509bbf6513a7a2f  skychart-3.8-2450-src-nopatents.tar.bz2
+3031ca90157c291bfdd5a841dc926e64  catalog_gcvs.tgz
+d0d475e4f7c8aea172247d4160562612  catalog_idx.tgz
+eb41098f194574662b147e4891ef261e  catalog_tycho2.tgz
+00d206019a86098d79c1e89b32103792  catalog_wds.tgz


More information about the scm-commits mailing list