[packages/mmm] - updated to 0.1.1 release - removed obsolete missing patch

qboosh qboosh at pld-linux.org
Wed Sep 23 22:18:09 CEST 2020


commit 1812df473cf57d92484b714504648f0e7363eae9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Sep 23 22:21:03 2020 +0200

    - updated to 0.1.1 release
    - removed obsolete missing patch

 mmm-missing.patch | 10 ----------
 mmm.spec          | 38 ++++++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 22 deletions(-)
---
diff --git a/mmm.spec b/mmm.spec
index aaf8c35..cfe4718 100644
--- a/mmm.spec
+++ b/mmm.spec
@@ -1,20 +1,27 @@
+#
+# Conditional build:
+%bcond_with	sdl1	# SDL 1.x client
+%bcond_without	sdl2	# SDL 2.x client
+
 Summary:	Memory Mapped Machine
 Summary(pl.UTF-8):	Memory Mapped Machine - sprzęt odwzorowany w pamięci
 Name:		mmm
-Version:	0
-%define	gitref	58892979d9725a0eda0e3aea373cdefd0b01f6a1
-%define	snap	20191113
-Release:	0.%{snap}.1
+Version:	0.1.1
+Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	https://github.com/hodefoting/mmm/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5:	dc6459747c3be126c02e48a0b1f62884
-Patch0:		%{name}-missing.patch
+#Source0Download: https://github.com/hodefoting/mmm/releases
+Source0:	https://github.com/hodefoting/mmm/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	b2d38082c3293ef1a44391cff7e0a109
 URL:		https://github.com/hodefoting/mmm/
-BuildRequires:	SDL-devel >= 1.2
+%{?with_sdl1:BuildRequires:	SDL-devel >= 1.2.0}
+%{?with_sdl2:BuildRequires:	SDL2-devel >= 2.0.4}
 BuildRequires:	meson >= 0.50.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
+%{?with_sdl1:Requires:	SDL >= 1.2.0}
+%{?with_sdl2:Requires:	SDL2 >= 2.0.4}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,11 +79,12 @@ Static mmm library.
 Statyczna biblioteka mmm.
 
 %prep
-%setup -q -n %{name}-%{gitref}
-%patch0 -p1
+%setup -q
 
 %build
-%meson build
+%meson build \
+	%{!?with_sdl1:-Dsdl1=disabled} \
+	%{!?with_sdl2:-Dsdl2=disabled}
 
 %ninja_build -C build
 
@@ -93,9 +101,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mmm
 %attr(755,root,root) %{_bindir}/mmm.kobo
 %attr(755,root,root) %{_bindir}/mmm.linux
+%if %{with sdl1}
 %attr(755,root,root) %{_bindir}/mmm.sdl
+%endif
+%if %{with sdl2}
+%attr(755,root,root) %{_bindir}/mmm.sdl2
+%endif
 
 %files libs
 %defattr(644,root,root,755)
@@ -104,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/mmm-0.0
+%{_includedir}/mmm-0.1
 %{_pkgconfigdir}/mmm.pc
 
 %files static
diff --git a/mmm-missing.patch b/mmm-missing.patch
deleted file mode 100644
index 652fa55..0000000
--- a/mmm-missing.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mmm-58892979d9725a0eda0e3aea373cdefd0b01f6a1/examples/meson.build.orig	2019-11-12 16:01:28.000000000 +0100
-+++ mmm-58892979d9725a0eda0e3aea373cdefd0b01f6a1/examples/meson.build	2019-12-01 19:19:14.513929885 +0100
-@@ -8,7 +8,6 @@
-  { 'name': 'fragment-full', },
-  { 'name': 'nano-test2', },
-  { 'name': 'raw-client', },
-- { 'name': 'ctx', },
-  { 'name': 'raw-client-tool', },
- ]
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mmm.git/commitdiff/1812df473cf57d92484b714504648f0e7363eae9



More information about the pld-cvs-commit mailing list