From 7e2ef85b5792c9b62a1742b60f2e8f08ac8fbc94 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Oct 17 2017 13:02:36 +0000 Subject: Added subpackages for 4204-4207 index files --- diff --git a/.gitignore b/.gitignore index f3f615d..9865321 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,8 @@ /index-4217.fits /index-4218.fits /index-4219.fits +/astrometry-data-4204.tar.xz +/astrometry-data-4205.tar.xz +/astrometry-data-4206.tar.xz +/astrometry-data-4207.tar.xz +/astrometry-data-4208-4219.tar.xz diff --git a/astrometry-get-data.sh b/astrometry-get-data.sh new file mode 100755 index 0000000..ea27038 --- /dev/null +++ b/astrometry-get-data.sh @@ -0,0 +1,78 @@ +#!/bin/sh + +set -e +export XZ_OPT=-9 + +# 4204 series +mkdir -p astrometry-data-4204 +cd astrometry-data-4204 +wget -c http://data.astrometry.net/4200/LICENSE +for i in `seq -w 0 9` ; do + wget -c http://data.astrometry.net/4200/index-4204-0${i}.fits +done +for i in `seq -w 10 47` ; do + wget -c http://data.astrometry.net/4200/index-4204-${i}.fits +done +cd .. +#tar -cJf astrometry-data-4204.tar.xz astrometry-data-4204 + +# 4205 series +mkdir -p astrometry-data-4205 +cd astrometry-data-4205 +wget -c http://data.astrometry.net/4200/LICENSE +for i in `seq -w 0 9` ; do + wget -c http://data.astrometry.net/4200/index-4205-0${i}.fits +done +for i in `seq -w 10 11` ; do + wget -c http://data.astrometry.net/4200/index-4205-${i}.fits +done +cd .. +#tar -cJf astrometry-data-4205.tar.xz astrometry-data-4205 + +# 4206 series +mkdir -p astrometry-data-4206 +cd astrometry-data-4206 +wget -c http://data.astrometry.net/4200/LICENSE +for i in `seq -w 0 9` ; do + wget -c http://data.astrometry.net/4200/index-4206-0${i}.fits +done +for i in `seq -w 10 11` ; do + wget -c http://data.astrometry.net/4200/index-4206-${i}.fits +done +cd .. +#tar -cJf astrometry-data-4206.tar.xz astrometry-data-4206 + +# 4207 series +mkdir -p astrometry-data-4207 +cd astrometry-data-4207 +wget -c http://data.astrometry.net/4200/LICENSE +for i in `seq -w 0 9` ; do + wget -c http://data.astrometry.net/4200/index-4207-0${i}.fits +done +for i in `seq -w 10 11` ; do + wget -c http://data.astrometry.net/4200/index-4207-${i}.fits +done +cd .. +#tar -cJf astrometry-data-4207.tar.xz astrometry-data-4207 + +# 4208 - 4219 series in data subpackage +mkdir -p astrometry-data-4208-4219 +cd astrometry-data-4208-4219 +wget -c http://data.astrometry.net/4200/LICENSE +for i in `seq -w 8 9` ; do + wget -c http://data.astrometry.net/4200/index-420${i}.fits +done +for i in `seq -w 10 19` ; do + wget -c http://data.astrometry.net/4200/index-42${i}.fits +done +cd .. +tar -cJf astrometry-data-4208-4219.tar.xz astrometry-data-4208-4219 + +#Clean up +rm -rf astrometry-data-4204 +rm -rf astrometry-data-4205 +rm -rf astrometry-data-4206 +rm -rf astrometry-data-4207 +rm -rf astrometry-data-4208-4219 + + diff --git a/astrometry.spec b/astrometry.spec index e632dc8..98272df 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.72 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -48,20 +48,13 @@ URL: http://www.astrometry.net Source0: %{name}.net-%{version}-clean.tar.xz Source1: %{name}-generate-tarball.sh -# 2MASS data files -Source2: http://data.astrometry.net/4200/index-4208.fits -Source3: http://data.astrometry.net/4200/index-4209.fits -Source4: http://data.astrometry.net/4200/index-4210.fits -Source5: http://data.astrometry.net/4200/index-4211.fits -Source6: http://data.astrometry.net/4200/index-4212.fits -Source7: http://data.astrometry.net/4200/index-4213.fits -Source8: http://data.astrometry.net/4200/index-4214.fits -Source9: http://data.astrometry.net/4200/index-4215.fits -Source10: http://data.astrometry.net/4200/index-4216.fits -Source11: http://data.astrometry.net/4200/index-4217.fits -Source12: http://data.astrometry.net/4200/index-4218.fits -Source13: http://data.astrometry.net/4200/index-4219.fits - +# 2MASS data files, ./astrometry-get-data.sh +Source2: astrometry-data-4204.tar.xz +Source3: astrometry-data-4205.tar.xz +Source4: astrometry-data-4206.tar.xz +Source5: astrometry-data-4207.tar.xz +Source6: astrometry-data-4208-4219.tar.xz +Source7: astrometry-get-data.sh # Patches from Ole Streicher used on Debian to # * disable build of nonfree stuff removed from sources @@ -115,14 +108,61 @@ Other tools included in the astrometry package can do much more, like plotting astronomic information over solved images, convertion utilities or generate statistics from FITS images. + %package data -Summary: 2MASS catalog index files for astrometry (wide-field) +Summary: 2MASS catalog index files for astrometry (4208-4129, wide-field) License: GPLv2+ BuildArch: noarch Requires: %{name} = %{version}-%{release} +Provides: %{name}-data-4208-4219 = %{version}-%{release} %description data -2MASS index files 4208-4219 (wide-field) for astrometry. +2MASS index files 4208-4219 (wide-field, 30-2000 arcminutes) for astrometry. + + +%package data-4204 +Summary: 2MASS catalog index files (4204 series) for astrometry +License: GPLv2+ +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Enhances: %{name} + +%description data-4204 +2MASS index files (4204 series) with 8-11 arcminutes skymarks for astrometry. + + +%package data-4205 +Summary: 2MASS catalog index files (4205 series) for astrometry +License: GPLv2+ +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Enhances: %{name} + +%description data-4205 +2MASS index files (4205 series) with 11-16 arcminutes skymarks for astrometry. + + +%package data-4206 +Summary: 2MASS catalog index files (4206 series) for astrometry +License: GPLv2+ +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Enhances: %{name} + +%description data-4206 +2MASS index files (4206 series) with 16-22 arcminutes skymarks for astrometry. + + +%package data-4207 +Summary: 2MASS catalog index files (4207 series) for astrometry +License: GPLv2+ +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Enhances: %{name} + +%description data-4207 +2MASS index files (4207 series) with 22-30 arcminutes skymarks for astrometry. + %package devel Summary: Development files for %{name} @@ -148,7 +188,12 @@ Obsoletes: %{name}-python2 < %{version}-%{release} %prep -%autosetup -p1 -b0 -n %{name}.net-%{version} +%autosetup -p1 -n %{name}.net-%{version} +%setup -T -D -a 2 -n %{name}.net-%{version} +%setup -T -D -a 3 -n %{name}.net-%{version} +%setup -T -D -a 4 -n %{name}.net-%{version} +%setup -T -D -a 5 -n %{name}.net-%{version} +%setup -T -D -a 6 -n %{name}.net-%{version} # Fix Wrong FSF address - reported upstream # https://groups.google.com/forum/#!topic/astrometry/mCuyze3TOeM @@ -189,20 +234,6 @@ sed -i \ "s:%{buildroot}%{_prefix}/data:%{_datadir}/%{name}/data:" \ %{buildroot}/etc/astrometry.cfg -install -m0644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE4} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE5} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE6} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE7} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE8} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE9} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE10} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE11} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE12} %{buildroot}%{_datadir}/%{name}/data -install -m0644 %{SOURCE13} %{buildroot}%{_datadir}/%{name}/data - - # Rename generic named executables with known conflict pushd %{buildroot}%{_bindir} for exec in tabmerge tablist; do @@ -210,7 +241,6 @@ for exec in tabmerge tablist; do done popd - # Remove unuseful file rm -f %{buildroot}%{_docdir}/%{name}/report.txt @@ -228,6 +258,8 @@ find %{buildroot}/%{python2_sitearch}/%{name} -name '*.py' | xargs sed -i '1s|^# # LICENSE file is managed by %%license scriptlet rm -f %{buildroot}%{_docdir}/%{name}/LICENSE +# Install data files +install -m0644 astrometry-data*/*.fits %{buildroot}%{_datadir}/%{name}/data %check make test ARCH_FLAGS="%{optflags}" @@ -249,7 +281,26 @@ make test ARCH_FLAGS="%{optflags}" %config(noreplace) %{_sysconfdir}/astrometry.cfg %files data -%{_datadir}/astrometry/data/index-*.fits +%license astrometry-data-4208-4219/LICENSE +%{_datadir}/astrometry/data/index-4208.fits +%{_datadir}/astrometry/data/index-4209.fits +%{_datadir}/astrometry/data/index-421*.fits + +%files data-4204 +%license astrometry-data-4204/LICENSE +%{_datadir}/astrometry/data/index-4204*.fits + +%files data-4205 +%license astrometry-data-4205/LICENSE +%{_datadir}/astrometry/data/index-4205*.fits + +%files data-4206 +%license astrometry-data-4206/LICENSE +%{_datadir}/astrometry/data/index-4206*.fits + +%files data-4207 +%license astrometry-data-4207/LICENSE +%{_datadir}/astrometry/data/index-4207*.fits %files devel %{_includedir}/* @@ -264,6 +315,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/*.py %changelog +* Tue Oct 17 2017 Christian Dersch - 0.72-4 +- Added subpackages for 4204-4207 index files + * Mon Oct 16 2017 Christian Dersch - 0.72-3 - Added data subpackage containing the wide-field 2MASS indices diff --git a/sources b/sources index 626a8c7..4a1c43a 100644 --- a/sources +++ b/sources @@ -1,13 +1,6 @@ +SHA512 (astrometry-data-4204.tar.xz) = 23588b5107f392e9d6550f79c026bd1d7e75cb52a873069b39623b54b730297aa3b259649554a33756857dec630e40c1d6d393c466bb978956b81da1f29d6cfb +SHA512 (astrometry-data-4205.tar.xz) = ec9328e8e8211004ce12f101581d1775c03fa2c4335058dac7a15ebbc0f85c236b8a9e876b3c9ec27ba3df028a0a90a4bb7a5334d2a96dc32c1f93f095ec17a7 +SHA512 (astrometry-data-4206.tar.xz) = 870c3215174a788389f5a560b0c3bc0e1a2ad9bf3017d93f0639ca2872ff84677deb91b480b3dd6ee00adc13aa45e6a268c0155fb39bca2c690d139c8308257e +SHA512 (astrometry-data-4207.tar.xz) = e67781097bdd05ad5b1188649362327750acb3fd206373ce7c3a6c741d0eac13d53362e89dff355b409d19a40c5274323670780fe66d85a7100d87605ac532ff +SHA512 (astrometry-data-4208-4219.tar.xz) = 23acc8219b2ccb7a78a5f33a12e796a96a62b062e5293606690de435e2f2b36bb8587895c49ec317db70e108cf9d7a5b34169f99abafe91140880ec21a7d6ff3 SHA512 (astrometry.net-0.72-clean.tar.xz) = 856c49e8f893f0f02b8590db32b4881437f6c6f500a4c9d5a3fe2168fef3b2095cbb2c3a1189638f361911e4f92143fdd8c20dc5be344160da9d1f1e0efc136a -SHA512 (index-4208.fits) = 5c604675fd5b9db4bc0ff850edf3d550d41f1af41bdfaea250f7fcc8b41b9db2bb71f6cf3c2b5ef256c0209fffa1a77b562eb3f5fd8ba599d3dbc8a4e5261c87 -SHA512 (index-4209.fits) = db5363488620f981ff02990296cb60b15439dbfb5a587c268e9a14994a1fe4fae24c53fefbe34f601538f8305fbbed2b70e4e8dda0d9c1e0ff6719765b85275c -SHA512 (index-4210.fits) = ee1f955f785a944ad76416c4cf6ad905d0c398db37680313218d46991a413b9ee332e99f39ba8c6c7ea5a3baf83760f8baa800000d53ab2e19c7793b53039c06 -SHA512 (index-4211.fits) = 40b9aafc8c0cb668e4dd4fc644bc44f942c5ab4f18fd4aa3f2b0ff99cb13768a47adbece41df5f18e3560f01eca7f854aa366a097b59399ad0501273be3ca45a -SHA512 (index-4212.fits) = b5ade428d2693116b5299003b8d60ce9ca84fd773f0af4e4d85ee7a2879ba06ea1e2cd1daf35c37ea19b9c419a9ef43d9363e08d69d4e5856fe78fd8c1930d47 -SHA512 (index-4213.fits) = fc9dcc61e15490163a41e781683d8d8105a59b31115141d28494e5a1be54aa79622338b9395a57fd3dc0cf5a8eaf55dff78082f4614c35871ccaf0e0fee8bc7e -SHA512 (index-4214.fits) = 14ccf1f0ed1365f9aa1f76af301de626ffe9ec41270fe1a1a3fdb73c617c019f7a56713f1d29d2dc9921f95c4ab5c9f0aa62f88220905e6dcf7bf1b8f9838610 -SHA512 (index-4215.fits) = d7cc8569864f32a10ebf841e7456641de522ddc1786a5658eb9fc99ea3c737571f0d47543accf18d1a6d062e61f4fee230a95e07b39d51f7aebf5a56328df7fd -SHA512 (index-4216.fits) = ca410267dc8ed0171e1fbd43a831f11051b9f5227026b9563f095e88883b0f1c822f81a5d620a3ea5a4da821807b1fe0f52de1a7b4250c0ce57abee678f72621 -SHA512 (index-4217.fits) = 0aeed613d219c5abda097aa0546cda71717d181e7239788ff386194000c26596c2448de67e310f6e517fcfff8aa612bc938ff50570829caafedd8a7d1549d730 -SHA512 (index-4218.fits) = 5d020a5097343eef36e667ebee883be452abac2534c586b5ffdb4191029eeff336c1985d46cca50b9a3d3aa292755a631aff2552b4e5bb0669610961835dd484 -SHA512 (index-4219.fits) = 78386b8184a0a7c909d22e2baa583c67675d933221bf1b5f9651585b83e91f83d8201619f6d1b811503530d780c5d701cd62309040328950ff8368783a92a487