I have made the following changes intended for : CE:MW:Shared / libresource CE:MW:Shared / libresourceqt CE:MW:Shared / ohm-plugins-misc
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/4908 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4908: Messages from BOSS: State: review at 2012-05-29T12:55:28 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: home:sage:branches:CE:MW:Shared / libresource -> CE:MW:Shared / libresource changes files: -------------- --- libresource.changes +++ libresource.changes @@ -0,0 +1,5 @@ +* Tue May 29 2012 Marko Saukko <[email protected]> - 0.21.0 +- Merge even more patches from upstream without proper versioning. + Tarball matches to commit 90fcf739dcd0aea91f5bed00f8aa35a130fb75fc + Version number wasn't changed as the real version number is unknown + old: ---- 0001-Default-to-0.0.0-instead-of-UNKNOWN-as-a-version.patch 0002-Don-t-force-assume-libdir-as-usr-lib-breaks-on-many-.patch 0003-Added-prefix-setting-option-p-to-the-resource-client.patch 0004-Changed-message-timeout-2s-10s.patch 0005-Properly-report-resources-lost-when-updating.patch 0006-Fixed-the-unregister-functionality.patch 0007-Fix-also-the-register-case.patch 0008-video-message.patch 0009-Added-dummy-resource-policy-manager-for-testing-libr.patch 0010-Updated-the-dummy-policy-manager-to-the-correct-vers.patch 0011-Added-documentation-to-the-D-Bus-policy-manager-fixe.patch libresource-0.21.0.tar.gz new: ---- maemo-multimedia-libresource-90fcf739.tar.gz spec files: ----------- --- libresource.spec +++ libresource.spec @@ -12,19 +12,8 @@ Group: System/Resource Policy License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/libresource -Source0: %{name}-%{version}.tar.gz +Source0: maemo-multimedia-libresource-90fcf739.tar.gz Source100: libresource.yaml -Patch0: 0001-Default-to-0.0.0-instead-of-UNKNOWN-as-a-version.patch -Patch1: 0002-Don-t-force-assume-libdir-as-usr-lib-breaks-on-many-.patch -Patch2: 0003-Added-prefix-setting-option-p-to-the-resource-client.patch -Patch3: 0004-Changed-message-timeout-2s-10s.patch -Patch4: 0005-Properly-report-resources-lost-when-updating.patch -Patch5: 0006-Fixed-the-unregister-functionality.patch -Patch6: 0007-Fix-also-the-register-case.patch -Patch7: 0008-video-message.patch -Patch8: 0009-Added-dummy-resource-policy-manager-for-testing-libr.patch -Patch9: 0010-Updated-the-dummy-policy-manager-to-the-correct-vers.patch -Patch10: 0011-Added-documentation-to-the-D-Bus-policy-manager-fixe.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(glib-2.0) @@ -54,30 +43,8 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n maemo-multimedia-%{name} -# 0001-Default-to-0.0.0-instead-of-UNKNOWN-as-a-version.patch -%patch0 -p1 -# 0002-Don-t-force-assume-libdir-as-usr-lib-breaks-on-many-.patch -%patch1 -p1 -# 0003-Added-prefix-setting-option-p-to-the-resource-client.patch -%patch2 -p1 -# 0004-Changed-message-timeout-2s-10s.patch -%patch3 -p1 -# 0005-Properly-report-resources-lost-when-updating.patch -%patch4 -p1 -# 0006-Fixed-the-unregister-functionality.patch -%patch5 -p1 -# 0007-Fix-also-the-register-case.patch -%patch6 -p1 -# 0008-video-message.patch -%patch7 -p1 -# 0009-Added-dummy-resource-policy-manager-for-testing-libr.patch -%patch8 -p1 -# 0010-Updated-the-dummy-policy-manager-to-the-correct-vers.patch -%patch9 -p1 -# 0011-Added-documentation-to-the-D-Bus-policy-manager-fixe.patch -%patch10 -p1 # >> setup # << setup other changes: -------------- ++++++ libresource.yaml --- libresource.yaml +++ libresource.yaml @@ -6,19 +6,7 @@ License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/libresource Sources: - - "%{name}-%{version}.tar.gz" -Patches: - - 0001-Default-to-0.0.0-instead-of-UNKNOWN-as-a-version.patch - - 0002-Don-t-force-assume-libdir-as-usr-lib-breaks-on-many-.patch - - 0003-Added-prefix-setting-option-p-to-the-resource-client.patch - - 0004-Changed-message-timeout-2s-10s.patch - - 0005-Properly-report-resources-lost-when-updating.patch - - 0006-Fixed-the-unregister-functionality.patch - - 0007-Fix-also-the-register-case.patch - - 0008-video-message.patch - - 0009-Added-dummy-resource-policy-manager-for-testing-libr.patch - - 0010-Updated-the-dummy-policy-manager-to-the-correct-vers.patch - - 0011-Added-documentation-to-the-D-Bus-policy-manager-fixe.patch + - maemo-multimedia-libresource-90fcf739.tar.gz Description: Resource management for MeeGo. Resource policy client library. ++++++ maemo-multimedia-libresource-90fcf739.tar.gz (new) ++++++ deleted files: --- 0001-Default-to-0.0.0-instead-of-UNKNOWN-as-a-version.patch --- 0002-Don-t-force-assume-libdir-as-usr-lib-breaks-on-many-.patch --- 0003-Added-prefix-setting-option-p-to-the-resource-client.patch --- 0004-Changed-message-timeout-2s-10s.patch --- 0005-Properly-report-resources-lost-when-updating.patch --- 0006-Fixed-the-unregister-functionality.patch --- 0007-Fix-also-the-register-case.patch --- 0008-video-message.patch --- 0009-Added-dummy-resource-policy-manager-for-testing-libr.patch --- 0010-Updated-the-dummy-policy-manager-to-the-correct-vers.patch --- 0011-Added-documentation-to-the-D-Bus-policy-manager-fixe.patch --- libresource-0.21.0.tar.gz submit: home:sage:branches:CE:MW:Shared / libresourceqt -> CE:MW:Shared / libresourceqt changes files: -------------- --- libresourceqt.changes +++ libresourceqt.changes @@ -0,0 +1,7 @@ +* Tue May 29 2012 Marko Saukko <[email protected]> - 1.26 +- This version is based on commit e24e1026447293479b1d3f3e656c95e574e73607 + in the git tree. Version number was not changed as there wasn't + any information what is the real version of the library atm. + The .pc files refers still to version 1.26 +- Dropped doxygen dependency for now as the build fails with it. + old: ---- libresourceqt-1.26.tar.gz new: ---- libresourceqt-disable-documents.patch libresourceqt-disable-mediaoverrider-build.patch maemo-multimedia-libresourceqt-e24e1026.tar.gz spec files: ----------- --- libresourceqt.spec +++ libresourceqt.spec @@ -12,15 +12,16 @@ Group: System/Resource Policy License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/libresourceqt/ -Source0: %{name}-%{version}.tar.gz +Source0: maemo-multimedia-libresourceqt-e24e1026.tar.gz Source100: libresourceqt.yaml +Patch0: libresourceqt-disable-documents.patch +Patch1: libresourceqt-disable-mediaoverrider-build.patch Requires: libdbus-qeventloop = %{version}-%{release} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) >= 4.6.0 -BuildRequires: pkgconfig(libresource0) +BuildRequires: pkgconfig(libresource) BuildRequires: pkgconfig(dbus-1) -BuildRequires: doxygen %description @@ -52,6 +53,25 @@ %description -n libdbus-qeventloop-devel Development files for libdbus-qeventloop. +%package -n libmediaoverridesqt +Summary: Mediaoverridesqt library +Group: System/Resource Policy +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description -n libmediaoverridesqt +%{summary}. + + +%package -n libmediaoverridesqt-devel +Summary: Development files for libmediaoverridesqt1 +Group: Development/Libraries +Requires: libmediaoverridesqt = %{version}-%{release} + +%description -n libmediaoverridesqt-devel +%{summary}. + + %package client Summary: Test client to test %{name} Group: Development/Tools @@ -71,8 +91,12 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n maemo-multimedia-%{name} +# libresourceqt-disable-documents.patch +%patch0 -p1 +# libresourceqt-disable-mediaoverrider-build.patch +%patch1 -p1 # >> setup # << setup @@ -114,6 +138,14 @@ +%post -n libmediaoverridesqt -p /sbin/ldconfig + +%postun -n libmediaoverridesqt -p /sbin/ldconfig + + + + + @@ -132,9 +164,6 @@ %{_libdir}/libresourceqt.so %{_libdir}/pkgconfig/libresourceqt1.pc %doc %{_datadir}/doc/%{name}/* -%doc %{_mandir}/man3/ResourcePolicy* -%doc %{_mandir}/man3/audio-resource.h.3.gz -%doc %{_mandir}/man3/resource*.3.gz # >> files devel # << files devel @@ -152,6 +181,20 @@ # >> files libdbus-qeventloop-devel # << files libdbus-qeventloop-devel +%files -n libmediaoverridesqt +%defattr(-,root,root,-) +%{_libdir}/libmediaoverridesqt.so.* +# >> files libmediaoverridesqt +# << files libmediaoverridesqt + +%files -n libmediaoverridesqt-devel +%defattr(-,root,root,-) +%{_includedir}/resource/qt4/policy/override.h +%{_libdir}/libmediaoverridesqt.so +%{_libdir}/pkgconfig/libmediaoverridesqt1.pc +# >> files libmediaoverridesqt-devel +# << files libmediaoverridesqt-devel + %files client %defattr(-,root,root,-) %{_bindir}/resourceqt-client other changes: -------------- ++++++ libresourceqt-disable-documents.patch (new) --- libresourceqt-disable-documents.patch +++ libresourceqt-disable-documents.patch @@ -0,0 +1,17 @@ +diff --git a/libresourceqt/libresourceqt.pro b/libresourceqt/libresourceqt.pro +index 70dd4c3..bdfe772 100644 +--- a/libresourceqt/libresourceqt.pro ++++ b/libresourceqt/libresourceqt.pro +@@ -50,9 +50,9 @@ CONFIG += qt link_pkgconfig dll + QT = core + PKGCONFIG += dbus-1 libresource + +-dox.commands = doxygen Doxyfile +-QMAKE_EXTRA_TARGETS += dox +-PRE_TARGETDEPS += dox ++# dox.commands = doxygen Doxyfile ++# QMAKE_EXTRA_TARGETS += dox ++# PRE_TARGETDEPS += dox + + # Install directives + headers.files = $${PUBLIC_HEADERS} ++++++ libresourceqt-disable-mediaoverrider-build.patch (new) --- libresourceqt-disable-mediaoverrider-build.patch +++ libresourceqt-disable-mediaoverrider-build.patch @@ -0,0 +1,12 @@ +diff --git a/libresourceqt.pro b/libresourceqt.pro +index 9639c88..6503938 100644 +--- a/libresourceqt.pro ++++ b/libresourceqt.pro +@@ -26,7 +26,6 @@ SUBDIRS = libdbus-qeventloop \ + libresourceqt \ + libmediaoverridesqt \ + resourceqt-client \ +- mediaoverrider \ + tests + + dist.commands = ./makedist.sh ++++++ libresourceqt.yaml --- libresourceqt.yaml +++ libresourceqt.yaml @@ -6,15 +6,18 @@ License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/libresourceqt/ Sources: - - "%{name}-%{version}.tar.gz" + - maemo-multimedia-libresourceqt-e24e1026.tar.gz +Patches: + - libresourceqt-disable-documents.patch + - libresourceqt-disable-mediaoverrider-build.patch Description: Qt library for Resource Policy. Requires: - libdbus-qeventloop = %{version}-%{release} -PkgBR: - - doxygen +#PkgBR: +# - doxygen PkgConfigBR: - QtCore >= 4.6.0 - - libresource0 + - libresource - dbus-1 Configure: none @@ -32,9 +35,9 @@ - "%{_libdir}/libresourceqt.so" - "%{_libdir}/pkgconfig/libresourceqt1.pc" - "%doc %{_datadir}/doc/%{name}/*" - - "%doc %{_mandir}/man3/ResourcePolicy*" - - "%doc %{_mandir}/man3/audio-resource.h.3.gz" - - "%doc %{_mandir}/man3/resource*.3.gz" +# - "%doc %{_mandir}/man3/ResourcePolicy*" +# - "%doc %{_mandir}/man3/audio-resource.h.3.gz" +# - "%doc %{_mandir}/man3/resource*.3.gz" Group: Development/Libraries - Name: libdbus-qeventloop @@ -60,6 +63,30 @@ Requires: - libdbus-qeventloop = %{version}-%{release} + - Name: libmediaoverridesqt + Summary: Mediaoverridesqt library + Files: + - "%{_libdir}/libmediaoverridesqt.so.*" + Group: System/Resource Policy + Description: | + %{summary}. + AsWholeName: yes + AutoDepend: no + + - Name: libmediaoverridesqt-devel + Summary: Development files for libmediaoverridesqt1 + Description: | + %{summary}. + Files: + - "%{_includedir}/resource/qt4/policy/override.h" + - "%{_libdir}/libmediaoverridesqt.so" + - "%{_libdir}/pkgconfig/libmediaoverridesqt1.pc" + Group: Development/Libraries + AsWholeName: yes + AutoDepend: no + Requires: + - libmediaoverridesqt = %{version}-%{release} + - Name: client Summary: Test client to test %{name} Description: Test client to test %{name}. ++++++ maemo-multimedia-libresourceqt-e24e1026.tar.gz (new) ++++++ deleted files: --- libresourceqt-1.26.tar.gz submit: home:sage:branches:CE:MW:Shared / ohm-plugins-misc -> CE:MW:Shared / ohm-plugins-misc changes files: -------------- --- ohm-plugins-misc.changes +++ ohm-plugins-misc.changes @@ -0,0 +1,4 @@ +* Tue May 29 2012 Marko Saukko <[email protected]> - 1.1.59 +- Changed libresource0 to libresource dependency. +- Updated to git commit 264ebb3986b91aa0a6e7ccbb0c8bb35d60fc1872 + old: ---- ohm-plugins-misc-1.1.59.tar.gz new: ---- maemo-multimedia-ohm-plugins-misc-264ebb39.tar.gz spec files: ----------- --- ohm-plugins-misc.spec +++ ohm-plugins-misc.spec @@ -12,7 +12,7 @@ Group: System/Resource Policy License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/ohm-plugins-misc -Source0: %{name}-%{version}.tar.gz +Source0: maemo-multimedia-ohm-plugins-misc-264ebb39.tar.gz Source100: ohm-plugins-misc.yaml Requires: ohm BuildRequires: pkgconfig(glib-2.0) @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(bluez) -BuildRequires: pkgconfig(libresource0) +BuildRequires: pkgconfig(libresource) BuildRequires: pkgconfig(ohm) BuildRequires: pkgconfig(libdres) BuildRequires: bison @@ -42,7 +42,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n maemo-multimedia-%{name} # >> setup # << setup @@ -99,6 +99,10 @@ %{_libdir}/ohm/libohm_resource.so %{_libdir}/ohm/libohm_signaling.so %{_libdir}/ohm/libohm_telephony.so +%{_libdir}/ohm/libohm_dbus.so +%{_libdir}/ohm/libohm_dbus_signal.so +%{_libdir}/ohm/libohm_dspep.so +%{_libdir}/ohm/libohm_upstart.so %{_bindir}/ohm-session-agent %config %{_sysconfdir}/ohm/plugins.d/*.ini %doc README COPYING AUTHORS other changes: -------------- ++++++ maemo-multimedia-ohm-plugins-misc-264ebb39.tar.gz (new) ++++++ ohm-plugins-misc.yaml --- ohm-plugins-misc.yaml +++ ohm-plugins-misc.yaml @@ -6,7 +6,7 @@ License: LGPLv2.1 URL: http://meego.gitorious.org/maemo-multimedia/ohm-plugins-misc Sources: - - "%{name}-%{version}.tar.gz" + - maemo-multimedia-ohm-plugins-misc-264ebb39.tar.gz Description: A miscallaneous set of OHM plugins by Nokia. Requires: @@ -21,7 +21,7 @@ - check - gconf-2.0 - bluez - - libresource0 + - libresource - ohm - libdres Configure: autogen ++++++ deleted files: --- ohm-plugins-misc-1.1.59.tar.gz
