I have made the following changes intended for : CE:MW:Shared / libresourceqt
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/6065 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6065: Messages from BOSS: State: review at 2012-08-24T13:05:59 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : 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:MW / libresourceqt -> CE:MW:Shared / libresourceqt changes files: -------------- --- libresourceqt.changes +++ libresourceqt.changes @@ -0,0 +1,3 @@ +* Fri Aug 24 2012 Marko Saukko <[email protected]> - 1.26 +- Added libresourceqt-fix-build-with-new-glib.patch to fix build + new: ---- 0001-Fix-build-with-new-glib.patch spec files: ----------- --- libresourceqt.spec +++ libresourceqt.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: libresourceqt + # >> macros # << macros -Name: libresourceqt Summary: Resource Policy Qt API Version: 1.26 Release: 1 @@ -16,6 +18,7 @@ Source100: libresourceqt.yaml Patch0: libresourceqt-disable-documents.patch Patch1: libresourceqt-disable-mediaoverrider-build.patch +Patch2: 0001-Fix-build-with-new-glib.patch Requires: libdbus-qeventloop = %{version}-%{release} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -23,11 +26,9 @@ BuildRequires: pkgconfig(libresource) BuildRequires: pkgconfig(dbus-1) - %description Qt library for Resource Policy. - %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -97,6 +98,8 @@ %patch0 -p1 # libresourceqt-disable-mediaoverrider-build.patch %patch1 -p1 +# 0001-Fix-build-with-new-glib.patch +%patch2 -p1 # >> setup # << setup @@ -110,6 +113,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -120,44 +124,24 @@ # << install post - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - - %post -n libdbus-qeventloop -p /sbin/ldconfig %postun -n libdbus-qeventloop -p /sbin/ldconfig - - - - %post -n libmediaoverridesqt -p /sbin/ldconfig %postun -n libmediaoverridesqt -p /sbin/ldconfig - - - - - - - - - %files %defattr(-,root,root,-) %{_libdir}/libresourceqt.so.* # >> files # << files - %files devel %defattr(-,root,root,-) %{_includedir}/resource/qt4/policy/*resource*.h @@ -208,4 +192,3 @@ %config %{_sysconfdir}/dbus-1/system.d/test-dbus-qeventloop.conf # >> files tests # << files tests - other changes: -------------- ++++++ 0001-Fix-build-with-new-glib.patch (new) --- 0001-Fix-build-with-new-glib.patch +++ 0001-Fix-build-with-new-glib.patch @@ -0,0 +1,26 @@ +From f606ae7e603e79f267b5f167313052680bfb5e2e Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Fri, 24 Aug 2012 11:18:35 +0000 +Subject: [PATCH] Fix build with new glib. + +Signed-off-by: Marko Saukko <[email protected]> +--- + tests/test-init-and-connect/test-init-and-connect.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test-init-and-connect/test-init-and-connect.pro b/tests/test-init-and-connect/test-init-and-connect.pro +index a5045ad..73236dc 100644 +--- a/tests/test-init-and-connect/test-init-and-connect.pro ++++ b/tests/test-init-and-connect/test-init-and-connect.pro +@@ -39,7 +39,7 @@ OBJECTS_DIR = build + MOC_DIR = build + + QMAKE_CXXFLAGS += -Wall +-LIBS += -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop ++LIBS += -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop -lrt + + CONFIG += qt qtestlib debug warn_on link_pkgconfig + QT -= gui +-- +1.7.10.3 + ++++++ libresourceqt.yaml --- libresourceqt.yaml +++ libresourceqt.yaml @@ -10,6 +10,7 @@ Patches: - libresourceqt-disable-documents.patch - libresourceqt-disable-mediaoverrider-build.patch + - 0001-Fix-build-with-new-glib.patch Description: Qt library for Resource Policy. Requires: - libdbus-qeventloop = %{version}-%{release}
