- fix build ith new libwbxml

- remove macroized cmake options

diff --git a/libsyncml.spec b/libsyncml.spec
index 40be3e331f72c946635cbe6f0af5c15b1e34babd..6d3f3c8a1e4ceb34388ec6e9983a76fda364ee1b 100644 (file)
--- a/libsyncml.spec
+++ b/libsyncml.spec
@@ -7,6 +7,7 @@ License:        LGPL 2.1+
 Group:         Libraries
 Source0:       https://downloads.sourceforge.net/project/libsyncml/libsyncml/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5: b8ce1f222cccc12acdcd6807d65c1aea
+Patch0:                wbxml.patch
 URL:           http://libsyncml.opensync.org/
 BuildRequires: bluez-libs-devel
 BuildRequires: check
@@ -40,16 +41,12 @@ Pliki nagłówkowe biblioteki libsyncml.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
 cd build
-%cmake .. \
-       -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if "%{_lib}" == "lib64"
-       -DLIB_SUFFIX=64
-%endif
+%cmake ../
 
 %{__make}
 

diff --git a/wbxml.patch b/wbxml.patch
new file mode 100644 (file)
index 0000000..9907005
--- /dev/null
+++ b/wbxml.patch
@@ -0,0 +1,11 @@
+--- libsyncml-0.5.4/libsyncml/parser/sml_wbxml_internals.h~    2009-06-04 18:16:56.000000000 +0900
++++ libsyncml-0.5.4/libsyncml/parser/sml_wbxml_internals.h     2015-08-26 23:01:34.743734099 +0900
+@@ -29,7 +29,7 @@
+ #ifndef _SML_WBXML_INTERNALS_H_
+ #define _SML_WBXML_INTERNALS_H_
+ 
+-#include <wbxml.h>
++#include <wbxml/wbxml.h>
+ 
+ SmlBool smlWbxmlConvertTo(WBXMLConvXML2WBXMLParams *params, const char *input, char **output, size_t *outputLen, SmlError** error);
+ SmlBool smlWbxmlConvertFrom(WBXMLConvWBXML2XMLParams *params, const char *input, size_t inputLen, char **output, size_t *outputLen, SmlError** error);