[packages/gmerlin] - added pc patch to fill {Requires,Libs}.private in .pc files, drop .la files; release 15

[qboosh]

commit 8e7dc1a1fe801cddfc5b4a3a945141cf33498126
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 24 10:01:12 2023 +0200

    - added pc patch to fill {Requires,Libs}.private in .pc files, drop .la files; release 15

 gmerlin-pc.patch | 24 ++++++++++++++++++++++++
 gmerlin.spec     | 29 +++++++++++++++++++++++------
 2 files changed, 47 insertions(+), 6 deletions(-)
---
diff --git a/gmerlin.spec b/gmerlin.spec
index 5ca637f..8846f24 100644
--- a/gmerlin.spec
+++ b/gmerlin.spec
@@ -10,7 +10,7 @@ Summary:	Set of multimedia libraries builded with an application suite
 Summary(pl.UTF-8):	Zbiór bibliotek multimedialnych wraz z aplikacjami
 Name:		gmerlin
 Version:	1.2.0
-Release:	14
+Release:	15
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/gmerlin/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Patch1:		%{name}-icons.patch
 Patch2:		%{name}-info.patch
 Patch3:		cdio.patch
 Patch4:		%{name}-am.patch
+Patch5:		%{name}-pc.patch
 URL:		http://gmerlin.sourceforge.net/
 BuildRequires:	OpenGL-devel
 BuildRequires:	alsa-lib-devel >= 1.0.0
@@ -50,6 +51,7 @@ BuildRequires:	libvisual-devel >= 0.4.0
 BuildRequires:	libxml2-devel >= 2.4.0
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	sed >= 4.0
 %{?with_nmjedit:BuildRequires:	sqlite3-devel}
 BuildRequires:	texinfo
@@ -120,6 +122,19 @@ Static gmerlin libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki gmerlin.
 
+%package apidocs
+Summary:	API documentation for gmerlin libraries
+Summary(pl.UTF-8):	Dokumentacja API bibliotek gmerlin
+Group:		Documentation
+Conflicts:	gmerlin-devel < 1.2.0-15
+BuildArch:	noarch
+
+%description apidocs
+API documentation for gmerlin libraries.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek gmerlin.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -127,6 +142,7 @@ Statyczne biblioteki gmerlin.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # evil, sets CFLAGS basing on /proc/cpuinfo, overrides our optflags
 # (--with-cpuflags=none disables using /proc/cpuinfo, but not overriding)
@@ -155,7 +171,8 @@ rm -rf $RPM_BUILD_ROOT
 
 # dlopened plugins
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gmerlin/plugins/*.{la,a}
-# lib*.la kept - incomplete private dependencies in *.pc
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgmerlin*.la
 
 %find_lang %{name}
 
@@ -326,13 +343,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgmerlin.so
 %attr(755,root,root) %{_libdir}/libgmerlin_gtk.so
-# many Requires.private or Libs.private missing in *.pc
-%{_libdir}/libgmerlin.la
-%{_libdir}/libgmerlin_gtk.la
 %{_includedir}/gmerlin
 %{_pkgconfigdir}/gmerlin.pc
 %{_pkgconfigdir}/gmerlin-gtk.pc
-%doc %{_docdir}/gmerlin/apiref
 
 %if %{with static_libs}
 %files static
@@ -340,3 +353,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgmerlin.a
 %{_libdir}/libgmerlin_gtk.a
 %endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_docdir}/gmerlin/apiref
diff --git a/gmerlin-pc.patch b/gmerlin-pc.patch
new file mode 100644
index 0000000..056113f
--- /dev/null
+++ b/gmerlin-pc.patch
@@ -0,0 +1,24 @@
+--- gmerlin-1.2.0/gmerlin.pc.in.orig	2012-06-08 13:50:36.000000000 +0200
++++ gmerlin-1.2.0/gmerlin.pc.in	2023-09-24 09:47:17.049202421 +0200
+@@ -6,7 +6,8 @@ includedir=@includedir@
+ Name: Gmerlin
+ Description: Gmerlin libraries
+ Version: @VERSION@
+-Requires.private: libxml-2.0 gavl
++Requires.private: libxml-2.0 gavl fontconfig freetype2 libvisual-0.4
+ Libs: -L${libdir} -lgmerlin
++Libs.private: @XINERAMA_LIBS@ @XFIXES_LIBS@ @XDPMS_LIBS@ @XV_LIBS@ @GL_LIBS@ @XTEST_LIBS@ @X_LIBS@ -ldl -lpthread
+ Cflags: -I${includedir}
+ 
+--- gmerlin-1.2.0/gmerlin-gtk.pc.in.orig	2012-06-08 13:50:36.000000000 +0200
++++ gmerlin-1.2.0/gmerlin-gtk.pc.in	2023-09-24 09:48:40.748748982 +0200
+@@ -6,7 +6,8 @@ includedir=@includedir@
+ Name: Gmerlin-gtk
+ Description: Gmerlin Gtk support library
+ Version: @VERSION@
+-Requires.private: gmerlin gtk+-2.0
++Requires.private: gmerlin gtk+-2.0 libxml-2.0
+ Libs: -L${libdir} -lgmerlin_gtk
++Libs.private: -lm
+ Cflags: -I${includedir}
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gmerlin.git/commitdiff/8e7dc1a1fe801cddfc5b4a3a945141cf33498126