diff --git a/libmarblewidget.spec b/libmarblewidget.spec index 010d017..ce10b3b 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -39,6 +39,7 @@ The shared library for the MarbleWidget shared library. Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE Requires: libmarblewidget%{_so} = %{version} +Requires: libastro1 = %{version} Conflicts: marble-devel %description devel @@ -51,6 +52,13 @@ Group: Development/Libraries/KDE %description -n libmarblewidget%{_so} The shared library for the MarbleWidget shared library. +%package -n libastro1 +Summary: Astronomy: Shared Library +Group: Development/Libraries/KDE + +%description -n libastro1 +The Astronomy shared library for the MarbleWidget shared library. + %prep %setup -q -n marble-%{version} @@ -59,13 +67,20 @@ The shared library for the MarbleWidget shared library. export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kde4 -d build -- -DQT5BUILD=OFF -cd src/lib/marble -make +pushd src/lib/marble +make +popd +pushd src/lib/astro +make + %install pushd build/src/lib/marble %kde4_makeinstall popd + pushd build/src/lib/astro + %kde4_makeinstall + popd mkdir -p %{buildroot}%{_kde4_appsdir}/cmake/modules cp build/FindMarble.cmake %{buildroot}%{_kde4_appsdir}/cmake/modules/ %fdupes -s %{buildroot} @@ -74,11 +89,17 @@ make %postun -n libmarblewidget%{_so} -p /sbin/ldconfig + +%post -n libastro1 -p /sbin/ldconfig + +%postun -n libastro1 -p /sbin/ldconfig + %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ %{_libdir}/libmarblewidget.so +%{_libdir}/libastro.so %{_kde4_appsdir}/cmake/modules/FindMarble.cmake %files -n libmarblewidget%{_so} @@ -86,4 +107,10 @@ make %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %{_libdir}/libmarblewidget.so.* +%files -n libastro1 +%defattr(-,root,root) +%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt +%{_libdir}/libastro.so.* + + %changelog