From 16b53b8e2e053c6b59b51e916ce2a34cf0700782 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 27 Jan 2024 18:17:44 +0100 Subject: [PATCH] further fix of legacy symlinks [release 0.3.0-3mamba;Sat Jan 27 2024] --- kcolorpicker.spec | 68 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/kcolorpicker.spec b/kcolorpicker.spec index b096275..aac1c2b 100644 --- a/kcolorpicker.spec +++ b/kcolorpicker.spec @@ -1,6 +1,6 @@ Name: kcolorpicker -Version: 0.2.0 -Release: 1mamba +Version: 0.3.0 +Release: 3mamba Summary: Qt based Color Picker with popup menu Group: Applications/Graphics Vendor: openmamba @@ -12,8 +12,10 @@ License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libgcc +BuildRequires: libglvnd-devel BuildRequires: libstdc++6-devel BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel ## AUTOBUILDREQ-END BuildRequires: cmake Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} @@ -36,6 +38,21 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %description -n lib%{name}-devel This package contains libraries and header files for developing applications that use %{name}. +%package -n lib%{name}-qt6 +Group: System/Libraries +Summary: Shared libraries for %{name} + +%description -n lib%{name}-qt6 +This package contains shared libraries for %{name}. + +%package -n lib%{name}-qt6-devel +Group: Development/Libraries +Summary: Development files for %{name} +Requires: lib%{name}-qt6 = %{?epoch:%epoch:}%{version}-%{release} + +%description -n lib%{name}-qt6-devel +This package contains libraries and header files for developing applications that use %{name}. + %debug_package @@ -45,10 +62,24 @@ This package contains libraries and header files for developing applications tha %build %cmake -d build %make +cd .. + +%cmake -d build-qt6 \ + -DBUILD_WITH_QT6=ON + +%make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build +%makeinstall -C build-qt6 + +# Symlinks for backwards compatibility +mkdir -p %{buildroot}%{_libdir}/cmake/kColorPicker +ln -s ../kColorPicker-Qt5/kColorPicker-Qt5Config.cmake %{buildroot}%{_libdir}/cmake/kColorPicker/kColorPickerConfig.cmake +ln -s ../kColorPicker-Qt5/kColorPicker-Qt5Config-version.cmake %{buildroot}%{_libdir}/cmake/kColorPicker/kColorPickerConfig-version.cmake +ln -s ../kColorPicker-Qt5/kColorPicker-Qt5-targets.cmake %{buildroot}%{_libdir}/cmake/kColorPicker/ +ln -s ../kColorPicker-Qt5/kColorPicker-Qt5-targets-noconfig.cmake %{buildroot}%{_libdir}/cmake/kColorPicker/ %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -58,18 +89,43 @@ This package contains libraries and header files for developing applications tha %files -n lib%{name} %defattr(-,root,root) -%{_libdir}/libkColorPicker.so.* +%{_libdir}/libkColorPicker-Qt5.so.* %doc LICENSE %files -n lib%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/kColorPicker -%{_includedir}/kColorPicker/KColorPicker*.h +%dir %{_includedir}/kColorPicker-Qt5 +%dir %{_includedir}/kColorPicker-Qt5/kColorPicker +%{_includedir}/kColorPicker-Qt5/kColorPicker/* +%{_libdir}/libkColorPicker-Qt5.so %dir %{_libdir}/cmake/kColorPicker %{_libdir}/cmake/kColorPicker/kColorPicker*.cmake -%{_libdir}/libkColorPicker.so +%dir %{_libdir}/cmake/kColorPicker-Qt5 +%{_libdir}/cmake/kColorPicker-Qt5/kColorPicker*.cmake %doc README.md +%files -n lib%{name}-qt6 +%defattr(-,root,root) +%{_libdir}/libkColorPicker-Qt6.so.* +%doc LICENSE + +%files -n lib%{name}-qt6-devel +%defattr(-,root,root) +%dir %{_includedir}/kColorPicker-Qt6/kColorPicker +%{_includedir}/kColorPicker-Qt6/kColorPicker/* +%dir %{_libdir}/cmake/kColorPicker-Qt6 +%{_libdir}/cmake/kColorPicker-Qt6/kColorPicker-Qt6*.cmake +%{_libdir}/libkColorPicker-Qt6.so + %changelog +* Sat Jan 27 2024 Silvan Calarco 0.3.0-3mamba +- further fix of legacy symlinks + +* Sat Jan 27 2024 Silvan Calarco 0.3.0-2mamba +- fixed legacy cmake symlinks + +* Fri Jan 19 2024 Automatic Build System 0.3.0-1mamba +- automatic version update by autodist + * Thu Aug 25 2022 Silvan Calarco 0.2.0-1mamba - package created using the webbuild interface