From a95c7c803a24048eedad7e8c291e9ede221faf91 Mon Sep 17 00:00:00 2001 From: Hauke Schade Date: Wed, 16 Apr 2014 14:53:15 +0200 Subject: [PATCH] [sailfish] updated package name -- closes #71 --- harbour-ttrss-cnlpete.desktop | 7 +++++ ...our-ttrss.pro => harbour-ttrss-cnlpete.pro | 8 +++--- harbour-ttrss.desktop | 7 ----- ...ur-ttrss.png => harbour-ttrss-cnlpete.png} | Bin ...-ttrss.spec => harbour-ttrss-cnlpete.spec} | 26 ++++++++---------- ...-ttrss.yaml => harbour-ttrss-cnlpete.yaml} | 24 ++++++++-------- 6 files changed, 34 insertions(+), 38 deletions(-) create mode 100644 harbour-ttrss-cnlpete.desktop rename harbour-ttrss.pro => harbour-ttrss-cnlpete.pro (91%) delete mode 100644 harbour-ttrss.desktop rename images/{harbour-ttrss.png => harbour-ttrss-cnlpete.png} (100%) rename rpm/{harbour-ttrss.spec => harbour-ttrss-cnlpete.spec} (81%) rename rpm/{harbour-ttrss.yaml => harbour-ttrss-cnlpete.yaml} (63%) diff --git a/harbour-ttrss-cnlpete.desktop b/harbour-ttrss-cnlpete.desktop new file mode 100644 index 0000000..c480c03 --- /dev/null +++ b/harbour-ttrss-cnlpete.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +X-Nemo-Application-Type=silica-qt5 +Name=Tiny Tiny RSS +Icon=harbour-ttrss-cnlpete +Exec=harbour-ttrss-cnlpete + diff --git a/harbour-ttrss.pro b/harbour-ttrss-cnlpete.pro similarity index 91% rename from harbour-ttrss.pro rename to harbour-ttrss-cnlpete.pro index e30a11a..0da34f2 100644 --- a/harbour-ttrss.pro +++ b/harbour-ttrss-cnlpete.pro @@ -12,7 +12,7 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" DEFINES += Q_OS_SAILFISH -TARGET = harbour-ttrss +TARGET = harbour-ttrss-cnlpete ##CONFIG += sailfishapp @@ -37,7 +37,7 @@ icon.files = images/$${TARGET}.png icon.path = /usr/share/icons/hicolor/86x86/apps INSTALLS += icon -desktop.files = harbour-ttrss.desktop +desktop.files = $${TARGET}.desktop desktop.path = /usr/share/applications INSTALLS += desktop @@ -54,8 +54,8 @@ SOURCES += main.cpp \ mynetworkmanager.cpp \ qmlutils.cpp -OTHER_FILES += rpm/harbour-ttrss.spec \ - rpm/harbour-ttrss.yaml \ +OTHER_FILES += rpm/$${TARGET}.spec \ + rpm/$${TARGET}.yaml \ $$files(rpm/*) \ $$files(qml/ttrss/harmattan/*) diff --git a/harbour-ttrss.desktop b/harbour-ttrss.desktop deleted file mode 100644 index e1f9383..0000000 --- a/harbour-ttrss.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -X-Nemo-Application-Type=silica-qt5 -Name=ttrss -Icon=harbour-ttrss -Exec=harbour-ttrss - diff --git a/images/harbour-ttrss.png b/images/harbour-ttrss-cnlpete.png similarity index 100% rename from images/harbour-ttrss.png rename to images/harbour-ttrss-cnlpete.png diff --git a/rpm/harbour-ttrss.spec b/rpm/harbour-ttrss-cnlpete.spec similarity index 81% rename from rpm/harbour-ttrss.spec rename to rpm/harbour-ttrss-cnlpete.spec index f4f898f..38f40bd 100644 --- a/rpm/harbour-ttrss.spec +++ b/rpm/harbour-ttrss-cnlpete.spec @@ -3,7 +3,7 @@ # Generated by: spectacle version 0.27 # -Name: harbour-ttrss +Name: harbour-ttrss-cnlpete # >> macros # << macros @@ -19,16 +19,16 @@ Group: Qt/Qt License: LICENSE URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 -Source100: harbour-ttrss.yaml +Source100: harbour-ttrss-cnlpete.yaml Requires: sailfishsilica-qt5 >= 0.10.9 -BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 BuildRequires: desktop-file-utils %description -ttrss is a Tiny Tiny RSS Reader App for the Nokia N9 smart phone, written using Qt/QML. It uses the Tiny Tiny RSS JSON API. +ttrss is a Tiny Tiny RSS Reader App for the Nokia N9 and the Jolla smartphone, written using Qt/QML. It uses the Tiny Tiny RSS JSON API. %prep %setup -q -n %{name}-%{version} @@ -62,14 +62,12 @@ desktop-file-install --delete-original \ %files %defattr(-,root,root,-) -/usr/share/harbour-ttrss/qml -/usr/share/icons/hicolor/86x86/apps -/usr/share/applications -/usr/share/harbour-ttrss -/usr/bin -%{_datadir}/icons/hicolor/86x86/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop -%{_datadir}/%{name}/qml %{_bindir} +%{_datadir}/%{name}/qml +%{_datadir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications +%{_datadir}/icons/hicolor/86x86/apps/%{name}.png +%{_datadir}/icons/hicolor/86x86/apps # >> files # << files diff --git a/rpm/harbour-ttrss.yaml b/rpm/harbour-ttrss-cnlpete.yaml similarity index 63% rename from rpm/harbour-ttrss.yaml rename to rpm/harbour-ttrss-cnlpete.yaml index f5910f0..8d2d12d 100644 --- a/rpm/harbour-ttrss.yaml +++ b/rpm/harbour-ttrss-cnlpete.yaml @@ -1,4 +1,4 @@ -Name: harbour-ttrss +Name: harbour-ttrss-cnlpete Summary: The Tiny Tiny RSS Reader for Sailfish Version: 0.3.6 Release: 1 @@ -8,24 +8,22 @@ License: LICENSE Sources: - '%{name}-%{version}.tar.bz2' Description: |- - ttrss is a Tiny Tiny RSS Reader App for the Nokia N9 smart phone, written using Qt/QML. It uses the Tiny Tiny RSS JSON API. + ttrss is a Tiny Tiny RSS Reader App for the Nokia N9 and the Jolla smartphone, written using Qt/QML. It uses the Tiny Tiny RSS JSON API. Configure: none Builder: qtc5 PkgConfigBR: -- sailfishapp >= 0.0.10 -- Qt5Core -- Qt5Qml - Qt5Quick +- Qt5Qml +- Qt5Core +- sailfishapp >= 0.0.10 Requires: - sailfishsilica-qt5 >= 0.10.9 Files: -- /usr/share/harbour-ttrss/qml -- /usr/share/icons/hicolor/86x86/apps -- /usr/share/applications -- /usr/share/harbour-ttrss -- /usr/bin -- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/%{name}/qml' - '%{_bindir}' +- '%{_datadir}/%{name}/qml' +- '%{_datadir}/%{name}' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/applications' +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- '%{_datadir}/icons/hicolor/86x86/apps' PkgBR: []