[packages/mrg] - up to 0.1.0

arekm arekm at pld-linux.org
Sun Sep 17 21:29:40 CEST 2017


commit 6f040d7954e348350ab85842b957a09d26f690bd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Sep 17 21:29:34 2017 +0200

    - up to 0.1.0

 mrg-mm.patch | 14 +++++++++++---
 mrg.spec     | 12 +++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/mrg.spec b/mrg.spec
index 3c62aa7..43fe8e7 100644
--- a/mrg.spec
+++ b/mrg.spec
@@ -1,14 +1,12 @@
 Summary:	Microraptor GUI
 Summary(pl.UTF-8):	Microraptor GUI - graficzny interfejs użytkownika
 Name:		mrg
-Version:	0
-%define	gitref	c2b4b5633a284f7772c94c67dd4a98577193e54e
-%define	snap	20160310
-Release:	0.%{snap}.1
+Version:	0.1.0
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	https://github.com/hodefoting/mrg/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5:	02be868c77bf0aee725370d16401183c
+Source0:	https://github.com/hodefoting/mrg/releases/download/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	a14c5551d061305c1040764c71d62c8d
 Patch0:		%{name}-mm.patch
 Patch1:		%{name}-format.patch
 URL:		https://github.com/hodefoting/mrg/
@@ -71,7 +69,7 @@ Static mrg library.
 Statyczna biblioteka mrg.
 
 %prep
-%setup -q -n %{name}-%{gitref}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 
diff --git a/mrg-mm.patch b/mrg-mm.patch
index 024cf10..9a28c7d 100644
--- a/mrg-mm.patch
+++ b/mrg-mm.patch
@@ -18,7 +18,7 @@
  all: $(BIN_TARGETS)
 --- mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/.mm/lib.orig	2015-11-23 20:53:44.365925795 +0100
 +++ mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/.mm/lib	2015-11-23 20:56:53.995917836 +0100
-@@ -16,23 +16,23 @@
+@@ -16,23 +16,23 @@ LIB_LD_FLAGS += $(shell test "$(LIB_PKGM
  LIBNAME_A=$(LIBNAME).a
  
  $(LIBNAME).a: $(LIB_OBJS)
@@ -32,8 +32,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) -shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
-+	echo "  LD" $@;$(LD) -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..
@@ -56,6 +56,14 @@
  
  
  all: $(EXAMPLES_BINS)
+@@ -78,5 +78,5 @@ all: $(EXAMPLES_BINS)
+ CLEAN_FILES += $(EXAMPLES_BINS)
+ help: _libhelp
+ _libhelp:
+-	@echo "$(LIBNAME).$(LIBEXT) dynamic shared library"
+-	@echo "$(LIBNAME).a         static library"
++	echo "$(LIBNAME).$(LIBEXT) dynamic shared library"
++	echo "$(LIBNAME).a         static library"
 --- 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 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mrg.git/commitdiff/6f040d7954e348350ab85842b957a09d26f690bd



More information about the pld-cvs-commit mailing list