jdieter pushed to naev (f32). "Update to 0.8.2 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-02-28 18:11:54 UTC
From ad10aee57fc0db0cade57e19610569c331f6f01d Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter(a)gmail.com>
Date: Feb 28 2021 17:24:18 +0000
Subject: Update to 0.8.2
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
---
diff --git a/.gitignore b/.gitignore
index bea088c..0ee31a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/naev-0.6.0.tar.bz2
/naev-0.6.1.tar.bz2
/naev-0.7.0.tar.bz2
+/naev-nodata-0.8.2.tar.gz
diff --git a/naev.spec b/naev.spec
index 54279e9..b5499d0 100644
--- a/naev.spec
+++ b/naev.spec
@@ -1,13 +1,19 @@
-%define _legacy_common_support 1
-
Name: naev
-Version: 0.7.0
-Release: 13%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
Summary: 2d action, RPG space game
License: GPLv3
URL: http://naev.org
-Source: http://sourceforge.net/projects/naev/files/%{name}-%{version}/%{name}-%{v...
-BuildRequires: make
+# To build source without massive data files:
+# Download https://github.com/naev/naev/archive/v<version>/naev-<version>.tar.gz
+# Run:
+# $ tar -xvf naev-<version>.tar.gz
+# $ rm -rf naev-<version>/dat
+# $ mkdir naev-<version>/dat
+# $ mv naev-<version> naev-nodata-<version>
+# $ tar -czvf naev-nodata-<version>.tar.gz naev-nodata-<version>
+Source: %{name}-nodata-%{version}.tar.gz
+BuildRequires: meson
BuildRequires: gcc
BuildRequires: SDL2-devel
BuildRequires: SDL2_image-devel
@@ -37,46 +43,43 @@ ships, a large variety of equipment and a large galaxy to explore. The game is
highly open-ended, letting you proceed at your own pace.
%prep
-%setup -q -n %{name}-%{version}
+%autosetup -n %{name}-nodata-%{version}
# Remove built-in libraries
rm -rf lib/lua lib/csparse
-# Patch configure to use system cxsparse
-sed -i "s/\"\$have_csparse_lib\" = \"yes\" -a \"\$have_cxsparse_lib\" = \"yes\"/\"\$have_csparse_lib\" = \"yes\" -o \"\$have_cxsparse_lib\" = \"yes\""/g configure
-sed -i s/"-lcsparse -lcxsparse"/"-lcxsparse"/g configure
-# Patch configure for Fedora compat-lua
-sed -i 's/lua5\.1/lua-5.1/g' configure
-# Fix undefined reference to symbol 'vorbis_comment_query'
-sed -i 's/vorbisfile/& vorbis/g' configure
+# Patch meson.build for Fedora compat-lua
+sed -i 's/lua51/lua-5.1/g' meson.build
%build
-# note the ndata-path needs to point directly to the file
-%configure --with-ndata-path=%{_datadir}/%{name}/ndata-%{version}.zip --enable-lua=shared --disable-shave --enable-debug=no
-make %{?_smp_mflags}
+# Disabling luajit since the version in Fedora causes Naev to crash
+# Disabling C and LUA docs since those are only required if you're hacking on Naev
+%meson -Dluajit=disabled -Ddocs_c=disabled -Ddocs_lua=disabled
+%meson_build
%install
-make DESTDIR=%{buildroot} install
-
-# Copy high quality 256x256 icon rather than default 32x32
-rm -f %{buildroot}%{_datadir}/pixmaps/naev.png
-install -m 644 extras/logos/naev.png %{buildroot}%{_datadir}/pixmaps/naev.png
+%meson_install
-# docs get installed to wrong location
-rm -rf %{buildroot}%{_docdir}/naev
+sed -i '/<icon/d' %{buildroot}/%{_metainfodir}/*.metainfo.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.naev.naev.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml
%files
-%doc AUTHORS LICENSE README TODO
+%doc README
+%license LICENSE
%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
-%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/pixmaps/*.png
-%{_datadir}/naev/naev-confupdate.sh
+%{_metainfodir}/*.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/naev
%{_mandir}/man6/*
+%{_docdir}/naev
%changelog
+* Sat Feb 27 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.8.2-1
+- Update to 0.8.2
+- Obsolete naev-data since data is now part of the source
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index c54921c..d6894fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (naev-0.7.0.tar.bz2) = 9f8a2912e9f4f29ed6e276b008d4010da3ccdd309de5bb4360c393f2704aa7aff6e18db9e5d3657b4229e911ddec9b2a3312cf182c3c48a91a007a91138d84ae
+SHA512 (naev-nodata-0.8.2.tar.gz) = 1f1d1fe0a8bc107aefb297f905fc3597c268c39ffc4b8fa3f9541fb0969d618c00c340c1e7783cc3226fd7d0684224f5e32cd493ce217172d1ca99d474c33b3f
https://src.fedoraproject.org/rpms/naev/c/ad10aee57fc0db0cade57e19610569c...
3Â years, 2Â months
jdieter pushed to naev (f33). "Update to 0.8.2 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-02-28 18:11:29 UTC
From ad10aee57fc0db0cade57e19610569c331f6f01d Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter(a)gmail.com>
Date: Feb 28 2021 17:24:18 +0000
Subject: Update to 0.8.2
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
---
diff --git a/.gitignore b/.gitignore
index bea088c..0ee31a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/naev-0.6.0.tar.bz2
/naev-0.6.1.tar.bz2
/naev-0.7.0.tar.bz2
+/naev-nodata-0.8.2.tar.gz
diff --git a/naev.spec b/naev.spec
index 54279e9..b5499d0 100644
--- a/naev.spec
+++ b/naev.spec
@@ -1,13 +1,19 @@
-%define _legacy_common_support 1
-
Name: naev
-Version: 0.7.0
-Release: 13%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
Summary: 2d action, RPG space game
License: GPLv3
URL: http://naev.org
-Source: http://sourceforge.net/projects/naev/files/%{name}-%{version}/%{name}-%{v...
-BuildRequires: make
+# To build source without massive data files:
+# Download https://github.com/naev/naev/archive/v<version>/naev-<version>.tar.gz
+# Run:
+# $ tar -xvf naev-<version>.tar.gz
+# $ rm -rf naev-<version>/dat
+# $ mkdir naev-<version>/dat
+# $ mv naev-<version> naev-nodata-<version>
+# $ tar -czvf naev-nodata-<version>.tar.gz naev-nodata-<version>
+Source: %{name}-nodata-%{version}.tar.gz
+BuildRequires: meson
BuildRequires: gcc
BuildRequires: SDL2-devel
BuildRequires: SDL2_image-devel
@@ -37,46 +43,43 @@ ships, a large variety of equipment and a large galaxy to explore. The game is
highly open-ended, letting you proceed at your own pace.
%prep
-%setup -q -n %{name}-%{version}
+%autosetup -n %{name}-nodata-%{version}
# Remove built-in libraries
rm -rf lib/lua lib/csparse
-# Patch configure to use system cxsparse
-sed -i "s/\"\$have_csparse_lib\" = \"yes\" -a \"\$have_cxsparse_lib\" = \"yes\"/\"\$have_csparse_lib\" = \"yes\" -o \"\$have_cxsparse_lib\" = \"yes\""/g configure
-sed -i s/"-lcsparse -lcxsparse"/"-lcxsparse"/g configure
-# Patch configure for Fedora compat-lua
-sed -i 's/lua5\.1/lua-5.1/g' configure
-# Fix undefined reference to symbol 'vorbis_comment_query'
-sed -i 's/vorbisfile/& vorbis/g' configure
+# Patch meson.build for Fedora compat-lua
+sed -i 's/lua51/lua-5.1/g' meson.build
%build
-# note the ndata-path needs to point directly to the file
-%configure --with-ndata-path=%{_datadir}/%{name}/ndata-%{version}.zip --enable-lua=shared --disable-shave --enable-debug=no
-make %{?_smp_mflags}
+# Disabling luajit since the version in Fedora causes Naev to crash
+# Disabling C and LUA docs since those are only required if you're hacking on Naev
+%meson -Dluajit=disabled -Ddocs_c=disabled -Ddocs_lua=disabled
+%meson_build
%install
-make DESTDIR=%{buildroot} install
-
-# Copy high quality 256x256 icon rather than default 32x32
-rm -f %{buildroot}%{_datadir}/pixmaps/naev.png
-install -m 644 extras/logos/naev.png %{buildroot}%{_datadir}/pixmaps/naev.png
+%meson_install
-# docs get installed to wrong location
-rm -rf %{buildroot}%{_docdir}/naev
+sed -i '/<icon/d' %{buildroot}/%{_metainfodir}/*.metainfo.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.naev.naev.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml
%files
-%doc AUTHORS LICENSE README TODO
+%doc README
+%license LICENSE
%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
-%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/pixmaps/*.png
-%{_datadir}/naev/naev-confupdate.sh
+%{_metainfodir}/*.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/naev
%{_mandir}/man6/*
+%{_docdir}/naev
%changelog
+* Sat Feb 27 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.8.2-1
+- Update to 0.8.2
+- Obsolete naev-data since data is now part of the source
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index c54921c..d6894fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (naev-0.7.0.tar.bz2) = 9f8a2912e9f4f29ed6e276b008d4010da3ccdd309de5bb4360c393f2704aa7aff6e18db9e5d3657b4229e911ddec9b2a3312cf182c3c48a91a007a91138d84ae
+SHA512 (naev-nodata-0.8.2.tar.gz) = 1f1d1fe0a8bc107aefb297f905fc3597c268c39ffc4b8fa3f9541fb0969d618c00c340c1e7783cc3226fd7d0684224f5e32cd493ce217172d1ca99d474c33b3f
https://src.fedoraproject.org/rpms/naev/c/ad10aee57fc0db0cade57e19610569c...
3Â years, 2Â months
jdieter pushed to naev (f34). "Update to 0.8.2 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-02-28 18:11:04 UTC
From ad10aee57fc0db0cade57e19610569c331f6f01d Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter(a)gmail.com>
Date: Feb 28 2021 17:24:18 +0000
Subject: Update to 0.8.2
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
---
diff --git a/.gitignore b/.gitignore
index bea088c..0ee31a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/naev-0.6.0.tar.bz2
/naev-0.6.1.tar.bz2
/naev-0.7.0.tar.bz2
+/naev-nodata-0.8.2.tar.gz
diff --git a/naev.spec b/naev.spec
index 54279e9..b5499d0 100644
--- a/naev.spec
+++ b/naev.spec
@@ -1,13 +1,19 @@
-%define _legacy_common_support 1
-
Name: naev
-Version: 0.7.0
-Release: 13%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
Summary: 2d action, RPG space game
License: GPLv3
URL: http://naev.org
-Source: http://sourceforge.net/projects/naev/files/%{name}-%{version}/%{name}-%{v...
-BuildRequires: make
+# To build source without massive data files:
+# Download https://github.com/naev/naev/archive/v<version>/naev-<version>.tar.gz
+# Run:
+# $ tar -xvf naev-<version>.tar.gz
+# $ rm -rf naev-<version>/dat
+# $ mkdir naev-<version>/dat
+# $ mv naev-<version> naev-nodata-<version>
+# $ tar -czvf naev-nodata-<version>.tar.gz naev-nodata-<version>
+Source: %{name}-nodata-%{version}.tar.gz
+BuildRequires: meson
BuildRequires: gcc
BuildRequires: SDL2-devel
BuildRequires: SDL2_image-devel
@@ -37,46 +43,43 @@ ships, a large variety of equipment and a large galaxy to explore. The game is
highly open-ended, letting you proceed at your own pace.
%prep
-%setup -q -n %{name}-%{version}
+%autosetup -n %{name}-nodata-%{version}
# Remove built-in libraries
rm -rf lib/lua lib/csparse
-# Patch configure to use system cxsparse
-sed -i "s/\"\$have_csparse_lib\" = \"yes\" -a \"\$have_cxsparse_lib\" = \"yes\"/\"\$have_csparse_lib\" = \"yes\" -o \"\$have_cxsparse_lib\" = \"yes\""/g configure
-sed -i s/"-lcsparse -lcxsparse"/"-lcxsparse"/g configure
-# Patch configure for Fedora compat-lua
-sed -i 's/lua5\.1/lua-5.1/g' configure
-# Fix undefined reference to symbol 'vorbis_comment_query'
-sed -i 's/vorbisfile/& vorbis/g' configure
+# Patch meson.build for Fedora compat-lua
+sed -i 's/lua51/lua-5.1/g' meson.build
%build
-# note the ndata-path needs to point directly to the file
-%configure --with-ndata-path=%{_datadir}/%{name}/ndata-%{version}.zip --enable-lua=shared --disable-shave --enable-debug=no
-make %{?_smp_mflags}
+# Disabling luajit since the version in Fedora causes Naev to crash
+# Disabling C and LUA docs since those are only required if you're hacking on Naev
+%meson -Dluajit=disabled -Ddocs_c=disabled -Ddocs_lua=disabled
+%meson_build
%install
-make DESTDIR=%{buildroot} install
-
-# Copy high quality 256x256 icon rather than default 32x32
-rm -f %{buildroot}%{_datadir}/pixmaps/naev.png
-install -m 644 extras/logos/naev.png %{buildroot}%{_datadir}/pixmaps/naev.png
+%meson_install
-# docs get installed to wrong location
-rm -rf %{buildroot}%{_docdir}/naev
+sed -i '/<icon/d' %{buildroot}/%{_metainfodir}/*.metainfo.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.naev.naev.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml
%files
-%doc AUTHORS LICENSE README TODO
+%doc README
+%license LICENSE
%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
-%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/pixmaps/*.png
-%{_datadir}/naev/naev-confupdate.sh
+%{_metainfodir}/*.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/naev
%{_mandir}/man6/*
+%{_docdir}/naev
%changelog
+* Sat Feb 27 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.8.2-1
+- Update to 0.8.2
+- Obsolete naev-data since data is now part of the source
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index c54921c..d6894fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (naev-0.7.0.tar.bz2) = 9f8a2912e9f4f29ed6e276b008d4010da3ccdd309de5bb4360c393f2704aa7aff6e18db9e5d3657b4229e911ddec9b2a3312cf182c3c48a91a007a91138d84ae
+SHA512 (naev-nodata-0.8.2.tar.gz) = 1f1d1fe0a8bc107aefb297f905fc3597c268c39ffc4b8fa3f9541fb0969d618c00c340c1e7783cc3226fd7d0684224f5e32cd493ce217172d1ca99d474c33b3f
https://src.fedoraproject.org/rpms/naev/c/ad10aee57fc0db0cade57e19610569c...
3Â years, 2Â months
packagerbot pushed to dummy-test-package-gloster (rawhide). "Bump
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-02-28 17:55:56 UTC
From 2519200e77772c5148dd33da30222c1303d954a4 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Feb 28 2021 17:55:51 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-gloster.spec b/dummy-test-package-gloster.spec
index cbd99d4..54a7cc2 100644
--- a/dummy-test-package-gloster.spec
+++ b/dummy-test-package-gloster.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-gloster
Version: 0
-Release: 2845%{?dist}
+Release: 2846%{?dist}
Summary: Dummy Test Package called Gloster
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Sun Feb 28 2021 packagerbot <admin(a)fedoraproject.org> - 0-2846
+- rebuilt
+
* Sun Feb 28 2021 packagerbot <admin(a)fedoraproject.org> - 0-2845
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-gloster/c/2519200e7...
3Â years, 2Â months
jdieter pushed to naev-data (main). "Update to 0.8.2 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-02-28 17:27:28 UTC
From 9a47e0496f75a67988970515cc8f362a9170ab00 Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter(a)gmail.com>
Date: Feb 28 2021 17:27:18 +0000
Subject: Update to 0.8.2
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
---
diff --git a/.gitignore b/.gitignore
index abc0e8f..4d4626b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/ndata-0.6.0.zip
/ndata-0.6.1.zip
/naev-0.7.0-ndata.zip
+/naev-0.8.2.tar.gz
diff --git a/naev-data.spec b/naev-data.spec
index c5ad5a5..65aa0e4 100644
--- a/naev-data.spec
+++ b/naev-data.spec
@@ -1,11 +1,11 @@
Name: naev-data
-Version: 0.7.0
-Release: 12%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
Summary: Data files for NAEV
License: GPLv3 or GPLv3+ or GPLv2+ or Public Domain or CC-BY or CC-BY-SA
URL: http://naev.org
-Source1: http://sourceforge.net/projects/naev/files/naev-%{version}/naev-%{version...
-Requires: %{name} = %{version}
+Source0: https://github.com/naev/naev/archive/v%{version}/naev-%{version}.tar.gz
+Requires: naev = %{version}
BuildArch: noarch
%description
@@ -18,14 +18,20 @@ highly open-ended, letting you proceed at your own pace.
This package contains the data files needed to play the game
+%prep
+%autosetup -n naev-%{version}
+
%install
mkdir -p %{buildroot}%{_datadir}/naev
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/naev/ndata-%{version}.zip
+cp -a dat %{buildroot}%{_datadir}/naev
%files
%{_datadir}/naev
%changelog
+* Sun Feb 28 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.8.2-1
+- Update to 0.8.2
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 9519a72..60fba8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (naev-0.7.0-ndata.zip) = 5fa8faad36e410f0d2af1c80e6fedbffdd020da72dc96b329ce623e9836490cfb515c1bb88719045491366ca96a32888374029eec6cd14ed86ac8597750995ca
+SHA512 (naev-0.8.2.tar.gz) = c37a514dbe7ed1bca21563d20a4bb05892a07ee437eeaddefe00b5abe7009c2671da3c587db19bc8f1407db4ff3518f0cf5b28cb095778ba61946dcf87f61e5e
https://src.fedoraproject.org/rpms/naev-data/c/9a47e0496f75a67988970515cc...
3Â years, 2Â months