[packages/mmm] Update to 20171127 snap
megabajt
megabajt at pld-linux.org
Sat Mar 24 16:14:19 CET 2018
commit c5b896af1e181cd6824d32da673f285162d9b3ae
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Sat Mar 24 16:13:23 2018 +0100
Update to 20171127 snap
mmm-mm.patch | 22 +++++++++++-----------
mmm.spec | 7 ++++---
2 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mmm.spec b/mmm.spec
index 9530248..c7dd805 100644
--- a/mmm.spec
+++ b/mmm.spec
@@ -2,13 +2,13 @@ Summary: Memory Mapped Machine
Summary(pl.UTF-8): Memory Mapped Machine - sprzęt odwzorowany w pamięci
Name: mmm
Version: 0
-%define gitref d1b866de230b8303df3fcd9cb2a121edc87c81dc
-%define snap 20160102
+%define gitref 0ae93f1b2fcc1dc77e3d6029fce89bc1ab115fa0
+%define snap 20171127
Release: 0.%{snap}.1
License: MIT
Group: Libraries
Source0: https://github.com/hodefoting/mmm/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5: f2779fc0387ffdae206941d910fcdbcf
+# Source0-md5: b2da0900399bbbd32264d134e18675b9
Patch0: %{name}-mm.patch
URL: https://github.com/hodefoting/mmm/
BuildRequires: SDL-devel >= 1.2
@@ -99,6 +99,7 @@ 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
%attr(755,root,root) %{_bindir}/mmm.sdl
diff --git a/mmm-mm.patch b/mmm-mm.patch
index 53814be..d901887 100644
--- a/mmm-mm.patch
+++ b/mmm-mm.patch
@@ -1,6 +1,6 @@
---- mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/bin.orig 2015-04-15 17:22:26.000000000 +0200
-+++ mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/bin 2015-11-23 19:55:08.826073329 +0100
-@@ -12,11 +12,11 @@
+--- mmm-0.1.0/.mm/bin.orig 2016-12-19 19:19:18.000000000 +0100
++++ mmm-0.1.0/.mm/bin 2018-03-24 15:06:16.813108957 +0100
+@@ -12,11 +12,11 @@ BIN_CFLAGS += $(shell test "$(BIN_PKGMOD
BIN_LD_FLAGS += $(shell test "$(BIN_PKGMODULES)" 2>/dev/null && pkg-config $(BIN_PKGMODULES) --libs)
$(BINARY): $(BIN_CFILES) $(LIBNAME_A)
@@ -14,9 +14,9 @@
$(BIN_CFILES) $(LIBNAME_A) -lefence -o $@
all: $(BIN_TARGETS)
---- mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/lib.orig 2015-04-15 17:22:26.000000000 +0200
-+++ mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/lib 2015-11-23 20:11:23.212699103 +0100
-@@ -16,23 +16,23 @@
+--- mmm-0.1.0/.mm/lib.orig 2018-03-24 15:06:16.813108957 +0100
++++ mmm-0.1.0/.mm/lib 2018-03-24 15:08:07.469799580 +0100
+@@ -16,23 +16,23 @@ LIB_LD_FLAGS += $(shell test "$(LIB_PKGM
LIBNAME_A=$(LIBNAME).a
$(LIBNAME).a: $(LIB_OBJS)
@@ -30,8 +30,8 @@
+ echo " gen" $@; nm -a $(LIB_OBJS) | grep " T " | cut -f 3 -d ' ' | grep "^$(SYMBOL_PREFIX)" | grep -v "^_" | sort > $@
$(LIBNAME).$(LIBEXT): $(LIB_OBJS) symbols
-- @echo " LD" $@;$(LD) --retain-symbols-file=symbols -shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
-+ echo " LD" $@;$(LD) -Wl,--retain-symbols-file=symbols -shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
+- @echo " LD" $@;$(CC) --shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
++ echo " LD" $@;$(CC) --shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
# this rule is generic and could also belong with bin..
# we try to be overly generic and throw in the cflags of both lib and bin..
@@ -45,9 +45,9 @@
LIBDIR ?= $(PREFIX)/lib
#$(P64)
---- mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/pkgconfig.orig 2015-04-15 17:22:26.000000000 +0200
-+++ mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/pkgconfig 2015-11-23 20:21:30.166007161 +0100
-@@ -6,7 +6,7 @@
+--- mmm-0.1.0/.mm/pkgconfig.orig 2016-12-19 19:19:18.000000000 +0100
++++ mmm-0.1.0/.mm/pkgconfig 2018-03-24 15:06:16.813108957 +0100
+@@ -6,7 +6,7 @@ $(PROJECT_NAME).pc:
@echo " gen" $@
@echo "prefix=$(PREFIX)" > $@
@echo exec_prefix=\$${prefix} >> $@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mmm.git/commitdiff/c5b896af1e181cd6824d32da673f285162d9b3ae
More information about the pld-cvs-commit
mailing list