diff --git a/skychart-wgetdata.patch b/skychart-wgetdata.patch index efd1b24..1dfa865 100644 --- a/skychart-wgetdata.patch +++ b/skychart-wgetdata.patch @@ -13,3 +13,32 @@ tar xvzf $pkgz -C $ddir } +--- a/install_cat1.orig.sh 2012-03-05 19:56:30.000000000 +0100 ++++ b/install_cat1.sh 2013-03-17 19:47:02.024214677 +0100 +@@ -6,9 +6,9 @@ + pkg=$1.tgz + ddir=$2 + pkgz=BaseData/$pkg +- if [ ! -e $pkgz ]; then +- wget http://sourceforge.net/projects/skychart/files/4-source_data/$pkg -O $pkgz +- fi ++# if [ ! -e $pkgz ]; then ++# wget http://sourceforge.net/projects/skychart/files/4-source_data/$pkg -O $pkgz ++# fi + tar xvzf $pkgz -C $ddir + } + +--- a/install_cat2.orig.sh 2012-03-05 19:56:30.000000000 +0100 ++++ b/install_cat2.sh 2013-03-17 19:47:02.024214677 +0100 +@@ -6,9 +6,9 @@ + pkg=$1.tgz + ddir=$2 + pkgz=BaseData/$pkg +- if [ ! -e $pkgz ]; then +- wget http://sourceforge.net/projects/skychart/files/4-source_data/$pkg -O $pkgz +- fi ++# if [ ! -e $pkgz ]; then ++# wget http://sourceforge.net/projects/skychart/files/4-source_data/$pkg -O $pkgz ++# fi + tar xvzf $pkgz -C $ddir + } diff --git a/skychart.spec b/skychart.spec index 49a1f02..aca8dde 100644 --- a/skychart.spec +++ b/skychart.spec @@ -2,7 +2,7 @@ Name: skychart Version: 3.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Planetarium software for the advanced amateur astronomer License: GPLv2+ URL: http://www.ap-i.net/skychart/ @@ -14,10 +14,19 @@ URL: http://www.ap-i.net/skychart/ # ./generate-tarball.sh 3.8-2450 Source0: %{name}-%{version}-%{svnversion}-src-nopatents.tar.bz2 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_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 +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_pgc.tgz +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 +Source11: http://sourceforge.net/projects/skychart/files/4-source_data/catalog_ocl.tgz + Patch1: skychart-3.8-strip.patch Patch2: skychart-wgetdata.patch @@ -66,7 +75,19 @@ 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. +Tycho 2; General Catalogue of Variable Stars; Washington Double Stars. + +%package data-dso +Summary: Additional Deep Sky Object catalogs for Skychart +License: Public Domain +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description data-dso +Additional DSO catalogs for Skychart. This package install all the standard +nebulae catalogs: New General Catalogue; Principal Galaxies Catalogue; +Lynds Bright Nebulae; Open Cluster Data; Globular Clusters in the Milky Way; +Galactic Planetary Nebulae. %prep %setup -q -n %{name}-%{version}-%{svnversion}-src @@ -91,6 +112,12 @@ 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 %build ./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix} @@ -114,6 +141,7 @@ make install install_doc PREFIX=%{buildroot}%{_prefix} # Install additional catalogs make install install_cat1 PREFIX=%{buildroot}%{_prefix} +make install install_cat2 PREFIX=%{buildroot}%{_prefix} # Fix multilib path [ %{_lib} = lib ] || mv %{buildroot}%{_prefix}/{lib,%{_lib}} @@ -136,7 +164,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop %{_datadir}/skychart/data %{_datadir}/skychart/cat/DSoutlines %{_datadir}/skychart/cat/milkyway -%{_datadir}/skychart/cat/ngc2000 +%{_datadir}/skychart/cat/ngc2000/*.idx %{_datadir}/skychart/cat/RealSky %{_datadir}/skychart/cat/sac %{_datadir}/skychart/cat/xhip @@ -150,10 +178,18 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop %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 +%{_datadir}/skychart/cat/bsc5 + +%files data-dso +%{_datadir}/skychart/cat/ngc2000/*.dat +%{_datadir}/skychart/cat/pgc +%{_datadir}/skychart/cat/lbn +%{_datadir}/skychart/cat/ocl +%{_datadir}/skychart/cat/gcm +%{_datadir}/skychart/cat/gpn %post /sbin/ldconfig @@ -171,6 +207,10 @@ fi %changelog +* Wed 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