File project.diff of Package CalcMySky
--- CalcMySky.changes.orig
+++ CalcMySky.changes
@@ -18,6 +18,11 @@ Thu Apr 20 09:48:51 UTC 2023 - Paolo Sti
- Fix packaging issue.
-------------------------------------------------------------------
+Thu Apr 13 08:46:51 UTC 2023 - Michal Kubecek <mkubecek@suse.cz>
+
+- move headers from CalcMySky-devel back into ShowMySky-%{qtver}-devel
+
+-------------------------------------------------------------------
Tue Apr 11 12:59:53 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
- Update to 0.3.0:
@@ -28,6 +33,18 @@ Tue Apr 11 12:59:53 UTC 2023 - Paolo Sti
instead of /usr/lib/ShowMySky-Qt6/cmake.
-------------------------------------------------------------------
+Thu Mar 30 15:46:40 UTC 2023 - Michal Kubecek <mkubecek@suse.cz>
+
+- use pkgconfig dependencies also on 15.5
+
+-------------------------------------------------------------------
+Sun Dec 4 22:01:17 UTC 2022 - Michal Kubecek <mkubecek@suse.cz>
+
+- do not include soname in ShowMySky-*-devel version
+- move ShowMySky includes to ShowMySky-*-devel
+- build against Qt6 on Leap 15.4
+
+-------------------------------------------------------------------
Wed Nov 9 10:46:10 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
- Update to 0.2.1:
--- CalcMySky.spec.orig
+++ CalcMySky.spec
@@ -21,10 +21,17 @@
%endif
%define sover 15
-%if 0%{?suse_version} > 1690
+%if 0%{?suse_version} > 1550 || 0%{?sle_version} >= 150500
%define qtver 6
+%define qt6nopkgcfg 0
+%else
+%if 0%{?sle_version} >= 150400
+%define qtver 6
+%define qt6nopkgcfg 1
%else
%define qtver 5
+%define qt6nopkgcfg 0
+%endif
%endif
Name: CalcMySky
@@ -39,14 +46,20 @@ BuildRequires: gcc%{?force_gcc_version}
BuildRequires: libeigen3-devel >= 3.4.0
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glm)
-%if 0%{?suse_version} > 1550
+%if %{qtver} == 6 && !%{qt6nopkgcfg}
BuildRequires: pkgconfig(Qt6OpenGL)
BuildRequires: pkgconfig(Qt6OpenGLWidgets)
BuildRequires: pkgconfig(Qt6Widgets)
%else
+%if %{qt6nopkgcfg}
+BuildRequires: qt6-opengl-devel
+BuildRequires: qt6-openglwidgets-devel
+BuildRequires: qt6-widgets-devel
+%else
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Widgets)
%endif
+%endif
%description
CalcMySky is a software package that simulates scattering of light by the atmosphere to render daytime and twilight skies (without stars). Its primary purpose is to enable realistic view of the sky in applications such as planetaria. Secondary objective is to make it possible to explore atmospheric effects such as glories, fogbows etc., as well as simulate unusual environments such as on Mars or an exoplanet orbiting a star with a non-solar spectrum of radiation.
@@ -64,14 +77,14 @@ Summary: ShowMySky library
%description -n libShowMySky-Qt%{qtver}-%{sover}
This package contains the library libShowMySky.
-%package -n libShowMySky-Qt%{qtver}-devel
+%package -n ShowMySky-Qt%{qtver}-devel
Summary: Devel files for libShowMySky
Requires: libShowMySky-Qt%{qtver}-%{sover} = %{version}
# fix packaging issue that was done when package was created
Provides: libShowMySky-Qt6-14-devel = %{version}
Obsoletes: libShowMySky-Qt6-14-devel < %{version}
-%description -n libShowMySky-Qt%{qtver}-devel
+%description -n ShowMySky-Qt%{qtver}-devel
This package contains the devel files for libShowMySky.
%prep
@@ -79,14 +92,11 @@ This package contains the devel files fo
%build
export CFLAGS="%{optflags} -fpie -fPIC"
+export CXXFLAGS="%{optflags} -fpie -fPIC"
export LDFLAGS="$LDFLAGS -pie"
%cmake \
-%if 0%{?suse_version} > 1590
- -DQT_VERSION=6 \
-%else
- -DQT_VERSION=5 \
-%endif
+ -DQT_VERSION=%{qtver} \
%if 0%{?force_gcc_version}
-DCMAKE_CXX_COMPILER=%{_bindir}/g++-%{?force_gcc_version} \
%endif
@@ -150,16 +160,14 @@ export LDFLAGS="$LDFLAGS -pie"
%{_libdir}/libShowMySky-Qt%{qtver}.so.%{sover}
%{_libdir}/libShowMySky-Qt%{qtver}.so.%{sover}.0.0
-%files -n libShowMySky-Qt%{qtver}-devel
-%{_libdir}/libShowMySky-Qt%{qtver}.so
-%dir %{_libdir}/cmake/ShowMySky-Qt%{qtver}
-%{_libdir}/cmake/ShowMySky-Qt%{qtver}/ShowMySky-Qt%{qtver}Config-relwithdebinfo.cmake
-%{_libdir}/cmake/ShowMySky-Qt%{qtver}/ShowMySky-Qt%{qtver}Config.cmake
-
-%files devel
+%files -n ShowMySky-Qt%{qtver}-devel
%dir %{_includedir}/ShowMySky
%{_includedir}/ShowMySky/AtmosphereRenderer.hpp
%{_includedir}/ShowMySky/Exception.hpp
%{_includedir}/ShowMySky/Settings.hpp
+%{_libdir}/libShowMySky-Qt%{qtver}.so
+%dir %{_libdir}/cmake/ShowMySky-Qt%{qtver}
+%{_libdir}/cmake/ShowMySky-Qt%{qtver}/ShowMySky-Qt%{qtver}Config-relwithdebinfo.cmake
+%{_libdir}/cmake/ShowMySky-Qt%{qtver}/ShowMySky-Qt%{qtver}Config.cmake
%changelog
