.cvsignore

@@ -0,0 +1 @@
+xforms-1.0.92sp1.tar.gz

.gitignore

@@ -1,3 +0,0 @@
-/gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg
-/xforms-1.2.?.tar.gz
-/xforms-1.2.?.tar.gz.sig

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: xforms
+# $Id$
+NAME := xforms
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

sources

@@ -1,3 +1 @@
-SHA512 (gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg) = 280a5353edc78a5a1dc5f95c64e343b667684d58488b21f576b93c76adffc366cda5c5647d200196508e0d8d9d9888d866a35c41e739e6307a8ecc0e705df2d0
+3d23731c0bdd065b54d258c92d15cbd2  xforms-1.0.92sp1.tar.gz
-SHA512 (xforms-1.2.4.tar.gz) = 9b6233e996e420afcbfb32ae70136611970296933a052038cd0d9e7b34e5aa69702af09d4d0e6a777a1421fccf0f0c4e39547136a560578294931adc3309057d
-SHA512 (xforms-1.2.4.tar.gz.sig) = 04bc51eee9698946c3c63ec4e289bf53adfd5bb45f34591d67aa11454a167bae157f36953de46bf03fbfebeac7cf2329da6146b6fd60ad85666290aaa9016883

xforms-1.2.4-gcc10.patch

@@ -1,24 +0,0 @@
-Declare curobj for GCC 10 as static (RHBZ#1800271, thanks to Jens Thoms Toerring)
-
---- xforms-1.2.4/fdesign/sp_spinner.c		2013-12-14 14:26:25.000000000 +0100
-+++ xforms-1.2.4/fdesign/sp_spinner.c.gcc10	2020-02-10 21:36:31.032128122 +0100
-@@ -29,7 +29,7 @@
- #include "spec/spinner_spec.h"
- 
- static FD_spinnerattrib * spn_attrib;
--FL_OBJECT *curobj;
-+static FL_OBJECT *curobj;
- 
- 
- /***************************************
---- xforms-1.2.4/fdesign/sp_twheel.c		2014-06-28 22:34:29.000000000 +0200
-+++ xforms-1.2.4/fdesign/sp_twheel.c.gcc10	2020-02-10 21:36:07.910351664 +0100
-@@ -38,7 +38,7 @@
- #include "spec/twheel_spec.h"
- 
- static FD_twheelattrib * twheel_attrib;
--FL_OBJECT * curobj;
-+static FL_OBJECT * curobj;
- 
- 
- /***************************************

xforms.spec

@@ -1,98 +1,93 @@
-Summary:        GUI toolkit based on Xlib for X Window Systems
+
-Name:           xforms
+%define pre sp1 
-Version:        1.2.4
+
-Release:        30%{?dist}
+Name:    xforms
-License:        LGPL-2.1-or-later
+Summary: XForms toolkit library
-URL:            http://xforms-toolkit.org/
+Version: 1.0.92
-Source0:        https://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}%{?pre}.tar.gz
+Release: 1.%{pre}%{?dist}
-Source1:        https://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}%{?pre}.tar.gz.sig
+
-Source2:        gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg
+License: LGPLv2+
-Patch0:         xforms-1.2.4-gcc10.patch
+Group:   System Environment/Libraries
-BuildRequires:  gnupg2
+#URL:     http://www.nongnu.org/xforms/
-BuildRequires:  gcc
+URL:     http://xforms-toolkit.org/
-BuildRequires:  make
+Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
-BuildRequires:  libjpeg-devel
+#Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig 
-BuildRequires:  libXpm-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libGL-devel
+
-BuildRequires:  libX11-devel
+BuildRequires: libjpeg-devel
+%define x_deps xorg-x11-devel libGL-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libXpm-devel
+# skip xorg-x11-proto-devel, for now, pulled in indirectly via libX11-devel
+%define x_deps libGL-devel libX11-devel
+%endif
+BuildRequires: %{x_deps}
+
 # import/export: png, sgi (optional?)
-Requires:       netpbm-progs
+Requires: netpbm-progs
 # import eps,ps (optional?)
-#Requires:       ghostscript
+#Requires: ghostscript
-# eww, http://lists.nongnu.org/archive/html/xforms-development/2010-05/msg00000.html
+
-Requires:       xorg-x11-fonts-ISO8859-1-75dpi
-Requires:       xorg-x11-fonts-ISO8859-1-100dpi
 
 %description
-XForms is a GUI toolkit based on Xlib for X Window Systems. It features a
+XForms is a GUI toolkit based on Xlib for X Window Systems. It
-rich set of objects, such as buttons, sliders, browsers, and menus etc.
+features a rich set of objects, such as buttons, sliders, and menus
-integrated into an easy and efficient object/event callback execution model
+etc. integrated into an easy and efficient object/event callback
-that allows fast and easy construction of X-applications. In addition, the
+execution model that allows fast and easy construction of
-library is extensible and new objects can easily be created and added to
+X-applications. In addition, the library is extensible and new objects
-the library.
+can easily be created and added to the library.
 
 %package devel
-Summary:        Development files for the XForms toolkit library
+Summary: Development files for the XForms toolkit library
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Group: Development/Libraries
-Requires:       libGL-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires:       libX11-devel
+Requires: %{?x_deps}
-
 %description devel
-The xforms-devel package includes header files and libraries necessary for
+%{summary}.
-developing programs which use the XForms toolkit library.
 
-%package doc
-Summary:        Documentation files for the XForms toolkit library
-BuildRequires:  texi2html
-BuildRequires:  texinfo
-BuildRequires:  texinfo-tex
-BuildRequires:  ImageMagick
-BuildArch:      noarch
-
-%description doc
-XForms is a GUI toolkit based on Xlib for X Window Systems. This package
-contains the documentation for developing applications that use the XForms
-toolkit library.
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%setup -q -n %{name}-%{version}%{?pre}
-%autosetup -n %{name}-%{version}%{?pre} -p1
 
 # rpath hack
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 
+
 %build
 %configure \
-  --disable-demos \
-  --enable-docs --htmldir=%{_pkgdocdir}/html --pdfdir=%{_pkgdocdir} \
   --disable-static \
   --enable-optimization="$RPM_OPT_FLAGS"
 
-%make_build X_PRE_LIBS=""
+make %{?_smp_mflags} X_PRE_LIBS=""
+
 
 %install
-%make_install INSTALL='install -p'
+rm -rf $RPM_BUILD_ROOT
 
-rm -rfv demos/.deps
+make install DESTDIR=$RPM_BUILD_ROOT
-cp -r demos/ $RPM_BUILD_ROOT%{_pkgdocdir}/
 
 ## Unpackaged files
-rm -fv  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
-%ldconfig_scriptlets
 
 %files
-%license COPYING.LIB Copyright
+%defattr(-,root,root,-)
-%doc ChangeLog README
+%doc COPYING.LIB Copyright ChangeLog NEWS README
-%{_libdir}/libflimage.so.2*
+%{_libdir}/libflimage.so.1*
-%{_libdir}/libformsGL.so.2*
+%{_libdir}/libformsGL.so.1*
-%{_libdir}/libforms.so.2*
+%{_libdir}/libforms.so.1*
-%exclude %{_pkgdocdir}/demos/
-%exclude %{_pkgdocdir}/html/
-%exclude %{_pkgdocdir}/xforms.pdf
 
 %files devel
+%defattr(-,root,root,-)
 %{_bindir}/fd2ps
 %{_bindir}/fdesign
 %{_includedir}/*.h
@@ -100,159 +95,8 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
-%files doc
-%{_infodir}/xforms.info*
-%{_pkgdocdir}/demos/
-%{_pkgdocdir}/html/
-%{_pkgdocdir}/xforms.pdf
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.2.4-26
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Feb 10 2020 Robert Scheck <robert@fedoraproject.org> - 1.2.4-16
-- Declare curobj as static (#1800271, thanks to Jens Thoms Toerring)
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu May 28 2015 Rex Dieter <rdieter@fedoraproject.org> 1.2.4-5
-- tweak pkgdocdir to work on el6 too, fix %%preun doc scriptlet
-
-* Thu May 28 2015 Rex Dieter <rdieter@fedoraproject.org> 1.2.4-4
-- -doc: include demos/ too
-
-* Tue May 26 2015 Rex Dieter <rdieter@fedoraproject.org> 1.2.4-3
-- -doc subpkg
-- trim %%changelog
-
-* Wed Apr 08 2015 Robert Scheck <robert@fedoraproject.org> - 1.2.4-2
-- Some minor spec file tweaks
-
-* Wed Apr 08 2015 Robert Scheck <robert@fedoraproject.org> - 1.2.4-1
-- Upgrade to 1.2.4
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Jan 15 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.3-1
-- 1.2.3
-
-* Tue Jan 14 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-1
-- 1.2.2
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.10.pre17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.9.pre17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.0.94-0.8.pre17
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.7.pre17
-- 1.9.94pre17
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.0.94-0.6.pre12
-- rebuild against new libjpeg
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.5.pre12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jul 06 2012 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.4.pre12
-- xforms-1.9.94pre12
-
-* Tue May 15 2012 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.3.pre11
-- xforms-1.9.94pre11
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.2.pre5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Aug 15 2011 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.1.pre5
-- 1.0.94pre5
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.93-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun May 23 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.93-1
-- xforms-1.0.93
-
-* Tue May 18 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.93-0.1.pre7
-- xforms-1.0.93pre7
-- Requires: xorg-x11-fonts-ISO8859-1-75dpi
-
-* Thu Nov 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.92-2.sp2
-- xforms-1.9.92sp2
-
 * Mon Sep 21 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.92-1.sp1
 - xforms-1.0.92sp1
 
@@ -326,7 +170,7 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
 * Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 1.0-4
 - rebuild on all arches
 
-* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Sun Nov 23 2003 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.2
@@ -337,9 +181,10 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
 - BuildRequires: libtiff-devel
 - add few more %%doc files.
 
-* Wed Apr 02 2003 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.0
+* Fri Apr 02 2003 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.0
 - fedora-ize package.
 
 * Mon Jan 20 2003 Rex Dieter <rexdieter at sf.net> 1.0-0
 - 1.0-release
 - redhat-ize specfile
+