I have made the following changes intended for : CE:UX:MTF / timed Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/3748 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3748: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-12-21T11:15:26 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:UX / timed -> CE:UX:MTF / timed changes files: -------------- --- timed.changes +++ timed.changes @@ -0,0 +1,5 @@ +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 2.54 +- Fixed linking with patch: + timed-2.54-add-missing-libs-for-linking.patch +- Changed tarball to upstream tarball. + old: ---- timed-2.54.tar.bz2 new: ---- meego-middleware-timed-2.54.tar.gz timed-2.54-add-missing-libs-for-linking.patch spec files: ----------- --- timed.spec +++ timed.spec @@ -12,7 +12,7 @@ Group: System/System Control License: LGPLv2 URL: http://meego.gitorious.org/meego-middleware/timed -Source0: %{name}-%{version}.tar.bz2 +Source0: meego-middleware-%{name}-%{version}.tar.gz Source1: %{name}.conf Source2: %{name}.service Source100: timed.yaml @@ -26,6 +26,7 @@ Patch7: lower-server-loglevel.patch Patch8: %{name}-2.53-no-docs.patch Patch9: timed-2.53-disable-dsme.patch +Patch10: timed-2.54-add-missing-libs-for-linking.patch Requires: tzdata Requires: tzdata-timed Requires: systemd @@ -81,7 +82,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n meego-middleware-%{name} # %{name}-2.11-run-as-system-service.patch %patch0 -p1 @@ -103,6 +104,8 @@ %patch8 -p1 # timed-2.53-disable-dsme.patch %patch9 -p1 +# timed-2.54-add-missing-libs-for-linking.patch +%patch10 -p1 # >> setup # << setup other changes: -------------- ++++++ meego-middleware-timed-2.54.tar.gz (new) ++++++ timed-2.54-add-missing-libs-for-linking.patch (new) --- timed-2.54-add-missing-libs-for-linking.patch +++ timed-2.54-add-missing-libs-for-linking.patch @@ -0,0 +1,40 @@ +From 5400a01e7233bf35bda6a627e702a6b2d076ff3b Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 21 Dec 2011 13:25:53 +0200 +Subject: [PATCH] Fixed linking with newer toolchains by adding missing libs. + +Signed-off-by: Marko Saukko <[email protected]> +--- + src/simple-client/simple-client.pro | 2 +- + src/ticker/ticker.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/simple-client/simple-client.pro b/src/simple-client/simple-client.pro +index 3b65330..d93587e 100644 +--- a/src/simple-client/simple-client.pro ++++ b/src/simple-client/simple-client.pro +@@ -9,7 +9,7 @@ VERSION = $$(TIMED_VERSION) + INCLUDEPATH += ../h + + QMAKE_LIBDIR_FLAGS += -L../lib -L../voland +-LIBS += -ltimed -ltimed-voland ++LIBS += -ltimed -ltimed-voland -lqmlog + + CONFIG += iodata + +diff --git a/src/ticker/ticker.pro b/src/ticker/ticker.pro +index a66ee96..bed4826 100644 +--- a/src/ticker/ticker.pro ++++ b/src/ticker/ticker.pro +@@ -9,7 +9,7 @@ VERSION = $$(TIMED_VERSION) + INCLUDEPATH += ../h + + QMAKE_LIBDIR_FLAGS += -L../lib +-LIBS += -ltimed ++LIBS += -ltimed -lqmlog + + SOURCES = ticker.cpp + HEADERS = ticker.h +-- +1.7.6.4 + ++++++ timed.yaml --- timed.yaml +++ timed.yaml @@ -6,7 +6,7 @@ License: LGPLv2 URL: http://meego.gitorious.org/meego-middleware/timed Sources: - - "%{name}-%{version}.tar.bz2" + - "meego-middleware-%{name}-%{version}.tar.gz" - "%{name}.conf" - "%{name}.service" Patches: @@ -20,6 +20,7 @@ - "lower-server-loglevel.patch" - "%{name}-2.53-no-docs.patch" - "timed-2.53-disable-dsme.patch" + - timed-2.54-add-missing-libs-for-linking.patch Description: | The time daemon (%{name}) managing system time, time zone and settings, executing actions at given time and managing the event queue. ++++++ deleted files: --- timed-2.54.tar.bz2
