Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
7e27bdb935 | ||
|
1bfee07618 | ||
|
556f06c47b | ||
|
5d2a273721 |
5 changed files with 62 additions and 440 deletions
137
changelog
137
changelog
|
|
@ -1,137 +0,0 @@
|
|||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-45
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Feb 05 2024 Gwyn Ciesla <gwync@protonmail.com> - 4.60.4-41
|
||||
- Patch for stricter flags
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Mar 03 2023 Gwyn Ciesla <gwync@protonmail.com> - 4.60.4-38
|
||||
- migrated to SPDX license
|
||||
|
||||
* Thu Feb 16 2023 Florian Weimer <fweimer@redhat.com> - 4.60.4-37
|
||||
- Port configure script to C99
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-35
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Oct 01 2015 Jon Ciesla <limburgher@gmail.com> - 4.60.4-21
|
||||
- Move from lesstif to motif, BZ 1267852.
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Sat Sep 20 2008 Patrice Dumas <pertusus@free.fr> 4.60.4-10
|
||||
- use %%patch0 instead of %%patch (#463002)
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.60.4-9
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Wed Aug 22 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-8
|
||||
- fix license and source url
|
||||
|
||||
* Wed Jul 25 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-7
|
||||
- add rhel conditionals
|
||||
|
||||
* Sat May 12 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-6
|
||||
- keep timestamps
|
||||
- examples/builderXcessory is arch specific
|
||||
|
||||
* Sun Dec 10 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-5
|
||||
- Requires automake is for -devel (#219047)
|
||||
|
||||
* Sat Sep 9 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-4
|
||||
- add BuildRequires libXmu-devel for examples
|
||||
|
||||
* Thu Aug 31 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-3
|
||||
- rebuild against lesstif
|
||||
- add Obsolete/Provides for Xbae
|
||||
|
||||
* Fri Aug 25 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-2
|
||||
- remove dependency on Wcl-devel (was only of use for an example)
|
||||
- clean docs
|
||||
|
||||
* Thu May 18 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-1
|
||||
- Packaged for fedora extras
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
--- src/Methods.c~ 2006-05-26 03:57:25.000000000 -0500
|
||||
+++ src/Methods.c 2024-02-05 14:31:58.138011816 -0600
|
||||
@@ -1688,7 +1688,7 @@
|
||||
* The event must have occurred in a legal position
|
||||
* otherwise control wouldn't have made it here
|
||||
*/
|
||||
- xbaeEventToRowColumn(mw, event, &r, &c, &x, &y);
|
||||
+ xbaeEventToRowColumn((Widget)mw, event, &r, &c, &x, &y);
|
||||
x -= mw->matrix.cell_shadow_thickness;
|
||||
y -= mw->matrix.cell_shadow_thickness;
|
||||
position = XmTextXYToPos(TextField(mw), x, y);
|
||||
--- examples/tests/leak2.c~ 2003-06-21 04:38:46.000000000 -0500
|
||||
+++ examples/tests/leak2.c 2024-02-05 14:45:03.587744588 -0600
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
XtResource resources[] = {
|
||||
{ "numIter", "NumIter", XtRInt, sizeof(int),
|
||||
- XtOffsetOf(AppRes, numIter), XtRImmediate, 1000 },
|
||||
+ XtOffsetOf(AppRes, numIter), XtRImmediate, (void *)1000 },
|
||||
};
|
||||
|
||||
int
|
||||
|
|
@ -1,124 +0,0 @@
|
|||
--- xbae-4.60.4/configure.multilib 2006-05-29 16:02:05.000000000 +0200
|
||||
+++ xbae-4.60.4/configure 2007-05-12 13:44:11.000000000 +0200
|
||||
@@ -22735,7 +22735,7 @@ fi
|
||||
THE_DATE=`date +%F`
|
||||
|
||||
|
||||
- ac_config_files="$ac_config_files Makefile include/Makefile include/Xbae/Makefile include/Xbae/patchlevel.h src/Makefile src/XbaeCaption.3 src/XbaeInput.3 src/XbaeMatrix.3 examples/Makefile examples/add/Makefile examples/caption/Makefile examples/choice/Makefile examples/colors/Makefile examples/draw/Makefile examples/dynamic/Makefile examples/fifteen/Makefile examples/input/Makefile examples/list/Makefile examples/matrix/Makefile examples/multibyte/Makefile examples/multifixed/Makefile examples/select-drag/Makefile examples/select-push/Makefile examples/tests/Makefile examples/traversal/Makefile examples/Mri/Makefile examples/builderXcessory/Makefile examples/builderXcessory/xbae.wml doc/Makefile doc/images/Makefile scripts/Makefile scripts/Xbae.spec"
|
||||
+ ac_config_files="$ac_config_files Makefile include/Makefile include/Xbae/Makefile include/Xbae/patchlevel.h src/Makefile src/XbaeCaption.3 src/XbaeInput.3 src/XbaeMatrix.3 examples/Makefile examples/add/Makefile examples/caption/Makefile examples/choice/Makefile examples/colors/Makefile examples/draw/Makefile examples/dynamic/Makefile examples/fifteen/Makefile examples/input/Makefile examples/list/Makefile examples/matrix/Makefile examples/multibyte/Makefile examples/multifixed/Makefile examples/select-drag/Makefile examples/select-push/Makefile examples/tests/Makefile examples/traversal/Makefile examples/Mri/Makefile examples/builderXcessory/Makefile doc/Makefile doc/images/Makefile scripts/Makefile scripts/Xbae.spec"
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
@@ -23403,7 +23403,6 @@ do
|
||||
"examples/traversal/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/traversal/Makefile" ;;
|
||||
"examples/Mri/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Mri/Makefile" ;;
|
||||
"examples/builderXcessory/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/builderXcessory/Makefile" ;;
|
||||
- "examples/builderXcessory/xbae.wml" ) CONFIG_FILES="$CONFIG_FILES examples/builderXcessory/xbae.wml" ;;
|
||||
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
||||
"doc/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/images/Makefile" ;;
|
||||
"scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
|
||||
--- xbae-4.60.4/configure.in.multilib 2006-05-29 15:54:14.000000000 +0200
|
||||
+++ xbae-4.60.4/configure.in 2007-05-12 13:44:17.000000000 +0200
|
||||
@@ -275,7 +275,6 @@ examples/tests/Makefile \
|
||||
examples/traversal/Makefile \
|
||||
examples/Mri/Makefile \
|
||||
examples/builderXcessory/Makefile \
|
||||
-examples/builderXcessory/xbae.wml \
|
||||
doc/Makefile \
|
||||
doc/images/Makefile \
|
||||
scripts/Makefile \
|
||||
--- xbae-4.60.4/examples/builderXcessory/xbae.wml.in.multilib 2003-10-20 21:11:45.000000000 +0200
|
||||
+++ xbae-4.60.4/examples/builderXcessory/xbae.wml.in 2007-05-12 13:45:47.000000000 +0200
|
||||
@@ -368,7 +368,7 @@ Class XbaeMatrixClass : Widget
|
||||
XtLiteral = "xbaeMatrixWidgetClass";
|
||||
LiveObject = True;
|
||||
SuperClass = "XmManager";
|
||||
- LoadLibrary = "@prefix@/lib/libXbae.so";
|
||||
+ LoadLibrary = "@libdir@/libXbae.so";
|
||||
LinkLibrary = "-lXbae";
|
||||
ConvenienceFunction = "XbaeCreateMatrix";
|
||||
Resources {
|
||||
@@ -482,7 +482,7 @@ Class XbaeCaptionClass : Widget
|
||||
XtLiteral = "xbaeCaptionWidgetClass";
|
||||
LiveObject = True;
|
||||
SuperClass = "XmManager";
|
||||
- LoadLibrary = "@prefix@/lib/libXbae.so";
|
||||
+ LoadLibrary = "@libdir@/libXbae.so";
|
||||
LinkLibrary = "-lXbae";
|
||||
ConvenienceFunction = "XbaeCreateCaption";
|
||||
Resources {
|
||||
@@ -503,7 +503,7 @@ Class XbaeInputClass : Widget
|
||||
XtLiteral = "xbaeInputWidgetClass";
|
||||
LiveObject = True;
|
||||
SuperClass = "XmText";
|
||||
- LoadLibrary = "@prefix@/lib/libXbae.so";
|
||||
+ LoadLibrary = "@libdir@/libXbae.so";
|
||||
LinkLibrary = "-lXbae";
|
||||
ConvenienceFunction = "XbaeCreateInput";
|
||||
Resources {
|
||||
--- xbae-4.60.4/examples/builderXcessory/Makefile.am.multilib 2002-11-23 23:14:00.000000000 +0100
|
||||
+++ xbae-4.60.4/examples/builderXcessory/Makefile.am 2007-05-12 13:45:47.000000000 +0200
|
||||
@@ -7,7 +7,7 @@ EXTRA_DIST= \
|
||||
XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
|
||||
local.cat \
|
||||
xbae.wml \
|
||||
- xbae_ctrl.tcl
|
||||
+ xbae_ctrl.tcl xbae.wml.in
|
||||
|
||||
examplesdir = $(datadir)/Xbae/examples/builderXcessory
|
||||
examples_DATA = \
|
||||
@@ -16,3 +16,6 @@ examples_DATA = \
|
||||
local.cat \
|
||||
xbae.wml \
|
||||
xbae_ctrl.tcl
|
||||
+
|
||||
+xbae.wml: xbae.wml.in ../../config.status
|
||||
+ sed -e "s%[@]libdir[@]%$(libdir)%" $< > xbae.wml
|
||||
--- xbae-4.60.4/examples/builderXcessory/Makefile.in.multilib 2006-05-29 16:02:07.000000000 +0200
|
||||
+++ xbae-4.60.4/examples/builderXcessory/Makefile.in 2007-05-12 13:45:47.000000000 +0200
|
||||
@@ -37,8 +37,7 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = examples/builderXcessory
|
||||
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
- $(srcdir)/xbae.wml.in
|
||||
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/ac_find_motif.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
|
||||
@@ -46,7 +45,6 @@ am__configure_deps = $(am__aclocal_m4_de
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/include/XbaeConfig.h
|
||||
-CONFIG_CLEAN_FILES = xbae.wml
|
||||
depcomp =
|
||||
am__depfiles_maybe =
|
||||
SOURCES =
|
||||
@@ -211,7 +209,7 @@ EXTRA_DIST = \
|
||||
XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
|
||||
local.cat \
|
||||
xbae.wml \
|
||||
- xbae_ctrl.tcl
|
||||
+ xbae_ctrl.tcl xbae.wml.in
|
||||
|
||||
examplesdir = $(datadir)/Xbae/examples/builderXcessory
|
||||
examples_DATA = \
|
||||
@@ -253,8 +251,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
-xbae.wml: $(top_builddir)/config.status $(srcdir)/xbae.wml.in
|
||||
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
@@ -404,6 +400,9 @@ uninstall-am: uninstall-examplesDATA uni
|
||||
uninstall uninstall-am uninstall-examplesDATA \
|
||||
uninstall-info-am
|
||||
|
||||
+
|
||||
+xbae.wml: xbae.wml.in ../../config.status
|
||||
+ sed -e "s%[@]libdir[@]%$(libdir)%" $< > xbae.wml
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
Fix an implicit declaration of the exit function in the
|
||||
libXp/rc=XpQueryVersion autoconf probe. Future compilers will not
|
||||
support implicit function declarations by default, causing the probe
|
||||
to always fail.
|
||||
|
||||
Also included are C99 compatibility fixes for historic autoconf
|
||||
incompatibilities, long since fixed in autoconf upstream.
|
||||
|
||||
Submitted upstream: <https://sourceforge.net/p/xbae/patches/3/>
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index 36b4569680ea8531..0bda82ef7480beaf 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -334,7 +334,7 @@ Display *display=NULL;
|
||||
short major_version, minor_version;
|
||||
Status rc;
|
||||
rc=XpQueryVersion(display, &major_version, &minor_version);
|
||||
-exit(0);
|
||||
+return 0;
|
||||
}
|
||||
],
|
||||
lt_cv_libxp=yes,
|
||||
diff --git a/configure b/configure
|
||||
index f43d920c33b055ff..5e82cda106a450e8 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2937,7 +2937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
for ac_declaration in \
|
||||
- '' \
|
||||
+ '#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
@@ -4120,7 +4120,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
for ac_declaration in \
|
||||
- '' \
|
||||
+ '#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
@@ -4477,8 +4477,8 @@ main ()
|
||||
for (i = 0; i < 256; i++)
|
||||
if (XOR (islower (i), ISLOWER (i))
|
||||
|| toupper (i) != TOUPPER (i))
|
||||
- exit(2);
|
||||
- exit (0);
|
||||
+ return 2;
|
||||
+ return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
@@ -21418,7 +21418,7 @@ Display *display=NULL;
|
||||
short major_version, minor_version;
|
||||
Status rc;
|
||||
rc=XpQueryVersion(display, &major_version, &minor_version);
|
||||
-exit(0);
|
||||
+return 0;
|
||||
}
|
||||
|
||||
;
|
||||
146
xbae.spec
146
xbae.spec
|
|
@ -1,42 +1,35 @@
|
|||
Name: xbae
|
||||
Version: 4.60.4
|
||||
Release: %autorelease
|
||||
Release: 5%{?dist}
|
||||
Summary: Motif matrix, caption and text input widgets
|
||||
# all the files are covered by the MIT license, except DebugUtil.c LGPLv2+
|
||||
License: LGPL-2.0-or-later
|
||||
Group: System Environment/Libraries
|
||||
License: BSD
|
||||
URL: http://xbae.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/xbae/xbae-%{version}.tar.gz
|
||||
Source0: http://ovh.dl.sourceforge.net/sourceforge/xbae/xbae-%{version}.tar.gz
|
||||
# this fixes the link of the example using Wcl, it shouldn't be of use
|
||||
# now that Wcl isn't buildrequired, but it is still better.
|
||||
Patch0: xbae-link_Mri_with_lXmp.diff
|
||||
Patch1: xbae-4.60.4-multilib.patch
|
||||
Patch2: xbae-configure-c99.patch
|
||||
Patch3: pointer-types.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
# libXp-devel and libXext-devel are required by openmotif-devel or
|
||||
# lesstif-devel
|
||||
# Wcl-devel is only needed by an example, which adds the Xbae widgets to Wcl
|
||||
BuildRequires: libXpm-devel
|
||||
# needed for examples
|
||||
BuildRequires: libXmu-devel
|
||||
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: openmotif-devel
|
||||
%else
|
||||
BuildRequires: motif-devel
|
||||
# to be sure that we link against lesstif even if openmotif provides the same
|
||||
# soname
|
||||
#Requires: lesstif
|
||||
%endif
|
||||
#BuildRequires: openmotif-devel
|
||||
BuildRequires: lesstif-devel
|
||||
# Wcl-devel should only needed by an example, which adds the Xbae widgets
|
||||
# to Wcl, so there is no real need for it.
|
||||
#BuildRequires: Wcl-devel
|
||||
# needed for examples
|
||||
BuildRequires: libXmu-devel
|
||||
|
||||
# name with capitalized X was used for the xbae package shipped up to FC-1
|
||||
Provides: Xbae = %{version}-%{release}
|
||||
Obsoletes: Xbae < %{version}-%{release}
|
||||
|
||||
# to be sure that we link against lesstif even if openmotif provides the same
|
||||
# soname
|
||||
Requires: lesstif
|
||||
|
||||
%description
|
||||
XbaeMatrix is a free Motif(R) table widget (also compatible with the free
|
||||
|
|
@ -54,12 +47,10 @@ that provides generic customised data entry and formatting for strings.
|
|||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if 0%{?rhel}
|
||||
Requires: openmotif-devel
|
||||
%else
|
||||
Requires: motif-devel
|
||||
%endif
|
||||
#Requires: openmotif-devel
|
||||
Requires: lesstif-devel
|
||||
Requires: libXpm-devel
|
||||
# for the aclocal directory
|
||||
Requires: automake
|
||||
|
|
@ -73,97 +64,76 @@ developing applications that use %{name}.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 0 -p1
|
||||
%patch -P 1 -p1 -b .multilib
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p0
|
||||
|
||||
for file in COPYING ChangeLog NEWS; do
|
||||
iconv -f latin1 -t utf8 < $file > $file.utf8
|
||||
touch -c -r $file $file.utf8
|
||||
mv $file.utf8 $file
|
||||
done
|
||||
%patch -p1
|
||||
|
||||
|
||||
%build
|
||||
export CFLAGS="$CFLAGS -std=gnu17"
|
||||
%configure --disable-static --disable-dependency-tracking
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL='install -p'
|
||||
# fix timestamps for configure generated man pages
|
||||
pushd src
|
||||
for file in XbaeCaption.3 XbaeInput.3 XbaeMatrix.3; do
|
||||
touch -r $file.in $RPM_BUILD_ROOT%{_mandir}/man3/$file
|
||||
done
|
||||
popd
|
||||
# and include file
|
||||
touch -r NEWS $RPM_BUILD_ROOT%{_includedir}/Xbae/patchlevel.h
|
||||
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
|
||||
|
||||
# the configure test doesn't find the aclocal dir, so we install
|
||||
# the .m4 file by hand
|
||||
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/aclocal
|
||||
install -p -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
|
||||
install -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
|
||||
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/libXbae.la
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
# prepare the main docs
|
||||
# Use systematically __dist_* to avoid directory name clash.
|
||||
rm -rf __dist_Xbae-docs
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __dist_Xbae-docs
|
||||
# remove duplicate files already in %%doc
|
||||
rm __dist_Xbae-docs/README
|
||||
rm __dist_Xbae-docs/NEWS
|
||||
# examples for builderXcessory are arch specific, this avoids clash of
|
||||
# doc files between arches
|
||||
mv __dist_Xbae-docs/examples/builderXcessory __dist_Xbae-docs/examples/builderXcessory-%{_arch}
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ Xbae-docs
|
||||
# remove duplicate files
|
||||
rm Xbae-docs/README
|
||||
rm Xbae-docs/NEWS
|
||||
|
||||
# first clean examples
|
||||
rm -rf __dist_examples
|
||||
cp -pr examples __dist_examples
|
||||
make -C __dist_examples clean
|
||||
find __dist_examples -name '*akefile*' -exec rm {} \;
|
||||
rm __dist_examples/extest
|
||||
rm __dist_examples/testall
|
||||
# clean the examples
|
||||
make -C examples clean
|
||||
cp -pr examples code_examples
|
||||
find code_examples -name '*akefile*' -exec rm {} \;
|
||||
rm code_examples/extest
|
||||
rm code_examples/testall
|
||||
mv code_examples/builderXcessory/README Xbae-docs/examples/builderXcessory/
|
||||
rm -rf code_examples/builderXcessory/
|
||||
ln -s ../examples/builderXcessory/ code_examples/builderXcessory
|
||||
|
||||
for file in __dist_examples/*/*.c __dist_examples/README; do
|
||||
iconv -f latin1 -t utf8 < $file > $file.utf8
|
||||
touch -c -r $file $file.utf8
|
||||
mv $file.utf8 $file
|
||||
done
|
||||
|
||||
# the builderXcessory directory is duplicated in the main doc and in the
|
||||
# example code. The master dir is considered to be in the main doc.
|
||||
# the README is better with the main examples doc, not in code examples
|
||||
mv __dist_examples/builderXcessory/README __dist_Xbae-docs/examples/builderXcessory-%{_arch}/
|
||||
# remove the duplicate dir and replace it with a link
|
||||
rm -rf __dist_examples/builderXcessory/
|
||||
ln -s ../examples/builderXcessory-%{_arch}/ __dist_examples/builderXcessory-%{_arch}
|
||||
|
||||
# then put the examples in a code_examples directory
|
||||
rm -rf __dist_code_examples
|
||||
mkdir __dist_code_examples
|
||||
mv __dist_examples __dist_code_examples/code_examples
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog NEWS COPYING README
|
||||
%{_libdir}/libXbae.so.*
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%doc __dist_Xbae-docs/* __dist_code_examples/code_examples
|
||||
%defattr(-,root,root,-)
|
||||
%doc Xbae-docs/* code_examples
|
||||
%{_includedir}/Xbae/
|
||||
%{_libdir}/libXbae.so
|
||||
%{_libdir}/*.so
|
||||
%{_mandir}/man*/Xbae*
|
||||
%{_datadir}/aclocal/*
|
||||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Sun Dec 10 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-5
|
||||
- Requires automake is for -devel (#219047)
|
||||
|
||||
* Sat Sep 9 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-4
|
||||
- add BuildRequires libXmu-devel for examples
|
||||
|
||||
* Thu Aug 31 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-3
|
||||
- rebuild against lesstif
|
||||
- add Obsolete/Provides for Xbae
|
||||
|
||||
* Fri Aug 25 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-2
|
||||
- remove dependency on Wcl-devel (was only of use for an example)
|
||||
- clean docs
|
||||
|
||||
* Thu May 18 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-1
|
||||
- Packaged for fedora extras
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue