[Tizen-submit] 2464: Changes to Tizen:Devel:IVI/murphy

noreply at tizen.org noreply at tizen.org
Mon Apr 15 10:47:08 GMT 2013


Hi,
Krisztian Litkey have made the following changes to murphy in project Tizen:Devel:IVI. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #2464

  submit:       Tizen:Devel:IVI:build/murphy(cleanup) -> Tizen:Devel:IVI


Message:
Submitter: Krisztian Litkey <krisztian.litkey at intel.com>
Comments: Tagged 0.0.18 for release.
Git project: profile/ivi/murphy
Tag: submit/2.0alpha/20130415.072028
Commit: f027400 packaging: added packaging.

State:   new        2013-04-15T03:17:52 tizenrobot
Comment: <no comment>
changes files:
--------------
--- murphy.changes
+++ murphy.changes
@@ -1,2 +1,2 @@
-* Tue Feb 19 21:55:42 EET 2013 Krisztian Litkey <krisztian.litkey at intel.com> - 0.0.17
-- release: released 0.0.17 (git: 86f8ebd6f4e210617e8b93d916a8bc1b11addfd5).
+* Mon Apr 15 10:20:28 EEST 2013 Krisztian Litkey <krisztian.litkey at intel.com> - 0.0.18
+- release: cope with updated libwebsockets + numerous crash- and bugfixes.

old:
----
  murphy-0.0.17.tar.gz

new:
----
  murphy-0.0.18.tar.gz

spec files:
-----------
--- murphy.spec
+++ murphy.spec
@@ -21,9 +21,9 @@
 
 Summary: Murphy policy framework
 Name: murphy
-Version: 0.0.17
+Version: 0.0.18
 Release: 1
-VCS:        profile/ivi/murphy#submit/2.0alpha/20130219.195542-0-g9cd82a8
+VCS:        profile/ivi/murphy#submit/2.0alpha/20130415.072028-0-gf027400
 License: BSD
 Group: System Environment/Daemons
 URL: http://01.org/murphy/
@@ -392,7 +392,7 @@
 %{_sysconfdir}/dbus-1/system.d/org.Murphy.conf
 %endif
 %if %{?_with_websockets:1}%{!?_with_websockets:0}
-%{_datadir}/murphy/webconsole
+%{_datadir}/murphy
 %endif
 
 %if %{?_with_squashpkg:0}%{!?_with_squashpkg:1}

other changes:
--------------

++++++ murphy-0.0.17.tar.gz -> murphy-0.0.18.tar.gz
--- /configure.ac
+++ /configure.ac
@@ -281,36 +281,34 @@
 AC_SUBST(READLINE_CFLAGS)
 AC_SUBST(READLINE_LIBS)
 
-# Check if websocket support was/can be enabled.
-CHECK_WEBSOCKETS()
-
-# If websockets was not enabled/available check if JSON was asked for.
-if test "$enable_json" = "no"; then
-    AC_ARG_ENABLE(json,
-                  [  --enable-json       enable JSON encoding/decoding support],
-                  [enable_json=$enableval], [enable_json=no])
-
-    if test "$enable_json" != "no"; then
-        PKG_CHECK_MODULES(JSON, [json],
-                          [have_json=yes], [have_json=no])
-        if test "$have_json" = "no" -a "$enable_json" = "yes"; then
-            AC_MSG_ERROR([json-c development libraries not found.])
-        fi
+# Check for json(-c).
+PKG_CHECK_MODULES(JSON, [json])
 
-        enable_json="$have_json"
-    else
-        AC_MSG_NOTICE([JSON support is disabled.])
-    fi
+AC_MSG_CHECKING([for json_tokener_get_error()])
+saved_CFLAGS="$CFLAGS"
+saved_LDFLAGS="$LDFLAGS"
+CFLAGS="$(pkg-config --cflags json)"
+LDFLAGS="$(pkg-config --libs json)"
+AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM(
+         [[#include <json.h>]],
+         [[json_tokener *tok = NULL;
+           if (json_tokener_get_error(tok) != json_tokener_success)

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list