[packages/mISDNuser] - apply git patch - fix build on x32

baggins baggins at pld-linux.org
Mon Feb 27 20:54:40 CET 2017


commit 20653a892da0c5bf6e418b31b70d8cf41f60496a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Feb 27 20:54:22 2017 +0100

    - apply git patch
    - fix build on x32

 mISDNuser.spec |  5 ++++-
 x32.patch      | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/mISDNuser.spec b/mISDNuser.spec
index bb30f9d..b4df46e 100644
--- a/mISDNuser.spec
+++ b/mISDNuser.spec
@@ -16,6 +16,7 @@ Group:		Libraries
 Source0:	%{name}-%{version}.tar.xz
 # Source0-md5:	fb4bf6c110bea0a30486015ca56e80d8
 Patch0:		git.patch
+Patch1:		x32.patch
 URL:		http://www.isdn4linux.de/mISDN/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -114,7 +115,8 @@ Aplikacja z graficznym interfejsem użytkownika do mISDN.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -132,6 +134,7 @@ Aplikacja z graficznym interfejsem użytkownika do mISDN.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/run/mISDNcapid
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..a9d41a6
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- mISDNuser-2.0.19/tools/loghex.c~	2017-02-27 20:51:45.000000000 +0100
++++ mISDNuser-2.0.19/tools/loghex.c	2017-02-27 20:52:17.457179734 +0100
+@@ -344,7 +344,11 @@
+ 			if (cts.cmsg_type == MISDN_TIME_STAMP) {
+ 				mt = localtime((time_t *) & cts.tv.tv_sec);
+ 				head =
++#ifdef __ILP32__
++				    printf("%02d.%02d.%04d %02d:%02d:%02d.%06lld", mt->tm_mday, mt->tm_mon + 1, mt->tm_year + 1900,
++#else
+ 				    printf("%02d.%02d.%04d %02d:%02d:%02d.%06ld", mt->tm_mday, mt->tm_mon + 1, mt->tm_year + 1900,
++#endif
+ 					   mt->tm_hour, mt->tm_min, mt->tm_sec, cts.tv.tv_usec);
+ 			} else {
+ 				cts.tv.tv_sec = 0;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mISDNuser.git/commitdiff/20653a892da0c5bf6e418b31b70d8cf41f60496a



More information about the pld-cvs-commit mailing list