rpm/marble
SHA256
1
0
Fork 0
forked from pool/marble
Code Pull Requests Activity

Accepting request 443839 from home:wolfi323:test

Browse Source 
- Use proper cmake macro for building, remove obsolete WITH_KF5 option

OBS-URL: https://build.opensuse.org/request/show/443839
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=117
This commit is contained in:
Raymond Wooninck
2016-12-05 12:59:51 +00:00
committed by Git OBS Bridge
parent bbaeec2a5d
commit bfec29929f
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
marble.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 5 10:35:37 UTC 2016 - wbauer@tmo.at
- Use proper cmake macro for building, remove obsolete WITH_KF5
option
-------------------------------------------------------------------
Sat Dec 3 16:45:54 UTC 2016 - tittiatcoke@gmail.com

29
marble.spec
View File

@@ -155,37 +155,12 @@ export SUSE_ASNEEDED=0
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
mkdir build
cd build
# FIXME: you should use %%cmake macros
cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
-DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \
-DCMAKE_PREFIX_PATH=%{_kf5_prefix} \
-DKDE_INSTALL_LIBDIR=%{_lib} \
-DKDE_INSTALL_SYSCONFDIR=%{_kf5_sysconfdir} \
-DKDE_INSTALL_QTPLUGINDIR=%{_lib}/qt5/plugins \
-DKDE_INSTALL_PLUGINDIR=%{_lib}/qt5/plugins \
-DKDE_INSTALL_QMLDIR=%{_lib}/qt5/qml \
-DKDE_INSTALL_QTQUICKIMPORTSDIR=%{_lib}/qt5/imports \
-DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \
-DBUILD_TESTING=OFF \
-DBUILD_MARBLE_TESTS=NO \
-DMOBILE=FALSE \
%ifarch x86_64
-DLIB_SUFFIX=64 \
%endif
-DWITH_KF5=TRUE \
..
%cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=FALSE
%make_jobs
%install
%kf5_makeinstall -C build
%fdupes -s %{buildroot}
rm -rf %{buildroot}/designer
#rm -rf %{buildroot}%{_bindir}/marble-mobile
rm -rf %{buildroot}%{_bindir}/marble-touch
#rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop
rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop
%post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
@@ -196,7 +171,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%defattr(-,root,root)
%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
%{_datadir}/marble/
%{_datadir}/metainfo/
%{_kf5_appstreamdir}/
%{_kf5_iconsdir}/hicolor/*/apps/marble.*
%{_libdir}/marble/
%{_libdir}/libmarbledeclarative.so