diff --git a/.gitignore b/.gitignore index 11fe0ee..416a4ef 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,14 @@ /VPA_Base_Texture_Mercury_Historical.tgz /VPA_Base_Texture_Venus.tgz /virtualplanet-1.0-src-99-nopatents.tar.xz +/virtualplanet-2.0-src-159-nopatents.tar.xz +/VPA_Base_Texture_Callisto_Historical.tgz +/VPA_Base_Texture_Callisto.tgz +/VPA_Base_Texture_Europa_Historical.tgz +/VPA_Base_Texture_Europa.tgz +/VPA_Base_Texture_Ganymede_Historical.tgz +/VPA_Base_Texture_Ganymede.tgz +/VPA_Base_Texture_Io_Historical.tgz +/VPA_Base_Texture_Io.tgz +/VPA_Base_Texture_Jupiter_Historical.tgz +/VPA_Base_Texture_Jupiter.tgz diff --git a/generate-tarball.sh b/generate-tarball.sh old mode 100744 new mode 100755 index 33bd250..0aad9de --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -1,15 +1,16 @@ #!/bin/sh VERSION=$1 +REVISION=$2 -#tar -xJvf virtualplanet-$VERSION-src.tar.xz -svn export svn://svn.code.sf.net/p/virtualplanet/code/trunk virtualplanet-1.0-src +tar -xJvf virtualplanet-$VERSION-src.tar.xz +#svn export -r $REVISION svn://svn.code.sf.net/p/virtualplanet/code/trunk virtualplanet-$VERSION-src #Remove Mac and Windows stuff rm -rf virtualplanet-$VERSION-src/Installer/Mac rm -rf virtualplanet-$VERSION-src/Installer/Windows -tar -cJvf virtualplanet-$VERSION-src-nopatents.tar.xz virtualplanet-$VERSION-src +tar -cJvf virtualplanet-$VERSION-src-$REVISION-nopatents.tar.xz virtualplanet-$VERSION-src #Remove temporary directory -rm -rf virtualplanet-$VERSION-src \ No newline at end of file +rm -rf virtualplanet-$VERSION-src diff --git a/sources b/sources index 695256b..9bf8913 100644 --- a/sources +++ b/sources @@ -1,8 +1,18 @@ -be7c8fc693de748934ba4925a3ce9a7d VPA_Base_JPLeph.tgz -fd79516c4832e20a5b53d4785e13ae13 VPA_Base_Overlay.tgz -e6edbb3a8afad4252dc80ca273f73198 VPA_Base_Texture_Mars.tgz -e4b69b1a32d60950fbcf383e2e2aae2c VPA_Base_Texture_Mars_Historical.tgz -3a65d4257bda3923bb2185d3dfe4959b VPA_Base_Texture_Mercury.tgz -ed3acb3e5a392f6c5f266b035239f6b2 VPA_Base_Texture_Mercury_Historical.tgz -8a9aa516905044a889053f435fe581bd VPA_Base_Texture_Venus.tgz -a1de986d5445744138a32ebce7715503 virtualplanet-1.0-src-99-nopatents.tar.xz +SHA512 (virtualplanet-2.0-src-159-nopatents.tar.xz) = 68a37ac2928f0a52349bcb4ed2839dfb51a17c34d6fc238a7716a1bee143c30c8fb93ef051c668e01f8a487b96dd9fa6c056b7970581f10ca6ffd769e508dc0f +SHA512 (VPA_Base_JPLeph.tgz) = cddf3ba2ca62b85f0415f977a71757f06e6f11d5b6ecd47123e4506bfc2da49c85117f0c04032fcdc0df474219f08c4945b5b263985984c21cb2763b1f4989e7 +SHA512 (VPA_Base_Overlay.tgz) = 1f689a8c783b1a12241336b93a15f94f90fdb8be9d12a516df7d7cf09fd5d304ed3cafb0a8be48aa22ae9a831f08ebb7bb262dce27df0ab2a23ad64b9fee78fb +SHA512 (VPA_Base_Texture_Callisto_Historical.tgz) = b88d8827cda37567304f3a6ba25adaf2cb9a241e4b1e558222f8d7a4a971868a9323d80549410cc904563e1030914cd087289dc6c517e28f80ca4ba1b1bb6f48 +SHA512 (VPA_Base_Texture_Callisto.tgz) = fb13f771bddd9ef835b154dcfdb15fd0d6561121337650903c6acea011838c087c74d6113aaf236dcc9584817de79a62591f88012fefa1ce0a3e89eb7bb7c1e7 +SHA512 (VPA_Base_Texture_Europa_Historical.tgz) = ad0819a9e3c225e87f501e893fe8985fc6055651dcf4d4e49f5e14f8c3824232bf3a594724a22ae67a668331252a1b256bdf00a9d67d6ed11c7d27772776808a +SHA512 (VPA_Base_Texture_Europa.tgz) = 216e65f8124e84a2eb59cb4dba780e396edbd8ea63b2c660dacbf3c4090f8301da567e6adea2f66709ff3621d007185103d7206381441cfc521c9ee23e0506b7 +SHA512 (VPA_Base_Texture_Ganymede_Historical.tgz) = 7af4d60c78a692374e6a22cc3082ed43e49987f4d0d2e449feb4efc2e2c26444019645668e39f1ab56ce9560f01dee1338fe3e8fc1766abc1fafe4f862b836a7 +SHA512 (VPA_Base_Texture_Ganymede.tgz) = c34a09d6ee87d95aea24468fe4570ee022a9afdf45234caf9c33f9d2effe37ec6822d7dc9989fb3eee45d004f3255d871a0d52be77a3bdb3e6b74671ea573e77 +SHA512 (VPA_Base_Texture_Io_Historical.tgz) = 05adcda951073f3a9bf79362c35805643df24306d811cf581832ecd0b2261d55a5e56970a63fb81d38f4111dd10a33645cb220b28f8af70f77e88039db334a59 +SHA512 (VPA_Base_Texture_Io.tgz) = 78deadf70cf302ff557823653f0b54787253a37e837e3e5b9ed19f0ba00319fd4bb2cd8be19f937e934bda58ffc7279f97610d1b84cd09ce3959fc728fa92e44 +SHA512 (VPA_Base_Texture_Jupiter_Historical.tgz) = 692da2adb724f26681962a29aaba926f42fc11de6736c0b2d54e6482c63334c696ee0cb220d1ea445c566d2ab68305da53e74bcba9a5c4e2451d6f6dc846a671 +SHA512 (VPA_Base_Texture_Jupiter.tgz) = ceedc994c7de92d18392cb1a7a2a0355e8d69d8fe7d9c0a3bea75cbbfdf37258ca428f32308ed0133484d6e2e71ef266b17ae5f33a85a9b1c6df7a1e5cc7dc65 +SHA512 (VPA_Base_Texture_Mars_Historical.tgz) = 0fb07aa704fff8202df7acd14810b14beb4e25df485fd55b2d0f71f8d82fe9680cccf5a3805e06d01e392e50abd9026d4b62b1924b07fdf15d7c4b2fabb5ddab +SHA512 (VPA_Base_Texture_Mars.tgz) = b39a3a0bee23e638fd761be38cb9a59fd359f95a29d8fd885e02135108c998de118307a062e0c1da4a966f2f3d92707bbb4a6d623d043bef25af994c5a13375c +SHA512 (VPA_Base_Texture_Mercury_Historical.tgz) = ba24332f3e0711a1051802a1b7186ffa054104a8cbb27b892a1659f465af9a18a76dbfc304f7c303342eb41ba7f04d5c401bb218233d4fc653aa434abf7140e9 +SHA512 (VPA_Base_Texture_Mercury.tgz) = bde3b586f172fad264f61ae301f1ffebb9ce50a4272e22139d6b31a8b8619cd102f4c21a211b8ce4e0f23fe10e1598c0d7f6562eaaf7e1708be7007b752f613b +SHA512 (VPA_Base_Texture_Venus.tgz) = 72f9dbcb84a21f20a47215616235494b1b4571ce9098641c2519bfd7971fa085e4a5dd6187352e390b2f3b23c1ba4b5ab9bfb0c2c0b85e4ab59e0b31d1b2c7b3 diff --git a/virtualplanet-data-historical.metainfo.xml b/virtualplanet-data-historical.metainfo.xml new file mode 100644 index 0000000..d600975 --- /dev/null +++ b/virtualplanet-data-historical.metainfo.xml @@ -0,0 +1,10 @@ + + + virtualplanet-data-historical + virtualplanet.desktop + Historical textures + Historical addon textures for Virtual Planets Atlas. + + CC0-1.0 + Public Domain + diff --git a/virtualplanet-fix-debuginfo.patch b/virtualplanet-fix-debuginfo.patch index 388ddd3..42d1778 100644 --- a/virtualplanet-fix-debuginfo.patch +++ b/virtualplanet-fix-debuginfo.patch @@ -1,18 +1,6 @@ -diff -U 3 -H -d -r -N -- a/component/Makefile.in b/component/Makefile.in ---- a/component/Makefile.in 2015-07-27 14:43:35.000000000 +0200 -+++ b/component/Makefile.in 2016-01-22 18:14:53.086016998 +0100 -@@ -21,7 +21,7 @@ - unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) - unitdir=uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET) libsql/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)/ ./ - includedir=./ --options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX -+options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -g -gl - - [clean] - files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \ -diff -U 3 -H -d -r -N -- a/component/enhedits/Makefile.in b/component/enhedits/Makefile.in +diff -U 3 -dHrN -- a/component/enhedits/Makefile.in b/component/enhedits/Makefile.in --- a/component/enhedits/Makefile.in 2015-07-27 14:43:35.000000000 +0200 -+++ b/component/enhedits/Makefile.in 2016-01-22 18:15:33.145576633 +0100 ++++ b/component/enhedits/Makefile.in 2017-01-22 10:44:15.684208022 +0100 @@ -12,7 +12,7 @@ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) unitdir=$(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/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ @@ -22,9 +10,9 @@ diff -U 3 -H -d -r -N -- a/component/enhedits/Makefile.in b/component/enhedits/M [target] units=enhedit.pas -diff -U 3 -H -d -r -N -- a/component/glscene/Packages/Makefile.in b/component/glscene/Packages/Makefile.in +diff -U 3 -dHrN -- a/component/glscene/Packages/Makefile.in b/component/glscene/Packages/Makefile.in --- a/component/glscene/Packages/Makefile.in 2015-07-27 14:43:35.000000000 +0200 -+++ b/component/glscene/Packages/Makefile.in 2016-01-22 18:15:59.114881792 +0100 ++++ b/component/glscene/Packages/Makefile.in 2017-01-22 10:44:39.860251030 +0100 @@ -12,7 +12,7 @@ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET) unitdir=../Source $(LAZDIR)/components/images/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/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . @@ -34,9 +22,9 @@ diff -U 3 -H -d -r -N -- a/component/glscene/Packages/Makefile.in b/component/gl [target] units=GLScene_RunTime.pas -diff -U 3 -H -d -r -N -- a/component/libsql/Makefile.in b/component/libsql/Makefile.in +diff -U 3 -dHrN -- a/component/libsql/Makefile.in b/component/libsql/Makefile.in --- a/component/libsql/Makefile.in 2015-07-27 14:43:35.000000000 +0200 -+++ b/component/libsql/Makefile.in 2016-01-22 18:16:25.451713948 +0100 ++++ b/component/libsql/Makefile.in 2017-01-22 10:45:05.155804896 +0100 @@ -12,7 +12,7 @@ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) unitdir=jansql/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ @@ -46,9 +34,21 @@ diff -U 3 -H -d -r -N -- a/component/libsql/Makefile.in b/component/libsql/Makef [target] units=libsql.pas -diff -U 3 -H -d -r -N -- a/install.sh b/install.sh +diff -U 3 -dHrN -- a/component/Makefile.in b/component/Makefile.in +--- a/component/Makefile.in 2015-07-27 14:43:35.000000000 +0200 ++++ b/component/Makefile.in 2017-01-22 10:43:46.610633252 +0100 +@@ -21,7 +21,7 @@ + unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) + unitdir=uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET) libsql/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)/ ./ + includedir=./ +-options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX ++options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -g -gl + + [clean] + files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \ +diff -U 3 -dHrN -- a/install.sh b/install.sh --- a/install.sh 2015-12-18 11:58:20.000000000 +0100 -+++ b/install.sh 2016-01-22 18:17:43.843327524 +0100 ++++ b/install.sh 2017-01-22 10:45:33.795904046 +0100 @@ -23,7 +23,7 @@ install -m 755 -d $destdir/share/icons/hicolor/48x48 install -m 755 -d $destdir/share/icons/hicolor/48x48/apps @@ -58,15 +58,15 @@ diff -U 3 -H -d -r -N -- a/install.sh b/install.sh install -v -m 644 Installer/Linux/vpa/share/applications/virtualplanet.desktop $destdir/share/applications/virtualplanet.desktop install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/pixmaps/virtualplanet.png install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/icons/hicolor/48x48/apps/virtualplanet.png -diff -U 3 -H -d -r -N -- a/vpa/Makefile.in b/vpa/Makefile.in ---- a/vpa/Makefile.in 2015-07-27 14:43:35.000000000 +0200 -+++ b/vpa/Makefile.in 2016-01-22 18:18:11.152131619 +0100 +diff -U 3 -dHrN -- a/vpa/Makefile.in b/vpa/Makefile.in +--- a/vpa/Makefile.in 2016-12-05 09:46:35.000000000 +0100 ++++ b/vpa/Makefile.in 2017-01-22 10:46:17.671417880 +0100 @@ -17,7 +17,7 @@ [compiler] unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) includedir=./ ../component/glscene/Source/ -options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -Xs -CX -XX +options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -CX -XX -g -gl - unitdir=../component/glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ $(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/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ + unitdir=../component/glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ $(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/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./ [clean] diff --git a/virtualplanet.appdata.xml b/virtualplanet.appdata.xml new file mode 100644 index 0000000..d0409c6 --- /dev/null +++ b/virtualplanet.appdata.xml @@ -0,0 +1,31 @@ + + + virtualplanet.desktop + CC0-1.0 + GPL-3.0+ + Virtualplanet + An atlas for planets surface formations + +

+ Virtual Planets Atlas displays surface information for planets + Jupiter, Mars, Venus and Mercury and for the major moons + of Jupiter. +

+

+ It is based on the interface of well known Virtual Moon Atlas. +

+ + + astronomy + atlas + planets + + + + http://ap-i.net/avp/_media/en/screenshot/frfullscreenwindow.jpg + Mars “Viking colors” Zoom at minimum / “Full screen” display + + + http://ap-i.net/avp/ + pch@ap-i.net + diff --git a/virtualplanet.spec b/virtualplanet.spec index e980e05..dd07388 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -1,9 +1,8 @@ -%global svnver 20160119svn99 -%global revision 99 +%global revision 159 Name: virtualplanet -Version: 1.0 -Release: 7.%{svnver}%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: An atlas for planets surface formations # Some component of glscene used by virtualplanet are licensed MPLv1.1 only License: GPLv3+ and MPLv1.1 @@ -11,16 +10,34 @@ URL: http://www.ap-i.net/avp/ # Virtual Planetary Atlas source contains Mac and Windows stuff # so we use a script to remove that before importing in Fedora. # Use this script to download svn version and clean it up: -# ./generate-tarball.sh 1.0 99 +# ./generate-tarball.sh 2.0 159 Source0: %{name}-%{version}-src-%{revision}-nopatents.tar.xz Source1: generate-tarball.sh -Source2: http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/VPA_Base_JPLeph.tgz -Source3: http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/VPA_Base_Texture_Mars.tgz -Source4: http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/VPA_Base_Texture_Mercury.tgz -Source5: http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/VPA_Base_Texture_Venus.tgz -Source6: http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/VPA_Base_Overlay.tgz -Source7: http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/VPA_Base_Texture_Mars_Historical.tgz -Source8: http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/VPA_Base_Texture_Mercury_Historical.tgz +# Base data +Source2: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_JPLeph.tgz +Source3: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Overlay.tgz +# Base textures +Source4: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Callisto.tgz +Source5: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Europa.tgz +Source6: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Ganymede.tgz +Source7: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Io.tgz +Source8: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Jupiter.tgz +Source9: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mars.tgz +Source10: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mercury.tgz +Source11: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Venus.tgz +# Historical textures +Source12: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Callisto_Historical.tgz +Source13: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Europa_Historical.tgz +Source14: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Ganymede_Historical.tgz +Source15: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Io_Historical.tgz +Source16: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Jupiter_Historical.tgz +Source17: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mars_Historical.tgz +Source18: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mercury_Historical.tgz + +# Appdata files - asked upstream to include in sources +Source19: virtualplanet.appdata.xml +Source20: virtualplanet-data-historical.metainfo.xml + # Virtualplanet doesn't support set FPC options from command line @@ -34,16 +51,16 @@ Patch1: virtualplanet-fix-debuginfo.patch # Fedora specific, not reported upstream Patch2: virtualplanet-wgetdata.patch -# fpc isn't available on aarch64, ppc and s390 -# so virtualplanet could not build -ExclusiveArch: %{ix86} %{arm} x86_64 + +ExclusiveArch: %{fpc_arches} BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: gtk2-devel BuildRequires: fpc -BuildRequires: lazarus +BuildRequires: lazarus >= 1.6.2 +BuildRequires: libappstream-glib BuildRequires: pkgconfig BuildRequires: pkgconfig(glu) @@ -56,7 +73,8 @@ Requires: libpasastro%{?_isa} %description Virtual Planets Atlas displays surface information for planets -Mars, Venus and Mercury. +Jupiter, Mars, Venus and Mercury and for the major moons +of Jupiter. It is based on the interface of well known Virtual Moon Atlas @@ -79,15 +97,23 @@ BuildArch: noarch Base data for Virtual Planets Atlas. It includes base textures, database and overlays +%package data-historical +Summary: Historical textures for Virtual Planets Atlas +License: Public Domain +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description data-historical +Historical addon textures for Virtual Planets Atlas + %prep -%setup -q -n %{name}-%{version}-src-%{revision} +%setup -q -n %{name}-%{version}-src %patch1 -p1 %patch2 -p1 - %build ./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix} @@ -97,13 +123,23 @@ database and overlays make fpcopts="-O1 -g -gl -OoREGVAR -Ch2000000 -CX -XX" # Put additional catalogs files 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 %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 +%{__cp} -p %SOURCE15 ./BaseData +%{__cp} -p %SOURCE16 ./BaseData +%{__cp} -p %SOURCE17 ./BaseData +%{__cp} -p %SOURCE18 ./BaseData %install @@ -114,15 +150,23 @@ make install PREFIX=%{buildroot}%{_prefix} make install install_data PREFIX=%{buildroot}%{_prefix} make install install_data2 PREFIX=%{buildroot}%{_prefix} -# For now we don't build extra textures +# For now we don't provide extra textures # because they're over 1GB of data #make install install_data3 PREFIX=%%{buildroot}%%{_prefix} +# Copy self created appdata files in buildroot +%{__mkdir_p} %{buildroot}%{_datadir}/appdata +%{__cp} -p %SOURCE19 %{buildroot}%{_datadir}/appdata +%{__cp} -p %SOURCE20 %{buildroot}%{_datadir}/appdata + %check # Menu entry desktop-file-validate %{buildroot}%{_datadir}/applications/virtualplanet.desktop +# Appdata file check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml + %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-desktop-database &> /dev/null || : @@ -143,26 +187,33 @@ fi %doc %{_datadir}/doc/%{name} %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/*/*/*/%{name}.png %dir %{_datadir}/%{name} %{_datadir}/%{name}/language/ -%dir %{_datadir}/%{name}/data -%{_datadir}/%{name}/data/country.tab -%{_datadir}/%{name}/data/retic.cur %files doc %license doc/fdl-1.3.txt doc/LICENSE %doc %{_datadir}/%{name}/doc/ %files data-base -%{_datadir}/%{name}/data/jpleph/ +%{_datadir}/%{name}/data/ %{_datadir}/%{name}/Database/ %{_datadir}/%{name}/Overlay/ %{_datadir}/%{name}/Textures/ +%exclude %{_datadir}/%{name}/Textures/*/Historical/ + +%files data-historical +%{_datadir}/%{name}/Textures/*/Historical/ +%{_datadir}/appdata/%{name}-data-historical.metainfo.xml %changelog +* Thu Feb 02 2017 Mattia Verga - 2.0-1 +- Upgrade to stable 2.0 +- Add appdata files + * Sat Mar 12 2016 Mattia Verga - 1.0-7.20160119svn99 - Fix directories ownership - Add update-desktop-database scripts