Hello community, here is the log from the commit of package kstars for openSUSE:Factory checked in at Mon Sep 26 10:07:23 CEST 2011.
-------- --- kstars/kstars.changes 2011-09-11 10:58:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/kstars/kstars.changes 2011-09-22 23:24:21.000000000 +0200 @@ -0,0 +1,20 @@ +------------------------------------------------------------------- +Thu Sep 22 21:22:12 UTC 2011 - [email protected] + +- Added a patch for FindCFitsio.cmake to correctly find the cfitsio library. + +------------------------------------------------------------------- +Tue Sep 20 18:22:46 UTC 2011 - [email protected] + +- Spec file updates: + * Changed License: to GPL-2.0+. + * Cleanup in BuildRequires: (removed depedencies left from the kdeedu package + and added Mesa-devel, libindi, libkde4-devel and update-desktop-files). + * Removed libkeduvocdocument4 from Requires: and %py_requires (not needed). + * Recommend libindi and xplanet. + * Don't install the static library (libhtmesh.a). + * Changed the Group: of libSatLib4 to System/Libraries. + * Removed /sbin/ldconfig %post/%postun sections for the main package (not + needed). + * Minor other updates. + calling whatdependson for head-i586 New: ---- FindCFitsio.cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kstars.spec ++++++ --- /var/tmp/diff_new_pack.Pqupan/_old 2011-09-26 10:07:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Pqupan/_new 2011-09-26 10:07:19.000000000 +0200 @@ -18,100 +18,93 @@ Name: kstars -BuildRequires: avogadro-devel -BuildRequires: boost-devel -BuildRequires: fdupes -BuildRequires: freeglut-devel -BuildRequires: glew-devel -BuildRequires: gsl-devel -BuildRequires: kdebase4-workspace-devel -BuildRequires: libcfitsio-devel -BuildRequires: libeigen2-devel -BuildRequires: libgmm++-devel -BuildRequires: libindi-devel -BuildRequires: libkdeedu4-devel -BuildRequires: libopenbabel-devel -BuildRequires: libqalculate-devel -BuildRequires: libspectre-devel -BuildRequires: python-qt4-devel -BuildRequires: readline-devel -BuildRequires: xplanet -# currently in DOESNOTBUILD (2008-07-03) -%ifnarch ppc ppc64 s390 s390x -BuildRequires: ocaml -BuildRequires: ocaml-facile -%endif Version: 4.7.1 Release: 1 -License: GPLv2+ +License: GPL-2.0+ Summary: Desktop Planetarium -Url: http://edu.kde.org +Url: http://edu.kde.org/kstars/ Group: Productivity/Scientific/Astronomy Source0: %{name}-%{version}.tar.bz2 -Requires: libkeduvocdocument4 +# PATCH-FIX-UPSTREAM FindCFitsio.cmake.patch [email protected] -- Fix FindCFitsio.cmake to correctly find the cfitsio library (taken from http://code.google.com/p/open-phd-guiding/source/browse/trunk/cmake_modules/FindCFITSIO.cmake?r=71) +Patch0: FindCFitsio.cmake.patch +BuildRequires: Mesa-devel +BuildRequires: fdupes +BuildRequires: libcfitsio-devel +BuildRequires: libeigen2-devel +BuildRequires: libindi-devel +BuildRequires: libindi +BuildRequires: libkde4-devel +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +BuildRequires: xplanet +Recommends: libindi +Recommends: xplanet Provides: kde4-kstars = 4.3.0 Obsoletes: kde4-kstars < 4.3.0 Provides: kstars-data = %{version} Obsoletes: kstars-data < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires -%py_requires %description -KStars is a desktop planetarium for KDE. +KStars is a Desktop Planetarium for KDE. It provides an accurate graphical +simulation of the night sky, from any location on Earth, at any date and time. %prep %setup -q +%patch0 %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif - %cmake_kde4 -d build - %make_jobs +%cmake_kde4 -d build +%make_jobs %install - cd build - %make_install - %suse_update_desktop_file %{name} Education Astronomy - %kde_post_install - %fdupes -s %{buildroot} +cd build +%kde4_makeinstall +cd .. + +# Remove static library +rm -f %{buildroot}%{_kde4_libdir}/libhtmesh.a + +%kde_post_install + +%fdupes -s %{buildroot} %clean - rm -rf %{buildroot} +rm -rf %{buildroot} %if 0 %package -n libSatLib4 -License: GPLv2+ +License: GPL-2.0+ Summary: A library for kstars -Group: Productivity/Scientific/Astronomy +Group: System/Libraries %description -n libSatLib4 -libSatLib is an library for KStars +libSatLib is a library for KStars. %post -n libSatLib4 -p /sbin/ldconfig %postun -n libSatLib4 -p /sbin/ldconfig %files -n libSatLib4 -%defattr(-,root,root) -%{_kde4_libdir}/libSatLib.so.* +%defattr(-,root,root,-) +%{_kde4_libdir}/libSatLib.so.4* %endif -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %files -%defattr(-,root,root) -%{_kde4_bindir}/kstars -%{_kde4_libdir}/libhtmesh.a +%defattr(-,root,root,-) +%doc AUTHORS COPYING COPYING.DOC ChangeLog README README.customize README.ephemerides README.images kstars.lsm %{_kde4_applicationsdir}/kstars.desktop -%{_kde4_htmldir}/en/kstars/ -%{_kde4_iconsdir}/hicolor/*/apps/kstars.* -%{_kde4_appsdir}/kstars -%{_kde4_sharedir}/config.kcfg/kstars.kcfg +%{_kde4_appsdir}/kstars/ +%{_kde4_bindir}/kstars %{_kde4_configdir}/kstars.knsrc +%{_kde4_configkcfgdir}/kstars.kcfg +%doc %{_kde4_htmldir}/en/kstars/ +%{_kde4_iconsdir}/hicolor/*/apps/kstars.* %changelog ++++++ FindCFitsio.cmake.patch ++++++ --- cmake/modules/FindCFitsio.cmake.orig 2011-05-20 23:34:16.000000000 +0300 +++ cmake/modules/FindCFitsio.cmake 2011-09-22 23:58:49.489000042 +0300 @@ -4,6 +4,9 @@ # CFITSIO_FOUND - system has CFITSIO # CFITSIO_INCLUDE_DIR - the CFITSIO include directory # CFITSIO_LIBRARIES - Link these to use CFITSIO +# CFITSIO_VERSION_STRING - Human readable version number of cfitsio +# CFITSIO_VERSION_MAJOR - Major version number of cfitsio +# CFITSIO_VERSION_MINOR - Minor version number of cfitsio # Copyright (c) 2006, Jasem Mutlaq <[email protected]> # Based on FindLibfacile by Carsten Niehaus, <[email protected]> @@ -13,29 +16,23 @@ if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) - # in cache already - set(CFITSIO_FOUND TRUE) - message(STATUS "Found CFITSIO: ${CFITSIO_LIBRARIES}") - + # in cache already, be quiet + set(CFITSIO_FIND_QUIETLY TRUE) else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) - if (NOT WIN32) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(PC_CFITSIO cfitsio) - endif (PKG_CONFIG_FOUND) - endif (NOT WIN32) - + # JM: Packages from different distributions have different suffixes find_path(CFITSIO_INCLUDE_DIR fitsio.h - ${PC_CFITSIO_INCLUDE_DIRS} + PATH_SUFFIXES libcfitsio3 libcfitsio0 cfitsio + PATHS + $ENV{CFITSIO} ${_obIncDir} ${GNUWIN32_DIR}/include ) - find_library(CFITSIO_LIBRARIES NAMES cfitsio libcfitsio + find_library(CFITSIO_LIBRARIES NAMES cfitsio PATHS - ${PC_CFITSIO_LIBRARY_DIRS} + $ENV{CFITSIO} ${_obLinkDir} ${GNUWIN32_DIR}/lib ) @@ -48,13 +45,21 @@ if (CFITSIO_FOUND) - if (NOT CFitsio_FIND_QUIETLY) - message(STATUS "Found CFITSIO: ${CFITSIO_LIBRARIES}") - endif (NOT CFitsio_FIND_QUIETLY) + + # Find the version of the cfitsio header + FILE(READ "${CFITSIO_INCLUDE_DIR}/fitsio.h" FITSIO_H) + STRING(REGEX REPLACE ".*#define CFITSIO_VERSION[^0-9]*([0-9]+)\\.([0-9]+).*" "\\1.\\2" CFITSIO_VERSION_STRING "${FITSIO_H}") + STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\1" CFITSIO_VERSION_MAJOR ${CFITSIO_VERSION_STRING}) + STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\2" CFITSIO_VERSION_MINOR ${CFITSIO_VERSION_STRING}) + message(STATUS "found version string ${CFITSIO_VERSION_STRING}") + + if (NOT CFITSIO_FIND_QUIETLY) + message(STATUS "Found CFITSIO ${CFITSIO_VERSION_MAJOR}.${CFITSIO_VERSION_MINOR}: ${CFITSIO_LIBRARIES}") + endif (NOT CFITSIO_FIND_QUIETLY) else (CFITSIO_FOUND) - if (CFitsio_FIND_REQUIRED) - message(FATAL_ERROR "CFITSIO not found. Please install libcfitsio0-devel and try again. http://indi.sf.net";) - endif (CFitsio_FIND_REQUIRED) + if (CFITSIO_FIND_REQUIRED) + message(STATUS "CFITSIO not found.") + endif (CFITSIO_FIND_REQUIRED) endif (CFITSIO_FOUND) mark_as_advanced(CFITSIO_INCLUDE_DIR CFITSIO_LIBRARIES) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
