Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0280780e71 | ||
| a1ecf46a31 | |||
|
8b7bb9c9b3 |
4 changed files with 74 additions and 122 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,2 @@
|
|||
/gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg
|
||||
/xforms-1.2.?.tar.gz
|
||||
/xforms-1.2.?.tar.gz.sig
|
||||
|
|
|
|||
5
sources
5
sources
|
|
@ -1,3 +1,2 @@
|
|||
SHA512 (gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg) = 280a5353edc78a5a1dc5f95c64e343b667684d58488b21f576b93c76adffc366cda5c5647d200196508e0d8d9d9888d866a35c41e739e6307a8ecc0e705df2d0
|
||||
SHA512 (xforms-1.2.4.tar.gz) = 9b6233e996e420afcbfb32ae70136611970296933a052038cd0d9e7b34e5aa69702af09d4d0e6a777a1421fccf0f0c4e39547136a560578294931adc3309057d
|
||||
SHA512 (xforms-1.2.4.tar.gz.sig) = 04bc51eee9698946c3c63ec4e289bf53adfd5bb45f34591d67aa11454a167bae157f36953de46bf03fbfebeac7cf2329da6146b6fd60ad85666290aaa9016883
|
||||
d4414c9eb3b284aa2f603a49f376ed22 xforms-1.2.4.tar.gz
|
||||
b16dfa7da68a467307295f647392d893 xforms-1.2.4.tar.gz.sig
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
||||
/***************************************
|
||||
166
xforms.spec
166
xforms.spec
|
|
@ -1,27 +1,34 @@
|
|||
Summary: GUI toolkit based on Xlib for X Window Systems
|
||||
Name: xforms
|
||||
Version: 1.2.4
|
||||
Release: 30%{?dist}
|
||||
License: LGPL-2.1-or-later
|
||||
URL: http://xforms-toolkit.org/
|
||||
Source0: https://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}%{?pre}.tar.gz
|
||||
Source1: https://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}%{?pre}.tar.gz.sig
|
||||
Source2: gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg
|
||||
Patch0: xforms-1.2.4-gcc10.patch
|
||||
BuildRequires: gnupg2
|
||||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
|
||||
|
||||
# trim changelog included in binary rpms
|
||||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
||||
|
||||
Name: xforms
|
||||
Summary: XForms toolkit library
|
||||
Version: 1.2.4
|
||||
Release: 14%{?dist}
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://xforms-toolkit.org/
|
||||
Source0: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz
|
||||
Source1: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz.sig
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libXpm-devel
|
||||
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
|
||||
Requires: xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi
|
||||
|
||||
%description
|
||||
XForms is a GUI toolkit based on Xlib for X Window Systems. It features a
|
||||
|
|
@ -32,35 +39,36 @@ library is extensible and new objects can easily be created and added to
|
|||
the library.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for the XForms toolkit library
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libGL-devel
|
||||
Requires: libX11-devel
|
||||
|
||||
Summary: Development files for the XForms toolkit library
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{?x_deps}
|
||||
%description devel
|
||||
The xforms-devel package includes header files and libraries necessary for
|
||||
developing programs which use the XForms toolkit library.
|
||||
%{summary}.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation files for the XForms toolkit library
|
||||
BuildRequires: texi2html
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: texinfo-tex
|
||||
BuildRequires: ImageMagick
|
||||
BuildArch: noarch
|
||||
|
||||
Summary: XForms documentation
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
%endif
|
||||
BuildRequires: texi2html
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: texinfo-tex
|
||||
BuildRequires: ImageMagick
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
%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.
|
||||
%{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%autosetup -n %{name}-%{version}%{?pre} -p1
|
||||
%setup -q -n %{name}-%{version}%{?pre}
|
||||
|
||||
# rpath hack
|
||||
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-demos \
|
||||
|
|
@ -68,21 +76,28 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
|
|||
--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
|
||||
|
||||
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
|
||||
|
||||
rm -rfv demos/.deps
|
||||
cp -r demos/ $RPM_BUILD_ROOT%{_pkgdocdir}/
|
||||
|
||||
|
||||
## Unpackaged files
|
||||
rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
|
||||
rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
|
||||
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING.LIB Copyright
|
||||
%doc ChangeLog README
|
||||
%{_libdir}/libflimage.so.2*
|
||||
|
|
@ -100,61 +115,24 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
|
|||
%{_mandir}/man1/*
|
||||
%{_mandir}/man5/*
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%post doc
|
||||
/sbin/install-info %{_infodir}/xforms.info %{_infodir}/dir ||:
|
||||
|
||||
%preun doc
|
||||
if [ $1 -eq 0 ]; then
|
||||
/sbin/install-info --delete %{_infodir}/xforms.info %{_infodir}/dir ||:
|
||||
fi
|
||||
%endif
|
||||
|
||||
%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
|
||||
|
||||
|
|
@ -298,7 +276,7 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
|
|||
* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-7
|
||||
- cleanup
|
||||
|
||||
* Wed Mar 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>
|
||||
* Wed Mar 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>
|
||||
- fc5: gcc/glibc respin
|
||||
|
||||
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-6
|
||||
|
|
@ -309,14 +287,14 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images}
|
|||
|
||||
* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
|
||||
- BR: libXpm-devel
|
||||
- -devel: Req: libX11-devel
|
||||
- -devel: Req: libX11-devel
|
||||
|
||||
* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-3
|
||||
- BR: libGL-devel
|
||||
- #BR: libXpm-devel (coming soon)
|
||||
|
||||
* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-2
|
||||
- BR: libGL.so.1 -> BR: %%x_pkg-Mesa-libGL
|
||||
- BR: libGL.so.1 -> BR: %%x_pkg-Mesa-libGL
|
||||
- remove legacy crud
|
||||
|
||||
* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-1
|
||||
|
|
@ -326,7 +304,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,7 +315,7 @@ 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue