SHA256
1
0
forked from pool/marble
Christophe Giboudeaux 2015-08-19 11:58:13 +00:00 committed by Git OBS Bridge
parent b2bb0de488
commit 27221e03ed
2 changed files with 26 additions and 26 deletions

View File

@ -2,6 +2,8 @@
Wed Aug 19 11:09:31 UTC 2015 - cgiboudeaux@gmx.com
- Add marble_fix_ppc64_build.patch. Fixes the ppc64 installation paths
- Move FindMarble.cmake to marble-devel
- Spec cleanup
-------------------------------------------------------------------
Fri Aug 7 07:04:33 UTC 2015 - tittiatcoke@gmail.com

View File

@ -153,9 +153,6 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
-DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \
-DBUILD_TESTING=OFF \
-DBUILD_MARBLE_TESTS=NO \
%ifarch x86_64
-DLIB_SUFFIX=64 \
%endif
-DWITH_KF5=TRUE \
..
@ -167,8 +164,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop
rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop
rm -rf %{buildroot}/designer
rm -rf %{buildroot}%{_bindir}/marble-mobile
rm -rf %{buildroot}%{_bindir}/marble-touch
rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile
rm -rf %{buildroot}%{_kf5_bindir}/marble-touch
%post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
@ -181,24 +178,25 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%files
%defattr(-,root,root)
%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
%{_datadir}/marble/
%{_datadir}/appdata/
%{_libdir}/marble/
%exclude %{_datadir}/marble/data
%dir %{_libdir}/plugins/
%{_libdir}/plugins/designer/
%dir %{_kf5_libdir}/plugins/
%exclude %{_kf5_sharedir}/marble/data
%exclude %{_kf5_sharedir}/marble/cmake
%{_kf5_applicationsdir}/marble_geo.desktop
%{_kf5_applicationsdir}/marble_gpx.desktop
%{_kf5_applicationsdir}/marble_kml.desktop
%{_kf5_applicationsdir}/marble_kmz.desktop
%{_kf5_applicationsdir}/marble_osm.desktop
%{_kf5_applicationsdir}/marble_worldwind.desktop
%{_kf5_configkcfgdir}/
%{_kf5_iconsdir}/hicolor/*/apps/marble.*
%_kf5_plugindir/libmarble*so
%_kf5_plugindir/libplasma_runner_marble.so
%_kf5_servicesdir/*desktop
%_kf5_kxmlguidir/marble/
%_kf5_configkcfgdir/
%_kf5_applicationsdir/marble_geo.desktop
%_kf5_applicationsdir/marble_gpx.desktop
%_kf5_applicationsdir/marble_kml.desktop
%_kf5_applicationsdir/marble_kmz.desktop
%_kf5_applicationsdir/marble_osm.desktop
%_kf5_applicationsdir/marble_worldwind.desktop
%{_kf5_kxmlguidir}/marble/
%{_kf5_libdir}/marble/
%{_kf5_libdir}/plugins/designer/
%{_kf5_plugindir}/libmarble*so
%{_kf5_plugindir}/libplasma_runner_marble.so
%{_kf5_servicesdir}/*desktop
%{_kf5_sharedir}/appdata/
%{_kf5_sharedir}/marble/
%files devel
%defattr(-,root,root)
@ -207,11 +205,11 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%{_includedir}/astro/
%{_kf5_libdir}/libmarblewidget-qt5.so
%{_kf5_libdir}/libastro.so
%{_kf5_sharedir}/marble/cmake/
%files data
%defattr(-,root,root)
%{_datadir}/marble/data
%{_kf5_sharedir}/marble/data
%files doc
%defattr(-,root,root)
@ -228,11 +226,11 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%files qt
%defattr(-,root,root)
%{_kf5_applicationsdir}/marble-qt.desktop
%{_bindir}/marble-qt
%{_kf5_bindir}/marble-qt
%files kde
%defattr(-,root,root)
%{_kf5_applicationsdir}/marble.desktop
%{_bindir}/marble
%{_kf5_bindir}/marble
%changelog