I have made the following changes intended for : nemo:devel:apps / meepasswords
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/284 Thank You, Ruediger Gad [This message was auto-generated] --- Request # 284: Messages from BOSS: State: review at 2013-05-06T21:03:54 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:apps : 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:wonko:branches:nemo:devel:apps / meepasswords -> nemo:devel:apps / meepasswords changes files: -------------- --- meepasswords.changes +++ meepasswords.changes @@ -0,0 +1,3 @@ +* Mon May 06 2013 Ruediger Gad <[email protected]> - 1.9.3 +- Fix Mer build. + new: ---- fix-mer-build.patch spec files: ----------- --- meepasswords.spec +++ meepasswords.spec @@ -16,6 +16,7 @@ URL: http://meepasswords.garage.maemo.org/ Source0: %{name}_%{version}.tar.gz Source100: meepasswords.yaml +Patch0: fix-mer-build.patch Requires: libdeclarative-connectivity Requires: libdeclarative-systeminfo Requires: qca-ossl @@ -33,6 +34,8 @@ %prep %setup -q -n %{name} +# fix-mer-build.patch +%patch0 -p1 # >> setup # << setup @@ -62,8 +65,8 @@ %files %defattr(-,root,root,-) -/usr/share/applications/%{name}.desktop +%{_datadir}/applications/%{name}.desktop /opt/%{name} -/usr/share/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png # >> files # << files other changes: -------------- ++++++ fix-mer-build.patch (new) --- fix-mer-build.patch +++ fix-mer-build.patch @@ -0,0 +1,13 @@ +diff --git a/meepasswords.pro b/meepasswords.pro +index 3bc67af..195f045 100644 +--- a/meepasswords.pro ++++ b/meepasswords.pro +@@ -1,7 +1,7 @@ + # Add more folders to ship with the application, here + + #exists($$QMAKE_INCDIR_QT"/../applauncherd/MDeclarativeCache"):!contains(MEEGO_EDITION,harmattan): { +-exists($$QMAKE_INCDIR_QT"/../applauncherd/MDeclarativeCache"): { ++exists($$QMAKE_INCDIR_QT"/../mdeclarativecache/MDeclarativeCache"): { + MEEGO_VERSION_MAJOR = 1 + MEEGO_VERSION_MINOR = 2 + MEEGO_VERSION_PATCH = 0 ++++++ meepasswords.yaml --- meepasswords.yaml +++ meepasswords.yaml @@ -7,6 +7,8 @@ URL: http://meepasswords.garage.maemo.org/ Sources: - "%{name}_%{version}.tar.gz" +Patches: + - "fix-mer-build.patch" Description: MeePasswords is a simple tool to securely store short snippets of sensible or confidential data such as passwords and the like. @@ -23,6 +25,6 @@ Configure: none Builder: qmake Files: - - "/usr/share/applications/%{name}.desktop" + - "%{_datadir}/applications/%{name}.desktop" - "/opt/%{name}" - - "/usr/share/icons/hicolor/*/apps/%{name}.png" + - "%{_datadir}/icons/hicolor/*/apps/%{name}.png"
