From 722b535345b64e48b6d6feb845e0870f3b879a9e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 14 Mar 2016 18:48:10 +0100 Subject: [PATCH 01/24] Disable arm build on F23 due to incompatibilities with fpc 2.6 --- virtualplanet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index e980e05..27cb0da 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -36,7 +36,7 @@ Patch2: virtualplanet-wgetdata.patch # fpc isn't available on aarch64, ppc and s390 # so virtualplanet could not build -ExclusiveArch: %{ix86} %{arm} x86_64 +ExclusiveArch: %{ix86} x86_64 BuildRequires: desktop-file-utils From 71e39ca14a4f890630b435b2bca3dad13b78f129 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 2 Feb 2017 18:30:25 +0100 Subject: [PATCH 02/24] Upgrade to stable 2.0 and add appdata files --- .gitignore | 11 ++ generate-tarball.sh | 9 +- sources | 26 +++-- virtualplanet-data-historical.metainfo.xml | 10 ++ virtualplanet-fix-debuginfo.patch | 48 ++++----- virtualplanet.appdata.xml | 31 ++++++ virtualplanet.spec | 113 +++++++++++++++------ 7 files changed, 181 insertions(+), 67 deletions(-) create mode 100644 virtualplanet-data-historical.metainfo.xml create mode 100644 virtualplanet.appdata.xml 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 index 33bd250..0aad9de 100755 --- 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 From 4249510078e95901618a57af5d47db4f100fa0d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:08:10 +0000 Subject: [PATCH 03/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index dd07388..b6b5eef 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -210,6 +210,9 @@ fi %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 02 2017 Mattia Verga - 2.0-1 - Upgrade to stable 2.0 - Add appdata files From 423ce64f7823bf9c072aaf047a4b5833e6e4a074 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 12 Feb 2017 18:03:47 +0100 Subject: [PATCH 04/24] Exclude ppc64 from building architectures due to lazarus limitations --- virtualplanet.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index b6b5eef..cb407e7 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -53,6 +53,9 @@ Patch2: virtualplanet-wgetdata.patch ExclusiveArch: %{fpc_arches} +# fpc is available on ppc64, but lazarus has some limitations that +# prevents this package to build +ExcludeArch: ppc64 BuildRequires: desktop-file-utils @@ -210,6 +213,9 @@ fi %changelog +* Sun Feb 12 2017 Mattia Verga - 2.0-3 +- Set ExcludeArch ppc64 due to lazarus limitations + * Sat Feb 11 2017 Fedora Release Engineering - 2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From a16c9dfda5ad164e605eb6307aa9af2cd7c3fc58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:22:22 +0000 Subject: [PATCH 05/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index cb407e7..9b433fd 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.0 -Release: 3%{?dist} +Release: 4%{?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 @@ -213,6 +213,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Feb 12 2017 Mattia Verga - 2.0-3 - Set ExcludeArch ppc64 due to lazarus limitations From be8121411d53d374e3ec38f16fc49b3a9f77da69 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 29 Jul 2017 18:18:04 +0200 Subject: [PATCH 06/24] Change FPC compiler options to fix debuginfo package build --- virtualplanet.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 9b433fd..559ce23 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.0 -Release: 4%{?dist} +Release: 5%{?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 @@ -123,7 +123,7 @@ Historical addon textures for Virtual Planets Atlas # Virtualplanet doesn't like parallel building so we don't use macro. # Some components support passing options to fpc compiler # to generate debug info. -make fpcopts="-O1 -g -gl -OoREGVAR -Ch2000000 -CX -XX" +make fpcopts="-O1 -gw3 -fPIC" # Put additional catalogs files where required for installation %{__cp} -p %SOURCE2 ./BaseData @@ -160,6 +160,7 @@ make install install_data2 PREFIX=%{buildroot}%{_prefix} # Copy self created appdata files in buildroot %{__mkdir_p} %{buildroot}%{_datadir}/appdata %{__cp} -p %SOURCE19 %{buildroot}%{_datadir}/appdata +%{__mkdir_p} %{buildroot}%{_datadir}/appdata %{__cp} -p %SOURCE20 %{buildroot}%{_datadir}/appdata From 9d6d84f829b3062fe482c0905a76e939f53f43af Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 29 Jul 2017 18:20:13 +0200 Subject: [PATCH 07/24] Change metainfo.xml files location --- virtualplanet.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 559ce23..0aa6f3c 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -160,8 +160,8 @@ make install install_data2 PREFIX=%{buildroot}%{_prefix} # Copy self created appdata files in buildroot %{__mkdir_p} %{buildroot}%{_datadir}/appdata %{__cp} -p %SOURCE19 %{buildroot}%{_datadir}/appdata -%{__mkdir_p} %{buildroot}%{_datadir}/appdata -%{__cp} -p %SOURCE20 %{buildroot}%{_datadir}/appdata +%{__mkdir_p} %{buildroot}%{_datadir}/metainfo +%{__cp} -p %SOURCE20 %{buildroot}%{_datadir}/metainfo %check @@ -210,10 +210,14 @@ fi %files data-historical %{_datadir}/%{name}/Textures/*/Historical/ -%{_datadir}/appdata/%{name}-data-historical.metainfo.xml +%{_datadir}/metainfo/%{name}-data-historical.metainfo.xml %changelog +* Sat Jul 29 2017 Mattia Verga - 2.0-5 +- Change FPC compiler options to fix debuginfo package build +- Change metainfo.xml files location + * Thu Jul 27 2017 Fedora Release Engineering - 2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bf75b0d37f672b27d297dd3e4554df02c21ccd95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:05:37 +0000 Subject: [PATCH 08/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 0aa6f3c..1ae42ea 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.0 -Release: 5%{?dist} +Release: 6%{?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 @@ -214,6 +214,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Sat Jul 29 2017 Mattia Verga - 2.0-5 - Change FPC compiler options to fix debuginfo package build - Change metainfo.xml files location From 95bb619f77c41be240451be55e269979d62ea138 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 8 Dec 2017 13:09:05 +0100 Subject: [PATCH 09/24] Update to development version rev164 --- .gitignore | 1 + generate-tarball.sh | 4 +- sources | 2 +- virtualplanet-data-historical.metainfo.xml | 10 ----- virtualplanet.appdata.xml | 31 --------------- virtualplanet.spec | 38 +++++++------------ vpa-2.5-appdata.patch | 15 ++++++++ ...ginfo.patch => vpa-2.5-fix_debuginfo.patch | 34 ++++++++--------- 8 files changed, 50 insertions(+), 85 deletions(-) delete mode 100644 virtualplanet-data-historical.metainfo.xml delete mode 100644 virtualplanet.appdata.xml create mode 100644 vpa-2.5-appdata.patch rename virtualplanet-fix-debuginfo.patch => vpa-2.5-fix_debuginfo.patch (75%) diff --git a/.gitignore b/.gitignore index 416a4ef..02ee5ec 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /VPA_Base_Texture_Io.tgz /VPA_Base_Texture_Jupiter_Historical.tgz /VPA_Base_Texture_Jupiter.tgz +/virtualplanet-2.5-src-164-nopatents.tar.xz diff --git a/generate-tarball.sh b/generate-tarball.sh index 0aad9de..d391216 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -3,8 +3,8 @@ VERSION=$1 REVISION=$2 -tar -xJvf virtualplanet-$VERSION-src.tar.xz -#svn export -r $REVISION svn://svn.code.sf.net/p/virtualplanet/code/trunk virtualplanet-$VERSION-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 diff --git a/sources b/sources index 9bf8913..2421e42 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -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 @@ -16,3 +15,4 @@ SHA512 (VPA_Base_Texture_Mars.tgz) = b39a3a0bee23e638fd761be38cb9a59fd359f95a29d SHA512 (VPA_Base_Texture_Mercury_Historical.tgz) = ba24332f3e0711a1051802a1b7186ffa054104a8cbb27b892a1659f465af9a18a76dbfc304f7c303342eb41ba7f04d5c401bb218233d4fc653aa434abf7140e9 SHA512 (VPA_Base_Texture_Mercury.tgz) = bde3b586f172fad264f61ae301f1ffebb9ce50a4272e22139d6b31a8b8619cd102f4c21a211b8ce4e0f23fe10e1598c0d7f6562eaaf7e1708be7007b752f613b SHA512 (VPA_Base_Texture_Venus.tgz) = 72f9dbcb84a21f20a47215616235494b1b4571ce9098641c2519bfd7971fa085e4a5dd6187352e390b2f3b23c1ba4b5ab9bfb0c2c0b85e4ab59e0b31d1b2c7b3 +SHA512 (virtualplanet-2.5-src-164-nopatents.tar.xz) = 83476fa6138b640b774a005901cb816767843ce14e203c88868f1939449f61f388b62264bd3768036fd6c40ba7f9fb91463568484f57e1ac655855c39dbcdce7 diff --git a/virtualplanet-data-historical.metainfo.xml b/virtualplanet-data-historical.metainfo.xml deleted file mode 100644 index d600975..0000000 --- a/virtualplanet-data-historical.metainfo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - virtualplanet-data-historical - virtualplanet.desktop - Historical textures - Historical addon textures for Virtual Planets Atlas. - - CC0-1.0 - Public Domain - diff --git a/virtualplanet.appdata.xml b/virtualplanet.appdata.xml deleted file mode 100644 index d0409c6..0000000 --- a/virtualplanet.appdata.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 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 1ae42ea..e5e5760 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -1,8 +1,8 @@ -%global revision 159 +%global revision 164 Name: virtualplanet -Version: 2.0 -Release: 6%{?dist} +Version: 2.5 +Release: 1.%{revision}svn%{?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 @@ -34,22 +34,20 @@ Source16: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_T 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 # This patch changes options in Makefiles to avoid stripping # executables and to enable debug info # Fedora specific, not reported upstream -Patch1: virtualplanet-fix-debuginfo.patch +Patch1: vpa-2.5-fix_debuginfo.patch # Virtualplanet use wget to download source data # We disable that and use source files # Fedora specific, not reported upstream -Patch2: virtualplanet-wgetdata.patch +Patch2: virtualplanet-wgetdata.patch + +# Appdata files are present in sources but not installed +Patch99: vpa-2.5-appdata.patch ExclusiveArch: %{fpc_arches} @@ -65,7 +63,6 @@ BuildRequires: fpc BuildRequires: lazarus >= 1.6.2 BuildRequires: libappstream-glib -BuildRequires: pkgconfig BuildRequires: pkgconfig(glu) Requires: %{name}-data-base = %{version}-%{release} @@ -110,11 +107,7 @@ BuildArch: noarch Historical addon textures for Virtual Planets Atlas %prep -%setup -q -n %{name}-%{version}-src - -%patch1 -p1 - -%patch2 -p1 +%autosetup -p1 -n %{name}-%{version}-src %build @@ -157,19 +150,13 @@ make install install_data2 PREFIX=%{buildroot}%{_prefix} # 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 -%{__mkdir_p} %{buildroot}%{_datadir}/metainfo -%{__cp} -p %SOURCE20 %{buildroot}%{_datadir}/metainfo - %check # Menu entry desktop-file-validate %{buildroot}%{_datadir}/applications/virtualplanet.desktop # Appdata file check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -191,7 +178,7 @@ fi %doc %{_datadir}/doc/%{name} %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.appdata.xml %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/*/*/*/%{name}.png %dir %{_datadir}/%{name} @@ -214,6 +201,9 @@ fi %changelog +* Fri Dec 08 2017 Mattia Verga - 2.5-1.164svn +- Update to development version rev164 + * Thu Aug 03 2017 Fedora Release Engineering - 2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/vpa-2.5-appdata.patch b/vpa-2.5-appdata.patch new file mode 100644 index 0000000..c412596 --- /dev/null +++ b/vpa-2.5-appdata.patch @@ -0,0 +1,15 @@ +diff -U 3 -dHrN -- b/install.sh c/install.sh +--- b/install.sh 2017-12-08 12:00:22.214368073 +0100 ++++ c/install.sh 2017-12-08 12:36:35.288840230 +0100 +@@ -22,8 +22,11 @@ + install -m 755 -d $destdir/share/icons/hicolor + install -m 755 -d $destdir/share/icons/hicolor/48x48 + install -m 755 -d $destdir/share/icons/hicolor/48x48/apps ++install -m 755 -d $destdir/share/metainfo + + install -v -m 755 vpa/vpa $destdir/bin/virtualplanet ++install -v -m 644 Installer/Linux/vpa/share/appdata/virtualplanet.appdata.xml $destdir/share/metainfo/virtualplanet.appdata.xml ++install -v -m 644 Installer/Linux/vpa/share/appdata/virtualplanet-data-historical.metainfo.xml $destdir/share/metainfo/virtualplanet-data-historical.metainfo.xml + 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 --git a/virtualplanet-fix-debuginfo.patch b/vpa-2.5-fix_debuginfo.patch similarity index 75% rename from virtualplanet-fix-debuginfo.patch rename to vpa-2.5-fix_debuginfo.patch index 42d1778..2514f29 100644 --- a/virtualplanet-fix-debuginfo.patch +++ b/vpa-2.5-fix_debuginfo.patch @@ -1,54 +1,54 @@ 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 2017-01-22 10:44:15.684208022 +0100 +--- a/component/enhedits/Makefile.in 2017-12-08 10:23:59.000000000 +0100 ++++ b/component/enhedits/Makefile.in 2017-12-08 11:58:55.225430356 +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) ./ includedir=./ --options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX -+options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -g -gl +-options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi ++options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -gw3 -fPIC [target] units=enhedit.pas 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 2017-01-22 10:44:39.860251030 +0100 +--- a/component/glscene/Packages/Makefile.in 2017-12-08 11:22:07.000000000 +0100 ++++ b/component/glscene/Packages/Makefile.in 2017-12-08 11:58:35.506223869 +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) . + unitdir=../Source ../Source/Basis ../Source/FileFormats ../Source/SoundVideoAPIs ../Source/GameAPIs ../Source/Shaders $(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) . includedir=../Source -options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -Xs -CX -XX -+options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -CX -XX -g -gl ++options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -CX -XX -gw3 -fPIC [target] units=GLScene_RunTime.pas 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 2017-01-22 10:45:05.155804896 +0100 +--- a/component/libsql/Makefile.in 2017-12-08 10:23:59.000000000 +0100 ++++ b/component/libsql/Makefile.in 2017-12-08 11:59:11.150597116 +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)/ ./ includedir=./ --options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX -+options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -g -gl +-options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi ++options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi -gw3 -fPIC [target] units=libsql.pas 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 ++++ b/component/Makefile.in 2017-12-08 11:59:55.628079274 +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 ++options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -gw3 -fPIC [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 2017-01-22 10:45:33.795904046 +0100 ++++ b/install.sh 2017-12-08 12:00:22.214368073 +0100 @@ -23,7 +23,7 @@ install -m 755 -d $destdir/share/icons/hicolor/48x48 install -m 755 -d $destdir/share/icons/hicolor/48x48/apps @@ -60,13 +60,13 @@ diff -U 3 -dHrN -- a/install.sh b/install.sh install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/icons/hicolor/48x48/apps/virtualplanet.png 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 ++++ b/vpa/Makefile.in 2017-12-08 12:00:41.400576487 +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 ++options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -CX -XX -gw3 -fPIC 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] From 94f936a47b01196406e573621d44f518c32248ad Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 8 Dec 2017 13:15:54 +0100 Subject: [PATCH 10/24] Tweak lazarus requirement --- virtualplanet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index e5e5760..318df38 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -10,7 +10,7 @@ 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 2.0 159 +# ./generate-tarball.sh 2.0 164 Source0: %{name}-%{version}-src-%{revision}-nopatents.tar.xz Source1: generate-tarball.sh # Base data @@ -60,7 +60,7 @@ BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: gtk2-devel BuildRequires: fpc -BuildRequires: lazarus >= 1.6.2 +BuildRequires: lazarus >= 1.6.4 BuildRequires: libappstream-glib BuildRequires: pkgconfig(glu) From 5db1a477134a772bc86bb754e0ffd293e478046e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 8 Dec 2017 16:02:17 +0100 Subject: [PATCH 11/24] Exclude arm architecture, due to GLScene component not compatible with arm --- virtualplanet.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 318df38..0cdc182 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -53,7 +53,8 @@ Patch99: vpa-2.5-appdata.patch ExclusiveArch: %{fpc_arches} # fpc is available on ppc64, but lazarus has some limitations that # prevents this package to build -ExcludeArch: ppc64 +# virtualplanet cannot be built on arm due to incompatibile GLScene component +ExcludeArch: ppc64 %{arm} BuildRequires: desktop-file-utils @@ -203,6 +204,7 @@ fi %changelog * Fri Dec 08 2017 Mattia Verga - 2.5-1.164svn - Update to development version rev164 +- Exclude arm architectures due to component not compatible with arm * Thu Aug 03 2017 Fedora Release Engineering - 2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From bf807fcdc1cd3d92879eb1c19525c6096eb8fb34 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:47:15 +0100 Subject: [PATCH 12/24] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- virtualplanet.spec | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 0cdc182..f3f682e 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 1.%{revision}svn%{?dist} +Release: 2.%{revision}svn%{?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 @@ -159,21 +159,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/virtualplanet.desktop # Appdata file check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-desktop-database &> /dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi -/usr/bin/update-desktop-database &> /dev/null || : - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files %license gpl-3.0.txt LICENSE %doc %{_datadir}/doc/%{name} @@ -202,6 +187,9 @@ fi %changelog +* Thu Jan 18 2018 Igor Gnatenko - 2.5-2.164svn +- Remove obsolete scriptlets + * Fri Dec 08 2017 Mattia Verga - 2.5-1.164svn - Update to development version rev164 - Exclude arm architectures due to component not compatible with arm From d51fe899b627349a3df90fef50eaa0b78867bcac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:35:07 +0000 Subject: [PATCH 13/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index f3f682e..25dbbd8 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 2.%{revision}svn%{?dist} +Release: 3.%{revision}svn%{?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 @@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.5-3.164svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 2.5-2.164svn - Remove obsolete scriptlets From 6ee3a6797d4830ecb5fbddddff7ffc0ad4d0306c Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 25 Feb 2018 11:18:29 +0100 Subject: [PATCH 14/24] Rebuild for FPC 3.0.4 / Lazarus 1.8.0 --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 25dbbd8..b7b21fa 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 3.%{revision}svn%{?dist} +Release: 4.%{revision}svn%{?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 @@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Sun Feb 25 2018 Mattia Verga - 2.5-4.164svn +- Rebuild for fpc 3.0.4 and lazarus 1.8 + * Fri Feb 09 2018 Fedora Release Engineering - 2.5-3.164svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 11f031545a06349418f53ee831c39c2ba2a443c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:35:52 +0000 Subject: [PATCH 15/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index b7b21fa..4620784 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 4.%{revision}svn%{?dist} +Release: 5.%{revision}svn%{?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 @@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.5-5.164svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 25 2018 Mattia Verga - 2.5-4.164svn - Rebuild for fpc 3.0.4 and lazarus 1.8 From 55a8128c8f4db580035f8e981c0eed3162c3fce2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:22:07 +0000 Subject: [PATCH 16/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 4620784..ef439b5 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 5.%{revision}svn%{?dist} +Release: 6.%{revision}svn%{?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 @@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.5-6.164svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.5-5.164svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 559dc386cc0047efc09c171784513279303ba4ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:04:56 +0000 Subject: [PATCH 17/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index ef439b5..1964716 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 6.%{revision}svn%{?dist} +Release: 7.%{revision}svn%{?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 @@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.5-7.164svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.5-6.164svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 781c0a45d93707dabfb30ec758f91289273f14cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:16:34 +0000 Subject: [PATCH 18/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 1964716..80fdef0 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 7.%{revision}svn%{?dist} +Release: 8.%{revision}svn%{?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 @@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.5-8.164svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2.5-7.164svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7deea546030b814d73d9a294e3a78fc367dccf77 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 1 Feb 2020 13:25:10 +0100 Subject: [PATCH 19/24] Add libxxf86vm to BuildRequires --- virtualplanet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 80fdef0..b11c298 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 8.%{revision}svn%{?dist} +Release: 9.%{revision}svn%{?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 @@ -65,6 +65,7 @@ BuildRequires: lazarus >= 1.6.4 BuildRequires: libappstream-glib BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(xxf86vm) Requires: %{name}-data-base = %{version}-%{release} # Virtualplanet requires libpasastro to function properly @@ -187,6 +188,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Sat Feb 01 2020 Mattia Verga - 2.5-9.164svn +- Add libxxf86vm to BR + * Fri Jan 31 2020 Fedora Release Engineering - 2.5-8.164svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 88ce7c8bd710639c693406229b82891cd8a6e331 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 1 Feb 2020 14:00:50 +0100 Subject: [PATCH 20/24] Disable build on arm, aarch and ppc64le --- virtualplanet.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index b11c298..a9a85f9 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -51,10 +51,8 @@ Patch99: vpa-2.5-appdata.patch ExclusiveArch: %{fpc_arches} -# fpc is available on ppc64, but lazarus has some limitations that -# prevents this package to build -# virtualplanet cannot be built on arm due to incompatibile GLScene component -ExcludeArch: ppc64 %{arm} +# virtualplanet cannot be built on these arches due to incompatibile GLScene component +ExcludeArch: ppc64le %{arm} aarch64 BuildRequires: desktop-file-utils @@ -190,6 +188,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog * Sat Feb 01 2020 Mattia Verga - 2.5-9.164svn - Add libxxf86vm to BR +- Disable arm, aarch64 and ppc64le * Fri Jan 31 2020 Fedora Release Engineering - 2.5-8.164svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8e0985f0eb55278cdb66385841ccf082ae211d01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:48:15 +0000 Subject: [PATCH 21/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index a9a85f9..cedc17c 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 9.%{revision}svn%{?dist} +Release: 10.%{revision}svn%{?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 @@ -186,6 +186,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.5-10.164svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Feb 01 2020 Mattia Verga - 2.5-9.164svn - Add libxxf86vm to BR - Disable arm, aarch64 and ppc64le From 4da4228c631418139502b96b847c0bda704ba1e3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:44:04 +0000 Subject: [PATCH 22/24] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- virtualplanet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/virtualplanet.spec b/virtualplanet.spec index cedc17c..28d485a 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -55,6 +55,7 @@ ExclusiveArch: %{fpc_arches} ExcludeArch: ppc64le %{arm} aarch64 +BuildRequires: make BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: gtk2-devel From 53447f3910bdc55652a285374e8126118c76c73f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:09:55 +0000 Subject: [PATCH 23/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virtualplanet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtualplanet.spec b/virtualplanet.spec index 28d485a..0aa78ce 100644 --- a/virtualplanet.spec +++ b/virtualplanet.spec @@ -2,7 +2,7 @@ Name: virtualplanet Version: 2.5 -Release: 10.%{revision}svn%{?dist} +Release: 11.%{revision}svn%{?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 @@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.5-11.164svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.5-10.164svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7e7a221ea6517d6536164b982cfa907d7ee5ead1 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 18 Apr 2021 09:29:59 +0200 Subject: [PATCH 24/24] Package has become unusable, see upstream bug https://www.ap-i.net/mantis/view.php?id=1977 --- .gitignore | 20 --- dead.package | 1 + generate-tarball.sh | 16 --- sources | 18 --- virtualplanet-wgetdata.patch | 39 ----- virtualplanet.spec | 271 ----------------------------------- vpa-2.5-appdata.patch | 15 -- vpa-2.5-fix_debuginfo.patch | 72 ---------- 8 files changed, 1 insertion(+), 451 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100755 generate-tarball.sh delete mode 100644 sources delete mode 100644 virtualplanet-wgetdata.patch delete mode 100644 virtualplanet.spec delete mode 100644 vpa-2.5-appdata.patch delete mode 100644 vpa-2.5-fix_debuginfo.patch diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 02ee5ec..0000000 --- a/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -/VPA_Base_JPLeph.tgz -/VPA_Base_Overlay.tgz -/VPA_Base_Texture_Mars.tgz -/VPA_Base_Texture_Mars_Historical.tgz -/VPA_Base_Texture_Mercury.tgz -/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 -/virtualplanet-2.5-src-164-nopatents.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..bc44c3b --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package has become unusable, see upstream bug https://www.ap-i.net/mantis/view.php?id=1977 diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index d391216..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -VERSION=$1 -REVISION=$2 - -#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-$REVISION-nopatents.tar.xz virtualplanet-$VERSION-src - -#Remove temporary directory -rm -rf virtualplanet-$VERSION-src diff --git a/sources b/sources deleted file mode 100644 index 2421e42..0000000 --- a/sources +++ /dev/null @@ -1,18 +0,0 @@ -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 -SHA512 (virtualplanet-2.5-src-164-nopatents.tar.xz) = 83476fa6138b640b774a005901cb816767843ce14e203c88868f1939449f61f388b62264bd3768036fd6c40ba7f9fb91463568484f57e1ac655855c39dbcdce7 diff --git a/virtualplanet-wgetdata.patch b/virtualplanet-wgetdata.patch deleted file mode 100644 index a1b193a..0000000 --- a/virtualplanet-wgetdata.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -U 3 -H -d -r -N -- b/install_data.sh c/install_data.sh ---- b/install_data.sh 2015-12-04 08:57:53.399335129 +0100 -+++ c/install_data.sh 2015-12-04 20:59:02.939336490 +0100 -@@ -7,9 +7,6 @@ - pkg=$1.tgz - ddir=$2 - pkgz=BaseData/$pkg -- if [ ! -e $pkgz ]; then -- wget http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/$pkg/download -O $pkgz -- fi - tar xvzf $pkgz -C $ddir - } - -diff -U 3 -H -d -r -N -- b/install_data2.sh c/install_data2.sh ---- b/install_data2.sh 2015-12-04 08:57:53.352329188 +0100 -+++ c/install_data2.sh 2015-12-05 10:26:58.614432433 +0100 -@@ -7,9 +7,6 @@ - pkg=$1.tgz - ddir=$2 - pkgz=BaseData/$pkg -- if [ ! -e $pkgz ]; then -- wget http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/$pkg/download -O $pkgz -- fi - tar xvzf $pkgz -C $ddir - } - -diff -U 3 -H -d -r -N -- b/install_data3.sh c/install_data3.sh ---- b/install_data3.sh 2015-12-04 08:57:53.399335129 +0100 -+++ c/install_data3.sh 2015-12-04 09:02:26.018902207 +0100 -@@ -7,9 +7,6 @@ - pkg=$1.tgz - ddir=$2 - pkgz=BaseData/$pkg -- if [ ! -e $pkgz ]; then -- wget http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/$pkg/download -O $pkgz -- fi - tar xvzf $pkgz -C $ddir - } - diff --git a/virtualplanet.spec b/virtualplanet.spec deleted file mode 100644 index 0aa78ce..0000000 --- a/virtualplanet.spec +++ /dev/null @@ -1,271 +0,0 @@ -%global revision 164 - -Name: virtualplanet -Version: 2.5 -Release: 11.%{revision}svn%{?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 -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 2.0 164 -Source0: %{name}-%{version}-src-%{revision}-nopatents.tar.xz -Source1: generate-tarball.sh -# 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 - - -# Virtualplanet doesn't support set FPC options from command line -# This patch changes options in Makefiles to avoid stripping -# executables and to enable debug info -# Fedora specific, not reported upstream -Patch1: vpa-2.5-fix_debuginfo.patch - -# Virtualplanet use wget to download source data -# We disable that and use source files -# Fedora specific, not reported upstream -Patch2: virtualplanet-wgetdata.patch - -# Appdata files are present in sources but not installed -Patch99: vpa-2.5-appdata.patch - - -ExclusiveArch: %{fpc_arches} -# virtualplanet cannot be built on these arches due to incompatibile GLScene component -ExcludeArch: ppc64le %{arm} aarch64 - - -BuildRequires: make -BuildRequires: desktop-file-utils -BuildRequires: dos2unix -BuildRequires: gtk2-devel -BuildRequires: fpc -BuildRequires: lazarus >= 1.6.4 -BuildRequires: libappstream-glib - -BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(xxf86vm) - -Requires: %{name}-data-base = %{version}-%{release} -# Virtualplanet requires libpasastro to function properly -# but rpm doesn't find this autorequire -Requires: libpasastro%{?_isa} - - -%description -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 - -%package doc -Summary: Documentation files for Virtual Planets Atlas -License: GFDL -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description doc -Documentation files for Virtual Planets Atlas - -%package data-base -Summary: Base data for Virtual Planets Atlas -License: Public Domain -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description data-base -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 -%autosetup -p1 -n %{name}-%{version}-src - - -%build -./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix} - -# Virtualplanet doesn't like parallel building so we don't use macro. -# Some components support passing options to fpc compiler -# to generate debug info. -make fpcopts="-O1 -gw3 -fPIC" - -# 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 %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 -# Install main program -make install PREFIX=%{buildroot}%{_prefix} - -# Install data files -make install install_data PREFIX=%{buildroot}%{_prefix} -make install install_data2 PREFIX=%{buildroot}%{_prefix} - -# For now we don't provide extra textures -# because they're over 1GB of data -#make install install_data3 PREFIX=%%{buildroot}%%{_prefix} - - -%check -# Menu entry -desktop-file-validate %{buildroot}%{_datadir}/applications/virtualplanet.desktop - -# Appdata file check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml - -%files -%license gpl-3.0.txt LICENSE -%doc %{_datadir}/doc/%{name} -%{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/metainfo/%{name}.appdata.xml -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/icons/*/*/*/%{name}.png -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/language/ - -%files doc -%license doc/fdl-1.3.txt doc/LICENSE -%doc %{_datadir}/%{name}/doc/ - -%files data-base -%{_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}/metainfo/%{name}-data-historical.metainfo.xml - - -%changelog -* Wed Jan 27 2021 Fedora Release Engineering - 2.5-11.164svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.5-10.164svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Feb 01 2020 Mattia Verga - 2.5-9.164svn -- Add libxxf86vm to BR -- Disable arm, aarch64 and ppc64le - -* Fri Jan 31 2020 Fedora Release Engineering - 2.5-8.164svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.5-7.164svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.5-6.164svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.5-5.164svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 25 2018 Mattia Verga - 2.5-4.164svn -- Rebuild for fpc 3.0.4 and lazarus 1.8 - -* Fri Feb 09 2018 Fedora Release Engineering - 2.5-3.164svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 2.5-2.164svn -- Remove obsolete scriptlets - -* Fri Dec 08 2017 Mattia Verga - 2.5-1.164svn -- Update to development version rev164 -- Exclude arm architectures due to component not compatible with arm - -* Thu Aug 03 2017 Fedora Release Engineering - 2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Sat Jul 29 2017 Mattia Verga - 2.0-5 -- Change FPC compiler options to fix debuginfo package build -- Change metainfo.xml files location - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Feb 12 2017 Mattia Verga - 2.0-3 -- Set ExcludeArch ppc64 due to lazarus limitations - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* 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 -- Use ExclusiveArch instead of ExcludeArch -- Correct license to reflect some components only MPLv1.1 - -* Fri Jan 22 2016 Mattia Verga - 1.0-6.20160119svn99 -- Update svn revision to fix ARM build -- Moved tests into %%check -- Added architecture to libpasastro dependency - -* Sun Dec 20 2015 Mattia Verga - 1.0-5.20151220svn -- Properly set ExcludeArch - -* Sun Dec 20 2015 Mattia Verga - 1.0-4.20151220svn -- Libraries are now in separate package libpasastro - -* Sat Dec 19 2015 Mattia Verga - 1.0-3.20151217svn -- Add mesa-libGLU-devel to buildrequire - -* Thu Dec 17 2015 Mattia Verga - 1.0-2.20151217svn -- Update svn version -- Add license to main package and to documentation -- Fix building library with optflags scriptlets - -* Fri Dec 04 2015 Mattia Verga - 1.0-1 -- Initial release diff --git a/vpa-2.5-appdata.patch b/vpa-2.5-appdata.patch deleted file mode 100644 index c412596..0000000 --- a/vpa-2.5-appdata.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -U 3 -dHrN -- b/install.sh c/install.sh ---- b/install.sh 2017-12-08 12:00:22.214368073 +0100 -+++ c/install.sh 2017-12-08 12:36:35.288840230 +0100 -@@ -22,8 +22,11 @@ - install -m 755 -d $destdir/share/icons/hicolor - install -m 755 -d $destdir/share/icons/hicolor/48x48 - install -m 755 -d $destdir/share/icons/hicolor/48x48/apps -+install -m 755 -d $destdir/share/metainfo - - install -v -m 755 vpa/vpa $destdir/bin/virtualplanet -+install -v -m 644 Installer/Linux/vpa/share/appdata/virtualplanet.appdata.xml $destdir/share/metainfo/virtualplanet.appdata.xml -+install -v -m 644 Installer/Linux/vpa/share/appdata/virtualplanet-data-historical.metainfo.xml $destdir/share/metainfo/virtualplanet-data-historical.metainfo.xml - 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 --git a/vpa-2.5-fix_debuginfo.patch b/vpa-2.5-fix_debuginfo.patch deleted file mode 100644 index 2514f29..0000000 --- a/vpa-2.5-fix_debuginfo.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -U 3 -dHrN -- a/component/enhedits/Makefile.in b/component/enhedits/Makefile.in ---- a/component/enhedits/Makefile.in 2017-12-08 10:23:59.000000000 +0100 -+++ b/component/enhedits/Makefile.in 2017-12-08 11:58:55.225430356 +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) ./ - includedir=./ --options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -+options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -gw3 -fPIC - - [target] - units=enhedit.pas -diff -U 3 -dHrN -- a/component/glscene/Packages/Makefile.in b/component/glscene/Packages/Makefile.in ---- a/component/glscene/Packages/Makefile.in 2017-12-08 11:22:07.000000000 +0100 -+++ b/component/glscene/Packages/Makefile.in 2017-12-08 11:58:35.506223869 +0100 -@@ -12,7 +12,7 @@ - unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET) - unitdir=../Source ../Source/Basis ../Source/FileFormats ../Source/SoundVideoAPIs ../Source/GameAPIs ../Source/Shaders $(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) . - includedir=../Source --options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -Xs -CX -XX -+options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -CX -XX -gw3 -fPIC - - [target] - units=GLScene_RunTime.pas -diff -U 3 -dHrN -- a/component/libsql/Makefile.in b/component/libsql/Makefile.in ---- a/component/libsql/Makefile.in 2017-12-08 10:23:59.000000000 +0100 -+++ b/component/libsql/Makefile.in 2017-12-08 11:59:11.150597116 +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)/ ./ - includedir=./ --options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi -+options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi -gw3 -fPIC - - [target] - units=libsql.pas -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-12-08 11:59:55.628079274 +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 -gw3 -fPIC - - [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 2017-12-08 12:00:22.214368073 +0100 -@@ -23,7 +23,7 @@ - install -m 755 -d $destdir/share/icons/hicolor/48x48 - install -m 755 -d $destdir/share/icons/hicolor/48x48/apps - --install -v -m 755 -s vpa/vpa $destdir/bin/virtualplanet -+install -v -m 755 vpa/vpa $destdir/bin/virtualplanet - 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 -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-12-08 12:00:41.400576487 +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 -gw3 -fPIC - 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]