From 9926be087e8ebd2c720f546c8138911d42a4c45fdaaa782abc0adf78ef40c203 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Tue, 21 Jan 2020 10:06:11 +0000
Subject: [PATCH] Accepting request 765999 from
 home:lnussel:branches:devel:libraries:c_c++

- libfinal-devel needs to require ncurses-devel and gpm-devel as some header
  files include files from those
- install built examples so libfinal-examples can be tried directly
- add package for the special font

OBS-URL: https://build.opensuse.org/request/show/765999
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=27
---
 finalcut.changes |  8 ++++++++
 finalcut.spec    | 41 +++++++++++++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/finalcut.changes b/finalcut.changes
index de09a01..6b3043e 100644
--- a/finalcut.changes
+++ b/finalcut.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 20 14:10:38 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- libfinal-devel needs to require ncurses-devel and gpm-devel as some header
+  files include files from those
+- install built examples so libfinal-examples can be tried directly
+- add package for the special font
+
 -------------------------------------------------------------------
 Mon Oct 17 21:29:43 UTC 2019 - Markus Gans <guru.mail@muenster.de>
 
diff --git a/finalcut.spec b/finalcut.spec
index 42eb67b..7e02f9b 100644
--- a/finalcut.spec
+++ b/finalcut.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package finalcut.spec
+# spec file for package finalcut
 #
 # Copyright (c) 2019 by Markus Gans
 #
@@ -29,10 +29,11 @@ Patch0:         0001-arm-glibc-2.30.patch
 BuildRequires:  autoconf
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
+BuildRequires:  fontpackages-devel
 BuildRequires:  gcc-c++ >= 5.1
+BuildRequires:  gdb
 BuildRequires:  glib2-devel
 BuildRequires:  gpm-devel
-BuildRequires:  gdb
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 
@@ -48,12 +49,14 @@ radio buttons, input lines, list boxes, status bars and so on.
 %package -n libfinal-devel
 Summary:        Development files for the FINAL CUT text widget library
 Group:          Development/Libraries/C and C++
-Requires:       libfinal%{sover} = %{version}
 Requires:       bdftopcf
 Requires:       coreutils
 Requires:       gcc-c++ >= 5.1
+Requires:       gpm-devel
 Requires:       grep
 Requires:       gzip
+Requires:       libfinal%{sover} = %{version}
+Requires:       ncurses-devel
 Requires:       sed
 Requires:       vim
 Provides:       finalcut-devel = %{version}
@@ -72,7 +75,6 @@ radio buttons, input lines, list boxes, status bars and so on.
 %package -n libfinal-examples
 Summary:        Example files for the FINAL CUT library
 Group:          Development/Languages/C and C++
-BuildArch:      noarch
 Provides:       finalcut-examples = %{version}
 Obsoletes:      finalcut-examples < %{version}
 
@@ -98,6 +100,18 @@ The C++ class design was inspired by the Qt framework. It provides
 common controls like dialog windows, push buttons, check boxes,
 radio buttons, input lines, list boxes, status bars and so on.
 
+%package bitmap-fonts
+Summary:        Bitmap fonts for finalcut
+Group:          System/X11/Fonts
+Requires(pre):  fontconfig
+# install the fonts only if we have X11 fonts anyways
+Supplements:    packageand(libfinal%{sover}:xorg-x11-fonts-core)
+BuildArch:      noarch
+
+%description bitmap-fonts
+This package include a special font uses by the FINAL CUT text
+widget toolkit
+
 %prep
 %setup -q
 %patch0 -p1
@@ -117,17 +131,21 @@ make install libdir=%{buildroot}%{_libdir}/ \
 	     bindir=%{buildroot}%{_bindir} \
 	     docdir=%{buildroot}%{_docdir}/%{name}/ \
 	     fontdir=%{buildroot}%{_miscfontsdir}/%{name}/
-mkdir -p %{buildroot}%{_docdir}/%{name}/examples
 mkdir -p %{buildroot}%{_miscfontsdir}/%{name}/
-cp -p examples/*.cpp %{buildroot}%{_docdir}/%{name}/examples
-cp -p examples/Makefile.clang %{buildroot}%{_docdir}/%{name}/examples
-cp -p examples/Makefile.gcc %{buildroot}%{_docdir}/%{name}/examples
-rm -f %{buildroot}%{_libdir}/libfinal.la %{buildroot}%{_libdir}/%{name}/examples
+mkdir -p %{buildroot}%{_docdir}/%{name}
+mkdir -p %{buildroot}%{_libdir}/%{name}/examples
+cp -p examples/.libs/* %{buildroot}%{_libdir}/%{name}/examples
+cp -p examples/*.cpp %{buildroot}%{_libdir}/%{name}/examples
+cp -p examples/Makefile.clang %{buildroot}%{_libdir}/%{name}/examples
+cp -p examples/Makefile.gcc %{buildroot}%{_libdir}/%{name}/examples
+rm -f %{buildroot}%{_libdir}/libfinal.la
 rm %{buildroot}%{_docdir}/%{name}/ChangeLog %{buildroot}%{_docdir}/%{name}/COPYING.LESSER
 
 %post -n libfinal%{sover} -p /sbin/ldconfig
 %postun -n libfinal%{sover} -p /sbin/ldconfig
 
+%reconfigure_fonts_scriptlets -n %{name}-bitmap-fonts
+
 %files -n libfinal-devel
 %if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1500
 %license COPYING.LESSER
@@ -142,9 +160,12 @@ rm %{buildroot}%{_docdir}/%{name}/ChangeLog %{buildroot}%{_docdir}/%{name}/COPYI
 %{_includedir}/final
 
 %files -n libfinal-examples
-%{_docdir}/%{name}/examples
+%{_libdir}/%{name}
 
 %files -n libfinal%{sover}
 %{_libdir}/libfinal.so.*
 
+%files bitmap-fonts
+%{_miscfontsdir}
+
 %changelog