$ git show --format=fuller --patch-with-stat --summary 3c0ee0a33a540766ae06e3c8ad972fd676c76e8c
commit 3c0ee0a33a540766ae06e3c8ad972fd676c76e8c
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Mon Sep 26 03:20:23 2022 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Mon Sep 26 03:20:23 2022 +0200
1.7.79, modernize spec
---
.abf.yml | 2 +-
fox-1.7.79-compile.patch | 21 +++++++++++++++++++++
fox.spec | 13 ++++++++-----
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 100644 fox-1.7.79-compile.patch
diff --git a/.abf.yml b/.abf.yml
index c284404..8bd8f03 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -8,4 +8,4 @@ sources:
fox-shutterbug-16.png: 18ab3443eb4dc2373797c2c4820a7aba32a621ef
fox-shutterbug-32.png: 7ea877d4c9d6a919906d2f28c93fb2976843f73f
fox-shutterbug-48.png: be5ac15849920a57c5da0b1dbd0a9f478d985fb1
- fox-1.7.78.tar.gz: 0e603a3423e78a8ea7a92c44c38139eae9973616
+ fox-1.7.79.tar.gz: f563e6b7127f7b3ddba5140b4c9d75fe17585f16
diff --git a/fox-1.7.79-compile.patch b/fox-1.7.79-compile.patch
new file mode 100644
index 0000000..d7dfdaa
--- /dev/null
+++ b/fox-1.7.79-compile.patch
@@ -0,0 +1,21 @@
+diff -up fox-1.7.79/lib/FXRex.cpp.omv~ fox-1.7.79/lib/FXRex.cpp
+--- fox-1.7.79/lib/FXRex.cpp.omv~ 2022-09-26 03:12:07.772888307 +0200
++++ fox-1.7.79/lib/FXRex.cpp 2022-09-26 03:12:38.265056930 +0200
+@@ -4673,7 +4673,7 @@ FXRex::FXRex(const FXString& pattern,FXi
+ /*******************************************************************************/
+
+ #ifdef TOPIC_REXDUMP
+-#include "fxrexdbg.h"
++//#include "fxrexdbg.h"
+ #endif
+
+
+@@ -4715,7 +4715,7 @@ FXRex::Error FXRex::parse(const FXchar*
+ // Install new program
+ code=prog;
+ #ifdef TOPIC_REXDUMP
+- if(getTraceTopic(TOPIC_REXDUMP)){ dump(adjustedpattern,code); }
++// if(getTraceTopic(TOPIC_REXDUMP)){ dump(adjustedpattern,code); }
+ #endif
+ freeElms(adjustedpattern);
+ return ErrOK;
diff --git a/fox.spec b/fox.spec
index c719da4..3b36655 100644
--- a/fox.spec
+++ b/fox.spec
@@ -12,12 +12,12 @@
Summary: The FOX C++ GUI Toolkit
Name: fox
-Version: 1.7.78
+Version: 1.7.79
Release: 1
License: LGPLv2+
Group: Development/C++
URL: http://www.fox-toolkit.org
-Source0: ftp://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
+Source0: http://fox-toolkit.org/ftp/fox-%{version}.tar.gz
Source1: fox-shutterbug-16.png
Source2: fox-shutterbug-32.png
Source3: fox-shutterbug-48.png
@@ -27,6 +27,7 @@ Source12: %{name}_adie_48.png
Source20: %{name}_calc_16.png
Source21: %{name}_calc_32.png
Source22: %{name}_calc_48.png
+Patch0: fox-1.7.79-compile.patch
BuildRequires: pkgconfig(glu)
BuildRequires: cups-devel
BuildRequires: bzip2-devel
@@ -86,17 +87,17 @@ This package contains the necessary files to develop applications
with FOX.
%prep
-%setup -q
+%autosetup -p1
%build
#gw the examples don't link
##define _disable_ld_no_undefined 1
-%configure2_5x --with-opengl=mesa --enable-cups LIBS='-lfontconfig'
+%configure --with-opengl=mesa --enable-cups LIBS='-lfontconfig'
%make GL_LIBS="-lGL -lGLU"
%install
rm -rf %{buildroot} installed-docs
-%makeinstall_std
+%make_install
mv %buildroot%_datadir/doc/fox-%{major}/* installed-docs
cp -p pathfinder/PathFinder %{buildroot}/usr/bin
@@ -147,6 +148,8 @@ install -m 644 %{SOURCE1} %{buildroot}%{_miconsdir}/shutterbug.png
install -m 644 %{SOURCE2} %{buildroot}%{_iconsdir}/shutterbug.png
install -m 644 %{SOURCE3} %{buildroot}%{_liconsdir}/shutterbug.png
+ln -s fox17.pc %{buildroot}%{_libdir}/pkgconfig/fox.pc
+
rm -rf %buildroot%_prefix/fox
%files -n %{name_ex_apps}