Skip to content

Commit aa9de13

Browse files
author
Allen Winter
committed
ready for 3.0.0 release
1 parent 92b6c7d commit aa9de13

File tree

6 files changed

+34
-27
lines changed

6 files changed

+34
-27
lines changed

CHANGES

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Release Highlights
22
==================
33

4-
Version 3.0.0 (unreleased):
5-
---------------------------
4+
Version 3.0.0 (27 August 2022):
5+
-------------------------------
66
** NOTE: Version 3.0 is not! binary compatible with Version 2.x **
77
* Supports Qt6 in addition to Qt5 (co-installable)
88
* Re-license project to MIT and remove the commercial offering

distro/debian.changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
kdchart (3.0.0) final; urgency=high
2+
3+
* 3.0.0 final release
4+
5+
-- Allen Winter <[email protected]> Sat, 27 Aug 2022 10:00:00 -0500
6+
17
kdchart (2.7.2) final; urgency=high
28

39
* 2.7.2 final release

distro/qt5-kdchart.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Version: 3.0.0-1
44
Binary: kdchart
55
Maintainer: Allen Winter <[email protected]>
66
Architecture: any
7-
Build-Depends: debhelper (>=9), cdbs, cmake, qtbase5-dev qtsvg5-dev
7+
Build-Depends: debhelper (>=9), cdbs, cmake, qtbase5-dev, libqt5svg5-dev
88

99
Files:
1010
00000000000000000000000000000000 00000 qt5-kdchart-3.0.0.tar.gz

distro/qt5-kdchart.spec

+8-9
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,7 @@ develop programs using kdchart.
5151
%autosetup
5252

5353
%build
54-
touch .license.accepted
55-
%if "%{_lib}"=="lib64"
56-
QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix %{buildroot}/usr
57-
%else
58-
./configure.sh -shared -release -prefix %{buildroot}/usr
59-
%endif
54+
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
6055
%__make %{?_smp_mflags}
6156

6257
%post -p /sbin/ldconfig
@@ -75,14 +70,18 @@ QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix
7570

7671
%files devel
7772
%defattr(-,root,root,-)
73+
%{_libdir}/qt5/mkspecs/modules/*
74+
%dir %{_prefix}/share/mkspecs
75+
%dir %{_prefix}/share/mkspecs/features
76+
%{_prefix}/share/mkspecs/features/kdchart.prf
7877
%dir %{_includedir}/KDChart
7978
%{_includedir}/KDChart/*
80-
%dir %{_includedir}/KDGantt
81-
%{_includedir}/KDGantt/*
79+
%dir %{_libdir}/cmake/KDChart
80+
%{_libdir}/cmake/KDChart/*
8281
%{_libdir}/libkdchart.so
8382

8483
%changelog
85-
* Sun Aug 21 2022 Allen Winter <[email protected]> 3.0.0
84+
* Sat Aug 27 2022 Allen Winter <[email protected]> 3.0.0
8685
3.0.0
8786
* Fri Oct 16 2020 Allen Winter <[email protected]> 2.7.2
8887
2.7.2

distro/qt6-kdchart.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Version: 3.0.0-1
44
Binary: kdchart
55
Maintainer: Allen Winter <[email protected]>
66
Architecture: any
7-
Build-Depends: debhelper (>=9), cdbs, cmake, qtbase6-dev qtsvg6-dev
7+
Build-Depends: debhelper (>=9), cdbs, cmake, qt6-base-dev, libqt6svg6-dev, libgl1-mesa-dev, libfontconfig-dev, libfreetype-dev
88

99
Files:
1010
00000000000000000000000000000000 00000 qt6-kdchart-3.0.0.tar.gz

distro/qt6-kdchart.spec

+16-14
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,10 @@ develop programs using kdchart.
5151
%autosetup
5252

5353
%build
54-
touch .license.accepted
55-
%if "%{_lib}"=="lib64"
56-
QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix %{buildroot}/usr
57-
%else
58-
./configure.sh -shared -release -prefix %{buildroot}/usr
59-
%endif
54+
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DKDChart_QT6=True -DCMAKE_BUILD_TYPE=Release
6055
%__make %{?_smp_mflags}
6156

57+
6258
%post -p /sbin/ldconfig
6359
%postun -p /sbin/ldconfig
6460

@@ -70,19 +66,25 @@ QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -no-unittests -prefix
7066

7167
%files
7268
%defattr(-,root,root)
73-
%{_prefix}/share/doc/KDChart
74-
%{_libdir}/libkdchart.so.*
69+
%{_prefix}/share/doc/KDChart-qt6
70+
%{_libdir}/libkdchart-qt6.so.*
7571

7672
%files devel
7773
%defattr(-,root,root,-)
78-
%dir %{_includedir}/KDChart
79-
%{_includedir}/KDChart/*
80-
%dir %{_includedir}/KDGantt
81-
%{_includedir}/KDGantt/*
82-
%{_libdir}/libkdchart.so
74+
%if 0%{?fedora} > 35
75+
%{_libdir}/qt6/mkspecs/modules/*
76+
%endif
77+
#%dir %{_prefix}/share/mkspecs
78+
#%dir %{_prefix}/share/mkspecs/features
79+
#%{_prefix}/share/mkspecs/features/kdchart.prf
80+
%dir %{_includedir}/KDChart-qt6
81+
%{_includedir}/KDChart-qt6/*
82+
%dir %{_libdir}/cmake/KDChart-qt6
83+
%{_libdir}/cmake/KDChart-qt6/*
84+
%{_libdir}/libkdchart-qt6.so
8385

8486
%changelog
85-
* Sun Aug 21 2022 Allen Winter <[email protected]> 3.0.0
87+
* Sat Aug 27 2022 Allen Winter <[email protected]> 3.0.0
8688
3.0.0
8789
* Fri Oct 16 2020 Allen Winter <[email protected]> 2.7.2
8890
2.7.2

0 commit comments

Comments
 (0)