diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-09-02 14:39:37 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-09-04 07:46:35 -0700 |
| commit | 2b40e15713e2ccb8963ff8c1eb57f9374e04547d (patch) | |
| tree | 1da96921b5d5bd887a20b83c13f17089fca5445b /packaging/OBS | |
| parent | 4bb180b1178d293de4c55099a23d70d385e517d9 (diff) | |
| download | subsurface-2b40e15713e2ccb8963ff8c1eb57f9374e04547d.tar.gz | |
remove Marble from packaging and build scripts
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
please note, that i have no way to test most of the scripts ATM.
Diffstat (limited to 'packaging/OBS')
| -rw-r--r-- | packaging/OBS/subsurfacedaily.spec | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/packaging/OBS/subsurfacedaily.spec b/packaging/OBS/subsurfacedaily.spec index 7eaa2f963..8a89ba551 100644 --- a/packaging/OBS/subsurfacedaily.spec +++ b/packaging/OBS/subsurfacedaily.spec @@ -84,7 +84,7 @@ Recommends: qt5-qttranslations BuildRoot: %{_tmppath}/subsurface%{version}-build %description -This is the official Subsurface build, including our own custom libdivecomputer and libssrfmarblewidget +This is the official Subsurface build, including our own custom libdivecomputer %prep %setup -q @@ -103,27 +103,14 @@ mkdir -p install-root .. ; \ make %{?_smp_mflags} ; \ make install) -(mkdir marble-build ; cd marble-build ; \ - cmake -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_DIR/install-root \ - -DQTONLY=ON -DQT5BUILD=ON \ - -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \ - -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \ - -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \ - -DBUILD_WITH_DBUS=OFF ../marble-source \ - -DCMAKE_C_FLAGS:STRING="%optflags" \ - -DCMAKE_CXX_FLAGS:STRING="%optflags" ; \ - make %{?_smp_mflags} ; \ - cd src/lib/marble ; make install ; ) (mkdir subsurface-build ; cd subsurface-build ; \ cmake -DCMAKE_BUILD_TYPE=Release \ -DLRELEASE=lrelease-qt5 \ -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ -DLIBDIVECOMPUTER_INCLUDE_DIR=$RPM_BUILD_DIR/install-root/include \ -DLIBGIT2_INCLUDE_DIR=$RPM_BUILD_DIR/install-root/include \ - -DMARBLE_INCLUDE_DIR=$RPM_BUILD_DIR/install-root/include \ -DLIBDIVECOMPUTER_LIBRARIES=$RPM_BUILD_DIR/install-root/lib/libdivecomputer.a \ -DLIBGIT2_LIBRARIES=$RPM_BUILD_DIR/install-root/lib/libgit2.a \ - -DMARBLE_LIBRARIES=$RPM_BUILD_DIR/install-root/lib/libssrfmarblewidget.so \ -DUSE_LIBGIT23_API=ON \ -DCMAKE_C_FLAGS:STRING="%optflags" \ -DCMAKE_CXX_FLAGS:STRING="%optflags" \ @@ -157,7 +144,6 @@ desktop-file-install --dir=%{buildroot}/%{_datadir}/applications subsurface.desk %{_datadir}/applications/subsurface.desktop %{_datadir}/icons/hicolor/*/apps/subsurface-icon.* %{_datadir}/subsurface/ -%{_libdir}/libssrfmarblewidget.so* %changelog |