- updated to 0.9

- updated rpm5/rpm45 patches
- removed obsolete format patch

diff --git a/satyr-format.patch b/satyr-format.patch
deleted file mode 100644 (file)
index 2161694..0000000
--- a/satyr-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- satyr-0.5/lib/report.c.orig        2013-06-17 11:10:07.000000000 +0200
-+++ satyr-0.5/lib/report.c     2013-07-25 16:49:04.553138969 +0200
-@@ -149,7 +149,7 @@
-     {
-         char *stacktrace = sr_java_stacktrace_to_json(report->java_stacktrace);
-         dismantle_object(stacktrace);
--        sr_strbuf_append_strf(strbuf, stacktrace);
-+        sr_strbuf_append_strf(strbuf, "%s", stacktrace);
-         free(stacktrace);
-     }
- 

diff --git a/satyr-rpm45.patch b/satyr-rpm45.patch
index 619fe61cecf80294c3d79027f5dc2dd6ab3fd511..fa91ed6b31dec58bd4d0ab7fe30a310211e8efc3 100644 (file)
--- a/satyr-rpm45.patch
+++ b/satyr-rpm45.patch
@@ -1,12 +1,12 @@
---- satyr-0.7/lib/Makefile.am.orig     2013-09-03 20:52:57.770063717 +0200
-+++ satyr-0.7/lib/Makefile.am  2013-09-03 21:06:11.176697086 +0200
+--- satyr-0.9/lib/Makefile.am.orig     2013-09-21 21:55:53.857973024 +0200
++++ satyr-0.9/lib/Makefile.am  2013-09-21 21:56:30.191304832 +0200
 @@ -50,7 +50,7 @@
        unstrip.c \
        utils.c
  
 -libsatyr_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS)
 +libsatyr_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS) $(RPM_CFLAGS)
- libsatyr_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^sr_' $(GLIB_LIBS)
+ libsatyr_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^sr_' $(GLIB_LIBS)
  
  if HAVE_LIBOPCODES
 --- satyr-0.3/configure.ac.orig        2013-04-05 19:30:55.747216259 +0200

diff --git a/satyr-rpm5.patch b/satyr-rpm5.patch
index 3e1a07a8dc600255ab79f2811597c68d06c22190..6ec0160bd26fdbf08e8b2f2d466d84db0cff87a2 100644 (file)
--- a/satyr-rpm5.patch
+++ b/satyr-rpm5.patch
@@ -1,12 +1,12 @@
---- satyr-0.7/lib/Makefile.am.orig     2013-09-03 20:52:57.770063717 +0200
-+++ satyr-0.7/lib/Makefile.am  2013-09-03 21:06:11.176697086 +0200
+--- satyr-0.9/lib/Makefile.am.orig     2013-09-21 21:55:53.857973024 +0200
++++ satyr-0.9/lib/Makefile.am  2013-09-21 21:56:30.191304832 +0200
 @@ -50,7 +50,7 @@
        unstrip.c \
        utils.c
  
 -libsatyr_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS)
 +libsatyr_la_CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS) $(RPM_CFLAGS)
- libsatyr_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^sr_' $(GLIB_LIBS)
+ libsatyr_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^sr_' $(GLIB_LIBS)
  
  if HAVE_LIBOPCODES
 --- satyr-0.3/configure.ac.orig        2013-04-05 19:30:55.747216259 +0200

diff --git a/satyr.spec b/satyr.spec
index c6771881b83253580726ef0ca792ccf0398552c6..6d22c77bf0131c2eeec9aa020b5c991a7c09d6db 100644 (file)
--- a/satyr.spec
+++ b/satyr.spec
@@ -1,16 +1,15 @@
 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.7
+Version:       0.9
 Release:       1
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.xz
-# Source0-md5: 4442705d594b2a8553d93d898d81122e
+# Source0-md5: d1d58dfc3896f35dd7be00f1ab4a6b7c
 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
@@ -93,7 +92,6 @@ Wiązania Pythona do biblioteki Satyr.
 %else
 %patch2 -p1
 %endif
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -131,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsatyr.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsatyr.so.1
+%attr(755,root,root) %ghost %{_libdir}/libsatyr.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -144,3 +142,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/satyr
 %{py_sitedir}/satyr/__init__.py[co]
 %attr(755,root,root) %{py_sitedir}/satyr/_satyr.so
+%{_mandir}/man3/satyr-python.3*