I have made the following changes intended for : CE:MW:Shared / eventfeed
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/7877 Thank You, vesuri [This message was auto-generated] --- Request # 7877: Messages from BOSS: State: review at 2013-02-13T16:21:32 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:vesuri:branches:CE:MW:Shared / eventfeed -> CE:MW:Shared / eventfeed changes files: -------------- --- eventfeed.changes +++ eventfeed.changes @@ -0,0 +1,3 @@ +* Wed Feb 13 2013 Vesa Halttunen <[email protected]> - 0.1.1 +- Install header and prf files. + old: ---- eventfeed-0.1.0.tar.bz2 new: ---- eventfeed-0.1.1.tar.bz2 spec files: ----------- --- eventfeed.spec +++ eventfeed.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.24.1 +# Generated by: spectacle version 0.25 # Name: eventfeed @@ -9,7 +9,7 @@ # << macros Summary: Event feed subsystem -Version: 0.1.0 +Version: 0.1.1 Release: 0 Group: System/GUI/Other License: BSD License @@ -31,6 +31,15 @@ event items. +%package devel +Summary: Development files for eventfeed +License: BSD License +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Files useful for building event feed services. + %package -n libmeegotouchevents Summary: D-Bus interface for MeegoTouch Events Group: Applications/System @@ -62,7 +71,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name} # >> setup # << setup @@ -106,6 +115,13 @@ # >> files # << files +%files devel +%defattr(-,root,root,-) +%{_includedir}/eventfeed/*.h +%{_datadir}/qt4/mkspecs/features/eventfeed.prf +# >> files devel +# << files devel + %files -n libmeegotouchevents %defattr(-,root,root,-) %{_libdir}/libmeegotouchevents.so.* other changes: -------------- ++++++ eventfeed-0.1.0.tar.bz2 -> eventfeed-0.1.1.tar.bz2 --- src/libeventfeed/eventstorage.cpp +++ src/libeventfeed/eventstorage.cpp @@ -41,7 +41,7 @@ : QObject(parent) { m_dbname = QDir::homePath() + "/" + DB_DIR + "/" + DB_NAME; - m_db = QSqlDatabase::addDatabase("QSQLITE"); + m_db = QSqlDatabase::addDatabase("QSQLITE", "EventStorage"); m_db.setDatabaseName(m_dbname); } @@ -63,7 +63,7 @@ if (!m_db.open() || !isSchemaValid()) { reset(); } else { - QSqlQuery query; + QSqlQuery query(m_db); if (!query.exec("PRAGMA foreign_keys = ON")) { qFatal("No foreign keys support in SQLite"); @@ -85,7 +85,7 @@ qlonglong EventStorage::addItem(const QVariantMap ¶meters) { - QSqlQuery query; + QSqlQuery query(m_db); qlonglong id; QString icon = parameters["icon"].toString(); @@ -146,7 +146,7 @@ bool EventStorage::removeItem(const qlonglong &id) { - QSqlQuery query; + QSqlQuery query(m_db); query.prepare("DELETE FROM events WHERE id = :id"); query.bindValue(":id", id); query.exec(); @@ -160,7 +160,7 @@ const QList<qlonglong> EventStorage::removeItemsBySourceName(const QString &sourceName) { - QSqlQuery query; + QSqlQuery query(m_db); QList<qlonglong> ids; m_db.transaction(); query.prepare("SELECT id FROM events WHERE sourceName = :sourceName"); @@ -180,7 +180,7 @@ QList<Event *> EventStorage::getAllItems() { QList<Event *> events; - QSqlQuery query, query_img; + QSqlQuery query(m_db), query_img(m_db); query.exec("SELECT e.id, e.title, e.body, e.timestamp, e.footer, " "e.url, e.sourceName, e.sourceDisplayName, " "i.originalPath FROM events e " @@ -229,7 +229,7 @@ } bool ret; - ret = QSqlQuery().exec( + ret = QSqlQuery(m_db).exec( "CREATE TABLE events (" "id INTEGER PRIMARY KEY, " "title TEXT, body TEXT, " @@ -237,13 +237,13 @@ "action TEXT, url TEXT, " "sourceName TEXT, " "sourceDisplayName TEXT)"); - ret = ret && QSqlQuery().exec( + ret = ret && QSqlQuery(m_db).exec( "CREATE TABLE images (" "id INTEGER, position INTEGER, " "originalPath TEXT, " "type TEXT, PRIMARY KEY(id, position) " "FOREIGN KEY(id) REFERENCES events(id) ON DELETE CASCADE)"); - ret = ret && QSqlQuery().exec("PRAGMA user_version=" STR(DB_SCHEMA_VERSION)); + ret = ret && QSqlQuery(m_db).exec("PRAGMA user_version=" STR(DB_SCHEMA_VERSION)); if (!ret) { qFatal("Can't create db schema"); } @@ -252,7 +252,7 @@ bool EventStorage::isSchemaValid() { - QSqlQuery query; + QSqlQuery query(m_db); if (!query.exec("PRAGMA user_version")) { return false; @@ -270,7 +270,7 @@ QList<qlonglong> ids; if (m_itemCount > MAX_EVENT_ITEMS) { - QSqlQuery query; + QSqlQuery query(m_db); m_db.transaction(); query.exec("SELECT id FROM events ORDER BY timestamp ASC, id ASC LIMIT " STR(EVENT_COUNT_HYSTERESIS)); --- src/libeventfeed/libeventfeed.pro +++ src/libeventfeed/libeventfeed.pro @@ -17,4 +17,9 @@ SOURCES = eventstorage.cpp \ event.cpp -INSTALLS += target +headers.files = $$HEADERS +headers.path = /usr/include/eventfeed +prf.path = $$[QT_INSTALL_DATA]/mkspecs/features +prf.files = eventfeed.prf + +INSTALLS += target headers prf ++++++ eventfeed.yaml --- eventfeed.yaml +++ eventfeed.yaml @@ -1,6 +1,6 @@ Name: eventfeed Summary: Event feed subsystem -Version: 0.1.0 +Version: 0.1.1 Release: 0 Group: System/GUI/Other License: BSD License @@ -31,6 +31,14 @@ - "%exclude %{_libdir}/libeventfeed.so" SubPackages: + - Name: devel + Summary: Development files for eventfeed + Description: Files useful for building event feed services. + Group: System/Libraries + License: BSD License + Files: + - "%{_includedir}/eventfeed/*.h" + - "%{_datadir}/qt4/mkspecs/features/eventfeed.prf" - Name: libmeegotouchevents AsWholeName: yes Summary: D-Bus interface for MeegoTouch Events
