Compare commits
No commits in common. "master" and "fixed_aurora_build" have entirely different histories.
master
...
fixed_auro
6 changed files with 85 additions and 7 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -6,10 +6,8 @@ moc_*.cpp
|
|||
*.moc
|
||||
Makefile
|
||||
*.a
|
||||
*.so
|
||||
*.list
|
||||
org.monich.harbour.books*.qm
|
||||
org.monich.harbour.books*.ts
|
||||
org.monich.harbour.books
|
||||
RPMS/
|
||||
.DS_Store
|
||||
|
|
|
@ -18,5 +18,5 @@ X-Nemo-Application-Type=silica-qt5
|
|||
Permissions=Documents;Downloads;RemovableMedia;Audio
|
||||
OrganizationName=org.monich
|
||||
ApplicationName=harbour.books
|
||||
ExecDBus=/usr/bin/org.monich.harbour.books
|
||||
ExecDBus=/usr/bin/org.monich.harbour.books %u
|
||||
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
# define BOOKS_SETTINGS_MENU true
|
||||
#endif
|
||||
|
||||
#define BOOKS_SETTINGS_PATH "org.monich/harbour.books"
|
||||
#define BOOKS_DBUS_SERVICE BOOKS_DBUS_INTERFACE
|
||||
#define BOOKS_DCONF_ROOT "/apps/" BOOKS_APP_NAME "/"
|
||||
#define BOOKS_DATA_ROOT "usr/share/" BOOKS_APP_NAME
|
||||
|
|
|
@ -104,7 +104,6 @@ BooksStorage::Private::Private(
|
|||
{
|
||||
QString cfgDir;
|
||||
cfgDir = QString::fromStdString(ZLibrary::ApplicationWritableDirectory());
|
||||
cfgDir.replace(QString(BOOKS_APP_NAME),QString(BOOKS_SETTINGS_PATH));
|
||||
if (!cfgDir.endsWith('/')) cfgDir += '/';
|
||||
QString subDir;
|
||||
switch (aType) {
|
||||
|
|
82
rpm/openrepos-books.spec.old
Normal file
82
rpm/openrepos-books.spec.old
Normal file
|
@ -0,0 +1,82 @@
|
|||
Name: openrepos-books
|
||||
Summary: E-book reader
|
||||
Version: 1.1.5
|
||||
Release: 1
|
||||
License: BSD
|
||||
Vendor: slava
|
||||
Group: Applications/File
|
||||
URL: http://github.com/monich/harbour-books
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
Requires: sailfishsilica-qt5
|
||||
Requires: qt5-qtsvg-plugin-imageformat-svg
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(sailfishapp)
|
||||
BuildRequires: pkgconfig(Qt5Quick)
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Svg)
|
||||
BuildRequires: pkgconfig(Qt5Qml)
|
||||
BuildRequires: pkgconfig(mlite5)
|
||||
BuildRequires: pkgconfig(expat)
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
BuildRequires: file-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: qt5-qttools-linguist
|
||||
|
||||
%{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
|
||||
%{!?qtc_make:%define qtc_make make}
|
||||
%{?qtc_builddir:%define _builddir %qtc_builddir}
|
||||
|
||||
%description
|
||||
FBReader-based e-book reader.
|
||||
|
||||
%if "%{?vendor}" == "chum"
|
||||
Categories:
|
||||
- Office
|
||||
Icon: https://raw.githubusercontent.com/monich/harbour-books/master/app/icons/harbour-books.svg
|
||||
Screenshots:
|
||||
- https://home.monich.net/chum/harbour-books/screenshots/screenshot-001.png
|
||||
- https://home.monich.net/chum/harbour-books/screenshots/screenshot-002.png
|
||||
- https://home.monich.net/chum/harbour-books/screenshots/screenshot-003.png
|
||||
Url:
|
||||
Homepage: https://openrepos.net/content/slava/books
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
|
||||
%build
|
||||
%qtc_qmake5 CONFIG+=openrepos CONFIG+=app_settings harbour-books.pro
|
||||
%qtc_make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
cd app
|
||||
%qmake5_install
|
||||
cd settings
|
||||
%qmake5_install
|
||||
|
||||
desktop-file-install --delete-original \
|
||||
--dir %{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}%{_datadir}/applications/*.desktop
|
||||
|
||||
%check
|
||||
make -C test test
|
||||
|
||||
%preun
|
||||
if [ "$1" == 0 ] ; then \
|
||||
getent passwd | grep -v '/nologin$' | \
|
||||
while IFS=: read -r name pw uid gid comment home shell; \
|
||||
do rm -fr "$home/.local/share/openrepos-books"; done; fi || :
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
%{_datadir}/translations/%{name}*.qm
|
||||
%{_datadir}/dbus-1/services/%{name}.service
|
||||
%{_datadir}/jolla-settings/entries/%{name}.json
|
||||
%{_libdir}/qt5/qml/openrepos/books/settings
|
|
@ -1,7 +1,7 @@
|
|||
Name: org.monich.harbour.books
|
||||
Summary: E-book reader
|
||||
Version: 1.1.5
|
||||
Release: 3
|
||||
Release: 2
|
||||
License: BSD
|
||||
Group: Applications/File
|
||||
URL: https://github.com/sprainbrains/harbour-books/tree/auroraos
|
||||
|
@ -57,7 +57,7 @@ do
|
|||
done
|
||||
|
||||
%check
|
||||
#make -C test test
|
||||
make -C test test
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
|
|
Loading…
Reference in a new issue