From aa9de13376a5e9f4c8802091776584614db8677e Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 27 Aug 2022 10:21:57 -0400 Subject: [PATCH] ready for 3.0.0 release --- CHANGES | 4 ++-- distro/debian.changelog | 6 ++++++ distro/qt5-kdchart.dsc | 2 +- distro/qt5-kdchart.spec | 17 ++++++++--------- distro/qt6-kdchart.dsc | 2 +- distro/qt6-kdchart.spec | 30 ++++++++++++++++-------------- 6 files changed, 34 insertions(+), 27 deletions(-) diff --git a/CHANGES b/CHANGES index e1f6c414..e1eb51de 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,8 @@ Release Highlights ================== -Version 3.0.0 (unreleased): ---------------------------- +Version 3.0.0 (27 August 2022): +------------------------------- ** NOTE: Version 3.0 is not! binary compatible with Version 2.x ** * Supports Qt6 in addition to Qt5 (co-installable) * Re-license project to MIT and remove the commercial offering diff --git a/distro/debian.changelog b/distro/debian.changelog index d15ea79e..cea31650 100644 --- a/distro/debian.changelog +++ b/distro/debian.changelog @@ -1,3 +1,9 @@ +kdchart (3.0.0) final; urgency=high + + * 3.0.0 final release + + -- Allen Winter Sat, 27 Aug 2022 10:00:00 -0500 + kdchart (2.7.2) final; urgency=high * 2.7.2 final release diff --git a/distro/qt5-kdchart.dsc b/distro/qt5-kdchart.dsc index cf2502b1..db8f1c4e 100644 --- a/distro/qt5-kdchart.dsc +++ b/distro/qt5-kdchart.dsc @@ -4,7 +4,7 @@ Version: 3.0.0-1 Binary: kdchart Maintainer: Allen Winter Architecture: any -Build-Depends: debhelper (>=9), cdbs, cmake, qtbase5-dev qtsvg5-dev +Build-Depends: debhelper (>=9), cdbs, cmake, qtbase5-dev, libqt5svg5-dev Files: 00000000000000000000000000000000 00000 qt5-kdchart-3.0.0.tar.gz diff --git a/distro/qt5-kdchart.spec b/distro/qt5-kdchart.spec index 3719dd63..1c96e80e 100644 --- a/distro/qt5-kdchart.spec +++ b/distro/qt5-kdchart.spec @@ -51,12 +51,7 @@ develop programs using kdchart. %autosetup %build -touch .license.accepted -%if "%{_lib}"=="lib64" -QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix %{buildroot}/usr -%else -./configure.sh -shared -release -prefix %{buildroot}/usr -%endif +cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release %__make %{?_smp_mflags} %post -p /sbin/ldconfig @@ -75,14 +70,18 @@ QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix %files devel %defattr(-,root,root,-) +%{_libdir}/qt5/mkspecs/modules/* +%dir %{_prefix}/share/mkspecs +%dir %{_prefix}/share/mkspecs/features +%{_prefix}/share/mkspecs/features/kdchart.prf %dir %{_includedir}/KDChart %{_includedir}/KDChart/* -%dir %{_includedir}/KDGantt -%{_includedir}/KDGantt/* +%dir %{_libdir}/cmake/KDChart +%{_libdir}/cmake/KDChart/* %{_libdir}/libkdchart.so %changelog -* Sun Aug 21 2022 Allen Winter 3.0.0 +* Sat Aug 27 2022 Allen Winter 3.0.0 3.0.0 * Fri Oct 16 2020 Allen Winter 2.7.2 2.7.2 diff --git a/distro/qt6-kdchart.dsc b/distro/qt6-kdchart.dsc index 3c1c059c..acde78ae 100644 --- a/distro/qt6-kdchart.dsc +++ b/distro/qt6-kdchart.dsc @@ -4,7 +4,7 @@ Version: 3.0.0-1 Binary: kdchart Maintainer: Allen Winter Architecture: any -Build-Depends: debhelper (>=9), cdbs, cmake, qtbase6-dev qtsvg6-dev +Build-Depends: debhelper (>=9), cdbs, cmake, qt6-base-dev, libqt6svg6-dev, libgl1-mesa-dev, libfontconfig-dev, libfreetype-dev Files: 00000000000000000000000000000000 00000 qt6-kdchart-3.0.0.tar.gz diff --git a/distro/qt6-kdchart.spec b/distro/qt6-kdchart.spec index 02243d4e..730c4603 100644 --- a/distro/qt6-kdchart.spec +++ b/distro/qt6-kdchart.spec @@ -51,14 +51,10 @@ develop programs using kdchart. %autosetup %build -touch .license.accepted -%if "%{_lib}"=="lib64" -QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix %{buildroot}/usr -%else -./configure.sh -shared -release -prefix %{buildroot}/usr -%endif +cmake . -DCMAKE_INSTALL_PREFIX=/usr -DKDChart_QT6=True -DCMAKE_BUILD_TYPE=Release %__make %{?_smp_mflags} + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -70,19 +66,25 @@ QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix %files %defattr(-,root,root) -%{_prefix}/share/doc/KDChart -%{_libdir}/libkdchart.so.* +%{_prefix}/share/doc/KDChart-qt6 +%{_libdir}/libkdchart-qt6.so.* %files devel %defattr(-,root,root,-) -%dir %{_includedir}/KDChart -%{_includedir}/KDChart/* -%dir %{_includedir}/KDGantt -%{_includedir}/KDGantt/* -%{_libdir}/libkdchart.so +%if 0%{?fedora} > 35 +%{_libdir}/qt6/mkspecs/modules/* +%endif +#%dir %{_prefix}/share/mkspecs +#%dir %{_prefix}/share/mkspecs/features +#%{_prefix}/share/mkspecs/features/kdchart.prf +%dir %{_includedir}/KDChart-qt6 +%{_includedir}/KDChart-qt6/* +%dir %{_libdir}/cmake/KDChart-qt6 +%{_libdir}/cmake/KDChart-qt6/* +%{_libdir}/libkdchart-qt6.so %changelog -* Sun Aug 21 2022 Allen Winter 3.0.0 +* Sat Aug 27 2022 Allen Winter 3.0.0 3.0.0 * Fri Oct 16 2020 Allen Winter 2.7.2 2.7.2