I have made the following changes intended for : nemo:testing:apps / fingerterm nemo:testing:apps / patterns-nemo-apps nemo:testing:apps / qmlmaps nemo:testing:apps / QZeeControl nemo:testing:apps / vumeter nemo:testing:apps / meego-handset-maps nemo:testing:apps / meego-terminal
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/258 Thank You, Marko Saukko [This message was auto-generated] --- Request # 258: Messages from BOSS: State: review at 2013-04-25T12:17:05 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:testing: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: nemo:devel:apps / fingerterm -> nemo:testing:apps / fingerterm changes files: -------------- ++++++ new changes file: --- _service:tar_git:fingerterm.changes +++ _service:tar_git:fingerterm.changes @@ -0,0 +1,9 @@ +* Wed Apr 03 2013 Robin Burchell <[email protected]> - 1.0.4 +- [fingerterm] Replace meego-terminal as the terminal on device. + +* Sun Mar 03 2013 Bernd Wachter <[email protected]> - 1.0.3 +- Move to Nemo specific target + +* Mon Jul 09 2012 Bernd Wachter <[email protected]> - 1.0.2 +- Initial package for Nemo + ++++++ deleted changes files: --- fingerterm.changes old: ---- fingerterm-1.0.3.tar.gz fingerterm.changes fingerterm.spec new: ---- _service _service:tar_git:fingerterm-1.0.4.tar.gz _service:tar_git:fingerterm.changes _service:tar_git:fingerterm.spec spec files: ----------- ++++++ new spec file: --- _service:tar_git:fingerterm.spec +++ _service:tar_git:fingerterm.spec @@ -0,0 +1,35 @@ +Name: fingerterm +Version: 1.0.4 +Release: 1 +Summary: A terminal emulator with a custom virtual keyboard +Group: System/Base +License: GPLv2 +Source0: %{name}-%{version}.tar.gz +URL: https://github.com/nemomobile/fingerterm +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtOpenGL) +Obsoletes: meego-terminal <= 0.2.2 +Provides: meego-terminal > 0.2.2 + +%description +%{summary}. + +%files +%defattr(-,root,root,-) +%{_bindir}/* +%{_datadir}/applications/*.desktop + + +%prep +%setup -q -n %{name}-%{version} + + +%build +sed -i 's,/opt/fingerterm/,/usr/,' fingerterm.pro +qmake MEEGO_EDITION=nemo +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make INSTALL_ROOT=%{buildroot} install ++++++ deleted spec files: --- fingerterm.spec other changes: -------------- ++++++ _service (new) --- _service +++ _service @@ -0,0 +1,8 @@ + +<services> + <service name="tar_git"> + <param name="url">https://github.com/nemomobile/fingerterm.git</param> + <param name="branch">master</param> + <param name="revision">632f5f5ef4269bbaaffbac8d2960d17aaf9e8fe0</param> + </service> +</services> ++++++ _service:tar_git:fingerterm-1.0.4.tar.gz (new) ++++++ deleted files: --- fingerterm-1.0.3.tar.gz submit: nemo:devel:apps / patterns-nemo-apps -> nemo:testing:apps / patterns-nemo-apps changes files: -------------- --- _service:tar_git:patterns-nemo-apps.changes +++ _service:tar_git:patterns-nemo-apps.changes @@ -0,0 +1,4 @@ +* Thu Apr 25 2013 Marko Saukko <[email protected]> - 0.4 +- [apps] meego-handset-maps renamed to qmlmaps +- [packaging] Add version to patterns. + old: ---- _service:tar_git:patterns-nemo-apps-0.3.tar.bz2 new: ---- _service:tar_git:patterns-nemo-apps-0.4.tar.bz2 spec files: ----------- --- _service:tar_git:pattern-apps.spec +++ _service:tar_git:pattern-apps.spec @@ -1,6 +1,6 @@ Name: patterns-nemo-apps Summary: Provides pattern '%{name}' -Version: 0.3 +Version: 0.4 Release: 1 Group: Packaging/Patterns License: GPLv2 @@ -20,6 +20,8 @@ %install rm -rf %{buildroot} +export VERSION=%{version} +export RELEASE=%{release} %make_install %files other changes: -------------- ++++++ _service --- _service +++ _service @@ -3,6 +3,6 @@ <service name="tar_git"> <param name="url">https://github.com/nemomobile/nemo-patterns.git</param> <param name="branch">patterns-apps</param> - <param name="revision">c2e82d392bd8de37cf91073f5cf4a179d6072dd2</param> + <param name="revision">93eaf59bb914f094263b57ae5947542d0b25a306</param> </service> </services> ++++++ _service:tar_git:patterns-nemo-apps-0.3.tar.bz2 -> _service:tar_git:patterns-nemo-apps-0.4.tar.bz2 --- patterns-nemo-apps-0.3/Makefile +++ patterns-nemo-apps-0.3/Makefile @@ -1,4 +0,0 @@ -all: - -install: - /usr/bin/repomd-pattern-builder.py --patternxml -p ./ -o $(DESTDIR)/usr/share/package-groups/ --- patterns-nemo-apps-0.3/nemo-apps.yaml +++ patterns-nemo-apps-0.3/nemo-apps.yaml @@ -1,40 +0,0 @@ -Description: Nemo Apps -Name: nemo-apps -Requires: -- accounts-ui -- apps-client -- com.substanceofcode.kasvopus -- com.substanceofcode.newsflow -- com.substanceofcode.twimgo -- fingerterm -- flickr-qml -- heliumreborn -- info.vivainio.qatbowling -- info.vivainio.qmlreddit -- irc-chatter -# Needs gst plugin that we don't have yet -#- meego-handset-camera -- meego-handset-maps -- qmlpinquery -- meepasswords -- mg-package-manager -- myatzy -- qmlmusicplayer -- puzzle-master -- qmlcalc -- qmlcalendar -- qmlcontacts -- qmlfilemuncher -- qmlgallery -- qmlmail -- qmlmessages -- qmlnotes -- qtflyingbus -- qtodo -- redak -# Adding gabble to get jabber support included as it -# is optional feature for qmlmessages for example -- telepathy-gabble -- voicecall-ui-reference -- openssh-clients -Summary: Nemo Apps --- patterns-nemo-apps-0.3/rpm/pattern-apps.spec +++ patterns-nemo-apps-0.3/rpm/pattern-apps.spec @@ -1,27 +0,0 @@ -Name: patterns-nemo-apps -Summary: Provides pattern '%{name}' -Version: 011 -Release: 1 -Group: Packaging/Patterns -License: GPLv2 -BuildArch: noarch -URL: https://github.com/nemomobile/nemo-patterns -Source0: %{name}-%{version}.tar.bz2 -BuildRequires: repomd-pattern-builder -Provides: package-groups - -%description -%{summary}. - -%prep -%setup -q -n %{name}-%{version} - -%build - -%install -rm -rf %{buildroot} -%make_install - -%files -%defattr(-,root,root,-) -%{_datadir}/package-groups/*.xml --- patterns-nemo-apps-0.4/Makefile +++ patterns-nemo-apps-0.4/Makefile @@ -0,0 +1,4 @@ +all: + +install: + /usr/bin/repomd-pattern-builder.py --patternxml --version=$(VERSION) --release=$(RELEASE) -p ./ -o $(DESTDIR)/usr/share/package-groups/ --- patterns-nemo-apps-0.4/nemo-apps.yaml +++ patterns-nemo-apps-0.4/nemo-apps.yaml @@ -0,0 +1,40 @@ +Description: Nemo Apps +Name: nemo-apps +Requires: +- accounts-ui +- apps-client +- com.substanceofcode.kasvopus +- com.substanceofcode.newsflow +- com.substanceofcode.twimgo +- fingerterm +- flickr-qml +- heliumreborn +- info.vivainio.qatbowling +- info.vivainio.qmlreddit +- irc-chatter +# Needs gst plugin that we don't have yet +#- meego-handset-camera +- qmlmaps +- qmlpinquery +- meepasswords +- mg-package-manager +- myatzy +- qmlmusicplayer +- puzzle-master +- qmlcalc +- qmlcalendar +- qmlcontacts +- qmlfilemuncher +- qmlgallery +- qmlmail +- qmlmessages +- qmlnotes +- qtflyingbus +- qtodo +- redak +# Adding gabble to get jabber support included as it +# is optional feature for qmlmessages for example +- telepathy-gabble +- voicecall-ui-reference +- openssh-clients +Summary: Nemo Apps --- patterns-nemo-apps-0.4/rpm/pattern-apps.spec +++ patterns-nemo-apps-0.4/rpm/pattern-apps.spec @@ -0,0 +1,29 @@ +Name: patterns-nemo-apps +Summary: Provides pattern '%{name}' +Version: 011 +Release: 1 +Group: Packaging/Patterns +License: GPLv2 +BuildArch: noarch +URL: https://github.com/nemomobile/nemo-patterns +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: repomd-pattern-builder +Provides: package-groups + +%description +%{summary}. + +%prep +%setup -q -n %{name}-%{version} + +%build + +%install +rm -rf %{buildroot} +export VERSION=%{version} +export RELEASE=%{release} +%make_install + +%files +%defattr(-,root,root,-) +%{_datadir}/package-groups/*.xml submit: nemo:devel:apps / qmlmaps -> nemo:testing:apps / qmlmaps changes files: -------------- ++++++ new changes file: --- _service:tar_git:qmlmaps.changes +++ _service:tar_git:qmlmaps.changes @@ -0,0 +1,34 @@ +* Mon Apr 22 2013 John Brooks <[email protected]> - 0.1.7 +- [qmlmaps] Correctly link to qdeclarative-boostable +- [qmlmaps] Update packaging + +* Mon Sep 10 2012 Marko Saukko <[email protected]> - 0.1.6 +- Drop %{?_isa} from dependency + +* Tue Feb 21 2012 Marko Saukko <[email protected]> - 0.1.6 +- Added dependency to qt-components + +* Thu Dec 01 2011 Jakub Pavelek <[email protected]> - 0.1.6 +- Flicker free + +* Fri Nov 18 2011 Jakub Pavelek <[email protected]> - 0.1.5 +- Boosted P and L + +* Fri Nov 11 2011 Jakub Pavelek <[email protected]> - 0.1.4 +- Boosted ARM version for real, splash images + +* Fri Oct 14 2011 Jakub Pavelek <[email protected]> - 0.1.3 +- Boosted ARM version, normal x86 version + +* Thu Oct 06 2011 Jakub Pavelek <[email protected]> - 0.1.2 +- Fullscreen mode and packaging changes + +* Wed Oct 05 2011 Jakub Pavelek <[email protected]> - 0.1.1.1 +- fixin binary name + +* Wed Oct 05 2011 Jakub Pavelek <[email protected]> - 0.1.1 +- adding desktop file + +* Tue Sep 27 2011 Jakub Pavelek <[email protected]> - 0.1 +- first RPM packaging release + new: ---- _service _service:tar_git:qmlmaps-0.1.7.tar.bz2 _service:tar_git:qmlmaps.changes _service:tar_git:qmlmaps.spec spec files: ----------- ++++++ new spec file: --- _service:tar_git:qmlmaps.spec +++ _service:tar_git:qmlmaps.spec @@ -0,0 +1,44 @@ +Name: qmlmaps +Version: 0.1.7 +Release: 1 +Summary: Simple and fast maps application for QML. Needs data connection! +Group: User Interface/Desktops +License: GPL v2 +URL: https://github.com/nemomobile/qmlmaps +Source0: %{name}-%{version}.tar.bz2 +Requires: qt-components +Requires: libdeclarative-location +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(QtDeclarative) +BuildRequires: pkgconfig(qdeclarative-boostable) +Obsoletes: meego-handset-maps < 0.1.7 +Provides: meego-handset-maps >= 0.1.7 + +%description +QML Maps - simple and fast maps application. Uses QtMObility and thus needs data connection to function. + +%prep +%setup -q -n %{name}-%{version} + +%build +%qmake +make %{?jobs:-j%jobs} + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/usr/bin/ +install -m 755 bin/meego-handset-maps %{buildroot}/usr/bin/ +mkdir -p %{buildroot}/usr/share/applications/ +install -m 644 src/data/meego-handset-maps.desktop %{buildroot}/usr/share/applications/ +mkdir -p %{buildroot}/usr/share/pixmaps/ +install -m 644 src/data/meego-handset-maps-splash-l-800x480.png %{buildroot}/usr/share/pixmaps/ +install -m 644 src/data/meego-handset-maps-splash-p-800x480.png %{buildroot}/usr/share/pixmaps/ + +%files +%defattr(-,root,root,-) +/usr/bin/meego-handset-maps +/usr/share/applications/meego-handset-maps.desktop +/usr/share/pixmaps/meego-handset-maps-splash-l-800x480.png +/usr/share/pixmaps/meego-handset-maps-splash-p-800x480.png + other changes: -------------- ++++++ _service (new) --- _service +++ _service @@ -0,0 +1,8 @@ + +<services> + <service name="tar_git"> + <param name="url">https://github.com/nemomobile/qmlmaps.git</param> + <param name="branch">master</param> + <param name="revision">e762e4691aaa31652d33092aeb84273be7b9a811</param> + </service> +</services> ++++++ _service:tar_git:qmlmaps-0.1.7.tar.bz2 (new) submit: nemo:devel:apps / QZeeControl -> nemo:testing:apps / QZeeControl changes files: -------------- --- qzeecontrol.changes +++ qzeecontrol.changes @@ -0,0 +1,3 @@ +* Mon Apr 22 2013 Ruediger Gad <[email protected]> - 0.4.0 +- Fix build. + new: ---- fix-mer-build.patch spec files: ----------- --- qzeecontrol.spec +++ qzeecontrol.spec @@ -16,6 +16,7 @@ URL: http://qzeecontrol.garage.maemo.org/ Source0: %{name}_%{version}.tar.gz Source100: qzeecontrol.yaml +Patch0: fix-mer-build.patch BuildRequires: pkgconfig(QtCore) >= 4.7.0 BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtConnectivity) @@ -31,6 +32,8 @@ %prep %setup -q -n %{name}-%{version} +# fix-mer-build.patch +%patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ fix-mer-build.patch (new) --- fix-mer-build.patch +++ fix-mer-build.patch @@ -0,0 +1,10 @@ +diff --git a/QZeeControl.pro b/QZeeControl.pro +index 024ba5f..01f3e2b 100644 +--- a/QZeeControl.pro ++++ b/QZeeControl.pro +@@ -1,4 +1,4 @@ +-exists($$QMAKE_INCDIR_QT"/../applauncherd/MDeclarativeCache"): { ++exists($$QMAKE_INCDIR_QT"/../mdeclarativecache/MDeclarativeCache"): { + MEEGO_VERSION_MAJOR = 1 + MEEGO_VERSION_MINOR = 2 + MEEGO_VERSION_PATCH = 0 ++++++ qzeecontrol.yaml --- qzeecontrol.yaml +++ qzeecontrol.yaml @@ -7,6 +7,8 @@ URL: http://qzeecontrol.garage.maemo.org/ Sources: - "%{name}_%{version}.tar.gz" +Patches: + - "fix-mer-build.patch" Description: QZeeControl lets you control your N9/N950 with a Zeemote(TM) Bluetooth remote control. QZeeControl is completly written from scratch in Qt/QML. Zeemote (TM) is a trademark of Zeemote Technology Inc. Other trademarks are property of their respective owners. submit: nemo:devel:apps / vumeter -> nemo:testing:apps / vumeter changes files: -------------- --- vumeter.changes +++ vumeter.changes @@ -0,0 +1,3 @@ +* Mon Apr 22 2013 Ruediger Gad <[email protected]> - 0.2.1 +- Fix mer build. + new: ---- fix-mer-build.patch spec files: ----------- --- vumeter.spec +++ vumeter.spec @@ -16,6 +16,7 @@ URL: http://vumeter.garage.maemo.org/ Source0: %{name}_%{version}.tar.gz Source100: vumeter.yaml +Patch0: fix-mer-build.patch BuildRequires: pkgconfig(QtCore) >= 4.7.0 BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtOpenGL) @@ -31,6 +32,8 @@ %prep %setup -q -n %{name}-%{version} +# fix-mer-build.patch +%patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ fix-mer-build.patch (new) --- fix-mer-build.patch +++ fix-mer-build.patch @@ -0,0 +1,13 @@ +diff --git a/vumeter.pro b/vumeter.pro +index a6636d0..57fc11c 100644 +--- a/vumeter.pro ++++ b/vumeter.pro +@@ -63,7 +63,7 @@ linux-g++-maemo5 { + } + + # Harmattan specific stuff goes here. +-exists($$QMAKE_INCDIR_QT"/../applauncherd/MDeclarativeCache"): { ++exists($$QMAKE_INCDIR_QT"/../mdeclarativecache/MDeclarativeCache"): { + MEEGO_VERSION_MAJOR = 1 + MEEGO_VERSION_MINOR = 2 + MEEGO_VERSION_PATCH = 0 ++++++ vumeter.yaml --- vumeter.yaml +++ vumeter.yaml @@ -7,6 +7,8 @@ URL: http://vumeter.garage.maemo.org/ Sources: - "%{name}_%{version}.tar.gz" +Patches: + - "fix-mer-build.patch" Description: VUMeter is a fun-tool to display the sound level. VUMeter presents the current sound level using different views. delete: / -> nemo:testing:apps / meego-handset-maps delete: / -> nemo:testing:apps / meego-terminal
