[sailfish] updated package name -- closes #71

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
+

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/*)
 

harbour-ttrss.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-X-Nemo-Application-Type=silica-qt5
-Name=ttrss
-Icon=harbour-ttrss
-Exec=harbour-ttrss
-

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

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: []