mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix FLTK_VERSION_XXX strings in configure et al 

Variables FL_XXX_VERSION (XXX = { MAJOR | MINOR | PATCH } ) have been
renamed to FLTK_VERSION_XXX for compatibility with CMake.

Note: FL_DSO_VERSION and FL_ABI_VERSION are not affected.
This commit is contained in:
Albrecht Schlosser 2021-04-09 14:08:03 +02:00
parent 1c587997c2
commit 359f8b5d4a
4 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -49,19 +49,19 @@ case $host_os in
esac esac
dnl FLTK library versions... dnl FLTK library versions...
FL_MAJOR_VERSION=1 FLTK_VERSION_MAJOR=1
FL_MINOR_VERSION=3 FLTK_VERSION_MINOR=3
FL_PATCH_VERSION=6 FLTK_VERSION_PATCH=6
FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} FL_DSO_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0 FL_ABI_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}.0
FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION} FLTK_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}.${FLTK_VERSION_PATCH}
AC_SUBST(FL_MAJOR_VERSION) AC_SUBST(FLTK_VERSION_MAJOR)
AC_SUBST(FL_MINOR_VERSION) AC_SUBST(FLTK_VERSION_MINOR)
AC_SUBST(FL_PATCH_VERSION) AC_SUBST(FLTK_VERSION_PATCH)
AC_SUBST(FL_DSO_VERSION) AC_SUBST(FL_DSO_VERSION)
AC_SUBST(FL_ABI_VERSION) AC_SUBST(FL_ABI_VERSION)
AC_SUBST(FL_VERSION) AC_SUBST(FLTK_VERSION)
AC_SUBST(ARCHFLAGS) AC_SUBST(ARCHFLAGS)
AC_SUBST(OPTIM) AC_SUBST(OPTIM)

6
fltk-config.in
View File

@ -17,9 +17,9 @@
# https://www.fltk.org/bugs.php # https://www.fltk.org/bugs.php
# #
MAJOR_VERSION=@FL_MAJOR_VERSION@ MAJOR_VERSION=@FLTK_VERSION_MAJOR@
MINOR_VERSION=@FL_MINOR_VERSION@ MINOR_VERSION=@FLTK_VERSION_MINOR@
PATCH_VERSION=@FL_PATCH_VERSION@ PATCH_VERSION=@FLTK_VERSION_PATCH@
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION"
APIVERSION="$MAJOR_VERSION.$MINOR_VERSION" APIVERSION="$MAJOR_VERSION.$MINOR_VERSION"

23
fltk.list.in
View File

@ -1,29 +1,27 @@
# #
# "$Id$"
#
# EPM product list file for the Fast Light Tool Kit (FLTK). # EPM product list file for the Fast Light Tool Kit (FLTK).
# #
# (EPM can be found at http://www.epmhome.org/) # (EPM can be found at https://www.msweet.org/epm/)
# #
# Copyright 1998-2010 by Bill Spitzak and others. # Copyright 1998-2021 by Bill Spitzak and others.
# #
# This library is free software. Distribution and use rights are outlined in # This library is free software. Distribution and use rights are outlined in
# the file "COPYING" which should have been included with this file. If this # the file "COPYING" which should have been included with this file. If this
# file is missing or damaged, see the license at: # file is missing or damaged, see the license at:
# #
# http://www.fltk.org/COPYING.php # https://www.fltk.org/COPYING.php
# #
# Please report all bugs and problems on the following page: # Please see the following page on how to report bugs and issues:
# #
# http://www.fltk.org/str.php # https://www.fltk.org/bugs.php
# #
%product Fast Light Tool Kit (FLTK) %product Fast Light Tool Kit (FLTK)
%copyright 1998-2011 by Bill Spitzak and others. %copyright 1998-2021 by Bill Spitzak and others.
%vendor FLTK Development Team %vendor FLTK Development Team
%license COPYING %license COPYING
%readme README %readme README
%version @FL_MAJOR_VERSION@.@FL_MINOR_VERSION@.@FL_PATCH_VERSION@ %version @FLTK_VERSION_MAJOR@.@FLTK_VERSION_MINOR@.@FLTK_VERSION_PATCH@
%description The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a %description The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
%description cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11), %description cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
%description Microsoft(r) Windows(r), and MacOS(r) X. FLTK provides modern %description Microsoft(r) Windows(r), and MacOS(r) X. FLTK provides modern
@ -124,7 +122,7 @@ f 0444 root sys /usr/share/icons/hicolor/32x32/apps/fluid.png fluid/icons/fluid-
f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png
f 0444 root sys /usr/share/icons/hicolor/64x64/apps/fluid.png fluid/icons/fluid-64.png f 0444 root sys /usr/share/icons/hicolor/64x64/apps/fluid.png fluid/icons/fluid-64.png
f 0444 root sys /usr/share/icons/hicolor/128x128/apps/fluid.png fluid/icons/fluid-128.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/fluid.png fluid/icons/fluid-128.png
f 0444 root sys /usr/share/mimelnk/application/x-fluid.desktop fluid/x-fluid.desktop f 0444 root sys /usr/share/mimelnk/application/x-fluid.desktop fluid/fluid.desktop
%system all %system all
@ -350,6 +348,7 @@ l 0000 root sys $includedir/FL/forms.h forms.H
l 0000 root sys $includedir/FL/gl_draw.h gl_draw.H l 0000 root sys $includedir/FL/gl_draw.h gl_draw.H
l 0000 root sys $includedir/FL/glut.h glut.H l 0000 root sys $includedir/FL/glut.h glut.H
l 0000 root sys $includedir/FL/mac.h mac.H l 0000 root sys $includedir/FL/mac.h mac.H
l 0000 root sys $includedir/FL/platform.h platform.H
l 0000 root sys $includedir/FL/win32.h win32.H l 0000 root sys $includedir/FL/win32.h win32.H
l 0000 root sys $includedir/FL/x.h x.H l 0000 root sys $includedir/FL/x.h x.H
%system all %system all
@ -427,7 +426,3 @@ f 0444 root sys $mandir/cat6/sudoku.$CAT6EXT documentation/src/sudoku.$CAT6EXT
f 0444 root sys $mandir/man6/blocks.6 documentation/src/blocks.man f 0444 root sys $mandir/man6/blocks.6 documentation/src/blocks.man
f 0444 root sys $mandir/man6/checkers.6 documentation/src/checkers.man f 0444 root sys $mandir/man6/checkers.6 documentation/src/checkers.man
f 0444 root sys $mandir/man6/sudoku.6 documentation/src/sudoku.man f 0444 root sys $mandir/man6/sudoku.6 documentation/src/sudoku.man
#
# End of "$Id$".
#

18
fltk.spec.in
View File

@ -1,22 +1,20 @@
# #
# "$Id$"
#
# RPM spec file for FLTK. # RPM spec file for FLTK.
# #
# Copyright 1998-2015 by Bill Spitzak and others. # Copyright 1998-2021 by Bill Spitzak and others.
# #
# This library is free software. Distribution and use rights are outlined in # This library is free software. Distribution and use rights are outlined in
# the file "COPYING" which should have been included with this file. If this # the file "COPYING" which should have been included with this file. If this
# file is missing or damaged, see the license at: # file is missing or damaged, see the license at:
# #
# http://www.fltk.org/COPYING.php # https://www.fltk.org/COPYING.php
# #
# Please report all bugs and problems on the following page: # Please see the following page on how to report bugs and issues:
# #
# http://www.fltk.org/str.php # https://www.fltk.org/bugs.php
# #
%define version @FL_MAJOR_VERSION@.@FL_MINOR_VERSION@.@FL_PATCH_VERSION@ %define version @FLTK_VERSION_MAJOR@.@FLTK_VERSION_MINOR@.@FLTK_VERSION_PATCH@
%define release 1 %define release 1
%define prefix /usr %define prefix /usr
@ -27,7 +25,7 @@ Release: %{release}
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source: ftp://ftp.fltk.org/pub/fltk/%{version}/fltk-%{version}-source.tar.gz Source: ftp://ftp.fltk.org/pub/fltk/%{version}/fltk-%{version}-source.tar.gz
URL: http://www.fltk.org/ URL: https://www.fltk.org/
Packager: FLTK Developer <fltk@fltk.org> Packager: FLTK Developer <fltk@fltk.org>
# use BuildRoot so as not to disturb the version already installed # use BuildRoot so as not to disturb the version already installed
BuildRoot: /var/tmp/fltk-%{PACKAGE_VERSION} BuildRoot: /var/tmp/fltk-%{PACKAGE_VERSION}
@ -130,7 +128,3 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/icons/hicolor/*/apps/blocks.png %{prefix}/share/icons/hicolor/*/apps/blocks.png
%{prefix}/share/icons/hicolor/*/apps/checkers.png %{prefix}/share/icons/hicolor/*/apps/checkers.png
%{prefix}/share/icons/hicolor/*/apps/sudoku.png %{prefix}/share/icons/hicolor/*/apps/sudoku.png
#
# End of "$Id$".
#