[packages/satyr] - updated to 0.15 - updated rpm5/rpm45 patches - removed obsolete format patch - create missing saty

qboosh qboosh at pld-linux.org
Sun Oct 12 20:21:19 CEST 2014


commit 60422b1db87f5d8d3b7d7490fe284d8cf4b78455
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 12 20:21:48 2014 +0200

    - updated to 0.15
    - updated rpm5/rpm45 patches
    - removed obsolete format patch
    - create missing satyr-version file

 satyr-format.patch | 11 -----------
 satyr-rpm45.patch  |  8 ++++----
 satyr-rpm5.patch   |  8 ++++----
 satyr.spec         | 11 ++++++-----
 4 files changed, 14 insertions(+), 24 deletions(-)
---
diff --git a/satyr.spec b/satyr.spec
index 8bc1cb8..a1972e3 100644
--- a/satyr.spec
+++ b/satyr.spec
@@ -1,25 +1,25 @@
 Summary:	Tools to create anonymous, machine-friendly problem reports
 Summary(pl.UTF-8):	Analizator śladów wywołań tworzonych przez GDB
 Name:		satyr
-Version:	0.14
+Version:	0.15
 Release:	1
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.xz
-# Source0-md5:	8f87674f1cee840d35063887b1898dbe
+# Source0-md5:	91f268fed10295c8b1c3afce741e24eb
 Patch0:		%{name}-libopcodes.patch
 Patch1:		%{name}-rpm5.patch
 Patch2:		%{name}-rpm45.patch
-Patch3:		%{name}-format.patch
 URL:		http://fedorahosted.org/abrt/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	binutils-devel
 BuildRequires:	elfutils-devel
 BuildRequires:	libtool
+BuildRequires:	libstdc++-devel
 BuildRequires:	libunwind-devel >= 1.1
 BuildRequires:	pkgconfig
-BuildRequires:	rpm-devel
+BuildRequires:	rpm-devel >= 4.5
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
@@ -94,7 +94,8 @@ Wiązania Pythona do biblioteki Satyr.
 %else
 %patch2 -p1
 %endif
-%patch3 -p1
+
+printf '%s' '%{version}' > satyr-version
 
 %build
 %{__libtoolize}
diff --git a/satyr-format.patch b/satyr-format.patch
deleted file mode 100644
index 58d0929..0000000
--- a/satyr-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- satyr-0.14/lib/core_unwind_elfutils.c.orig	2014-03-26 16:23:25.000000000 +0100
-+++ satyr-0.14/lib/core_unwind_elfutils.c	2014-06-14 16:40:38.064971360 +0200
-@@ -166,7 +166,7 @@
-             set_error_dwfl("dwfl_getthreads");
-         else if (ret == DWARF_CB_ABORT)
-         {
--            set_error(thread_arg.error_msg);
-+            set_error("%s", thread_arg.error_msg);
-             free(thread_arg.error_msg);
-         }
-         else
diff --git a/satyr-rpm45.patch b/satyr-rpm45.patch
index 7476f46..98098dc 100644
--- a/satyr-rpm45.patch
+++ b/satyr-rpm45.patch
@@ -1,11 +1,11 @@
---- satyr-0.13/lib/Makefile.am.orig	2014-01-07 17:07:58.000000000 +0100
-+++ satyr-0.13/lib/Makefile.am	2014-02-02 20:51:35.551284308 +0100
+--- satyr-0.15/lib/Makefile.am.orig	2014-01-07 17:07:58.000000000 +0100
++++ satyr-0.15/lib/Makefile.am	2014-02-02 20:51:35.551284308 +0100
 @@ -62,7 +62,7 @@
  	unstrip.c \
  	utils.c
  
--libsatyr_conv_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS)
-+libsatyr_conv_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS) $(RPM_CFLAGS)
+-libsatyr_conv_la_CFLAGS = -Wall -Wformat=2 -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS)
++libsatyr_conv_la_CFLAGS = -Wall -Wformat=2 -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS) $(RPM_CFLAGS)
  libsatyr_conv_la_LDFLAGS = $(GLIB_LIBS)
  
  if HAVE_LIBOPCODES
diff --git a/satyr-rpm5.patch b/satyr-rpm5.patch
index 910ab88..434d054 100644
--- a/satyr-rpm5.patch
+++ b/satyr-rpm5.patch
@@ -1,11 +1,11 @@
---- satyr-0.13/lib/Makefile.am.orig	2014-01-07 17:07:58.000000000 +0100
-+++ satyr-0.13/lib/Makefile.am	2014-02-02 20:51:35.551284308 +0100
+--- satyr-0.15/lib/Makefile.am.orig	2014-01-07 17:07:58.000000000 +0100
++++ satyr-0.15/lib/Makefile.am	2014-02-02 20:51:35.551284308 +0100
 @@ -62,7 +62,7 @@
  	unstrip.c \
  	utils.c
  
--libsatyr_conv_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS)
-+libsatyr_conv_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS) $(RPM_CFLAGS)
+-libsatyr_conv_la_CFLAGS = -Wall -Wformat=2 -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS)
++libsatyr_conv_la_CFLAGS = -Wall -Wformat=2 -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS) $(RPM_CFLAGS)
  libsatyr_conv_la_LDFLAGS = $(GLIB_LIBS)
  
  if HAVE_LIBOPCODES
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/satyr.git/commitdiff/60422b1db87f5d8d3b7d7490fe284d8cf4b78455



More information about the pld-cvs-commit mailing list