Skip to content

Commit

Permalink
ready for 3.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Aug 28, 2022
1 parent 92b6c7d commit aa9de13
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 27 deletions.
4 changes: 2 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions distro/debian.changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
kdchart (3.0.0) final; urgency=high

* 3.0.0 final release

-- Allen Winter <[email protected]> Sat, 27 Aug 2022 10:00:00 -0500

kdchart (2.7.2) final; urgency=high

* 2.7.2 final release
Expand Down
2 changes: 1 addition & 1 deletion distro/qt5-kdchart.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Version: 3.0.0-1
Binary: kdchart
Maintainer: Allen Winter <[email protected]>
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
17 changes: 8 additions & 9 deletions distro/qt5-kdchart.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 <[email protected]> 3.0.0
* Sat Aug 27 2022 Allen Winter <[email protected]> 3.0.0
3.0.0
* Fri Oct 16 2020 Allen Winter <[email protected]> 2.7.2
2.7.2
Expand Down
2 changes: 1 addition & 1 deletion distro/qt6-kdchart.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Version: 3.0.0-1
Binary: kdchart
Maintainer: Allen Winter <[email protected]>
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
30 changes: 16 additions & 14 deletions distro/qt6-kdchart.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 <[email protected]> 3.0.0
* Sat Aug 27 2022 Allen Winter <[email protected]> 3.0.0
3.0.0
* Fri Oct 16 2020 Allen Winter <[email protected]> 2.7.2
2.7.2
Expand Down

0 comments on commit aa9de13

Please sign in to comment.