Revisions of aprsd

Walter Fey's avatar Walter Fey (dl8fcl) accepted request 156226 from Walter Fey's avatar Walter Fey (dl8fcl) (revision 26)
fix for 12.1 and newer. cleanup of spec file
Tim Fischer's avatar Tim Fischer (dg7gt) accepted request 62679 from Walter Fey's avatar Walter Fey (dl8fcl) (revision 25)
reviewed ok.
Walter Fey's avatar Walter Fey (dl8fcl) committed (revision 24)
Tim Fischer's avatar Tim Fischer (dg7gt) committed (revision 23)
Tim Fischer's avatar Tim Fischer (dg7gt) committed (revision 22)
Tim Fischer's avatar Tim Fischer (dg7gt) committed (revision 21)
Tim Fischer's avatar Tim Fischer (dg7gt) committed (revision 20)
Tim Fischer's avatar Tim Fischer (dg7gt) committed (revision 19)
Tim Fischer's avatar Tim Fischer (dg7gt) committed (revision 18)
Jan-Simon Möller's avatar Jan-Simon Möller (dl9pf) committed (revision 17)
Make it work on 11.0
--This line, and those below, will be ignored--

A    BROKEN
A    aprsd-2.2.5_for_11.0.diff
M    aprsd.spec

Diff for working copy: .
Index: aprsd.spec
===================================================================

--- aprsd.spec     (revision 16) 
+++ aprsd.spec     (working copy) 
@@ -22,7 +22,8 @@
 Source:       aprsd-2.2.5.tar.bz2
 Patch:        aprsd-2.2.5.diff
 Patch1:       aprsd-mic-e-pass.patch
-Patch2:	      aprsd-linuxh.diff
+#Patch2:       aprsd-linuxh.diff
+Patch3:       aprsd-2.2.5_for_11.0.diff
 PreReq:       %fillup_prereq %insserv_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
@@ -47,6 +48,10 @@
 %if 0%{?suse_version} > 1020
 %patch2 -p1
 %endif
+%if 0%{?suse_version} > 1030
+%patch3 -p1
+%endif
+
 %build
 ./configure --prefix=/usr
 make
@@ -76,6 +81,8 @@
 /usr/sbin/aprspass
 
 %changelog -n aprsd
+* Mon Jun 02 2008 - dl9pf@gmx.de
+- Make it compile with 11.0 again
 * Sat Aug 18 2007 - dg7gt@online.de
 - Added aprsd.cpp - Patch (from Debian) to compile with openSUSE 10.3
 * Wed Feb 20 2007 - dl9pf@gmx.de

Index: BROKEN
===================================================================


Index: aprsd-2.2.5_for_11.0.diff
===================================================================

--- aprsd-2.2.5_for_11.0.diff     (revision 16) 
+++ aprsd-2.2.5_for_11.0.diff     (working copy) 
@@ -1,0 +1,29 @@
+diff -Naur aprsd-2.2.5.orig/src/osdep.h aprsd-2.2.5/src/osdep.h
+--- aprsd-2.2.5.orig/src/osdep.h	2003-04-20 20:34:47.000000000 +0200
++++ aprsd-2.2.5/src/osdep.h	2008-06-02 02:07:55.695920307 +0200
+@@ -28,6 +28,8 @@
+ 
+ #include "config.h"
+ #include <string>
++#include <stdexcept>
++#include <bits/functexcept.h>
+ 
+ extern "C"
+ {
+@@ -87,12 +89,12 @@
+     {
+         char buf [1024];
+ 
+-#ifdef __GLIBC__
+-        return ::strerror_r (ERRNUM, buf, sizeof (buf));
+-#else   // !__GLIBC__
++//#ifdef __GLIBC__
++//        return ::strerror_r (ERRNUM, buf, sizeof (buf));
++//#else   // !__GLIBC__
+         ::strerror_r (ERRNUM, buf, sizeof (buf));
+         return buf;
+-#endif  // !__GLIBC__
++//#endif  // !__GLIBC__
+     }
+ 
+
Jan-Simon Möller's avatar Jan-Simon Möller (dl9pf) committed (revision 16)
unknown committed (revision 15)
unknown committed (revision 14)
unknown committed (revision 13)
unknown committed (revision 12)
unknown committed (revision 11)
unknown committed (revision 10)
unknown committed (revision 9)
unknown committed (revision 8)
unknown committed (revision 7)
Displaying revisions 1 - 20 of 26
openSUSE Build Service is sponsored by