[packages/fltk/DEVEL-1.4: 5/5] - merged -cairo* into main (Cairo support is in main library now and libfltk_cairo is just a stub)

[qboosh]

commit 8729be6988c5cde505c1f30710742f9fdbe8d978
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jun 30 21:23:30 2025 +0200

    - merged -cairo* into main (Cairo support is in main library now and libfltk_cairo is just a stub)

 fltk.spec | 65 +++++++++------------------------------------------------------
 1 file changed, 9 insertions(+), 56 deletions(-)
---
diff --git a/fltk.spec b/fltk.spec
index 1915dfd..a8749fa 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -53,6 +53,8 @@ BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libxkbcommon-devel
 BuildRequires:	xorg-util-makedepend
 Requires:	wayland >= 1.18
+Provides:	fltk-cairo = %{version}-%{release}
+Obsoletes:	fltk-cairo < 1.4
 Obsoletes:	libfltk1.1 < 1.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,6 +91,8 @@ Requires:	libpng-devel >= 1.6
 Requires:	libstdc++-devel
 Requires:	xorg-lib-libXft-devel
 Requires:	xorg-lib-libXinerama-devel
+Provides:	fltk-cairo-devel = %{version}-%{release}
+Obsoletes:	fltk-cairo-devel < 1.4
 Obsoletes:	libfltk1.1-devel < 1.2
 
 %description devel
@@ -106,6 +110,8 @@ Summary(pl.UTF-8):	Biblioteka FLTK konsolidowana statycznie
 Summary(pt_BR.UTF-8):	Bibliotecas estáticas para o FLTK
 Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Provides:	fltk-cairo-static = %{version}-%{release}
+Obsoletes:	fltk-cairo-static < 1.4
 
 %description static
 FLTK static library.
@@ -116,43 +122,6 @@ Biblioteka FLTK konsolidowana statycznie.
 %description static -l pt_BR.UTF-8
 Bibliotecas estáticas para o FLTK.
 
-%package cairo
-Summary:	FLTK Cairo library
-Summary(pl.UTF-8):	Biblioteka FLTK Cairo
-Group:		X11/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description cairo
-FLTK Cairo library.
-
-%description cairo -l pl.UTF-8
-Biblioteka FLTK Cairo.
-
-%package cairo-devel
-Summary:	Header files for FLTK Cairo library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki FLTK Cairo
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	%{name}-cairo = %{version}-%{release}
-
-%description cairo-devel
-Header files for FLTK Cairo library.
-
-%description cairo-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki FLTK Cairo.
-
-%package cairo-static
-Summary:	FLTK Cairo static library
-Summary(pl.UTF-8):	Statyczna biblioteka FLTK Cairo
-Group:		X11/Development/Libraries
-Requires:	%{name}-cairo-devel = %{version}-%{release}
-
-%description cairo-static
-FLTK Cairo static library.
-
-%description cairo-static -l pl.UTF-8
-Statyczna biblioteka FLTK Cairo.
-
 %package gl
 Summary:	FLTK GL library
 Summary(pl.UTF-8):	Biblioteka FLTK GL
@@ -210,7 +179,6 @@ Group:		X11/Development/Tools
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	shared-mime-info
 Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-cairo = %{version}-%{release}
 Suggests:	%{name}-apidocs = %{version}-%{release}
 
 %description fluid
@@ -238,7 +206,6 @@ Group:		X11/Development/Tools
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	shared-mime-info
 Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-cairo = %{version}-%{release}
 
 %description options
 Application to get and modify FLTK runtime options.
@@ -302,9 +269,6 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post   cairo -p /sbin/ldconfig
-%postun cairo -p /sbin/ldconfig
-
 %post   gl -p /sbin/ldconfig
 %postun gl -p /sbin/ldconfig
 
@@ -339,6 +303,7 @@ rm -rf $RPM_BUILD_ROOT
 # note: COPYING contains amendments to LGPL, so don't remove!
 %doc ANNOUNCEMENT CHANGES*.txt COPYING CREDITS.txt README.txt README.{Cairo,IDE,Wayland}.txt
 %{_libdir}/libfltk.so.1.4
+%{_libdir}/libfltk_cairo.so.1.4
 %{_libdir}/libfltk_forms.so.1.4
 %{_libdir}/libfltk_images.so.1.4
 
@@ -346,10 +311,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fltk-config
 %{_libdir}/libfltk.so
+%{_libdir}/libfltk_cairo.so
 %{_libdir}/libfltk_forms.so
 %{_libdir}/libfltk_images.so
 %{_includedir}/FL
-%exclude %{_includedir}/FL/Fl_Cairo*.H
 %exclude %{_includedir}/FL/Fl_Gl_Window.H
 %exclude %{_includedir}/FL/gl*
 %{_mandir}/man1/fltk-config.1*
@@ -358,22 +323,10 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfltk.a
+%{_libdir}/libfltk_cairo.a
 %{_libdir}/libfltk_forms.a
 %{_libdir}/libfltk_images.a
 
-%files cairo
-%defattr(644,root,root,755)
-%{_libdir}/libfltk_cairo.so.1.4
-
-%files cairo-devel
-%defattr(644,root,root,755)
-%{_libdir}/libfltk_cairo.so
-%{_includedir}/FL/Fl_Cairo*.H
-
-%files cairo-static
-%defattr(644,root,root,755)
-%{_libdir}/libfltk_cairo.a
-
 %if %{with opengl}
 %files gl
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fltk.git/commitdiff/8729be6988c5cde505c1f30710742f9fdbe8d978