diff --git a/.gitignore b/.gitignore index 192c861..a903fc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +/gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg /xforms-1.2.?.tar.gz /xforms-1.2.?.tar.gz.sig diff --git a/sources b/sources index 0c50c2a..b40d55b 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -d4414c9eb3b284aa2f603a49f376ed22 xforms-1.2.4.tar.gz -b16dfa7da68a467307295f647392d893 xforms-1.2.4.tar.gz.sig +SHA512 (gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg) = 280a5353edc78a5a1dc5f95c64e343b667684d58488b21f576b93c76adffc366cda5c5647d200196508e0d8d9d9888d866a35c41e739e6307a8ecc0e705df2d0 +SHA512 (xforms-1.2.4.tar.gz) = 9b6233e996e420afcbfb32ae70136611970296933a052038cd0d9e7b34e5aa69702af09d4d0e6a777a1421fccf0f0c4e39547136a560578294931adc3309057d +SHA512 (xforms-1.2.4.tar.gz.sig) = 04bc51eee9698946c3c63ec4e289bf53adfd5bb45f34591d67aa11454a167bae157f36953de46bf03fbfebeac7cf2329da6146b6fd60ad85666290aaa9016883 diff --git a/xforms-1.2.4-gcc10.patch b/xforms-1.2.4-gcc10.patch new file mode 100644 index 0000000..3822ae4 --- /dev/null +++ b/xforms-1.2.4-gcc10.patch @@ -0,0 +1,24 @@ +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; + + + /*************************************** diff --git a/xforms.spec b/xforms.spec index 3ed0c04..7e65762 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,30 +1,27 @@ -Name: xforms -Summary: XForms toolkit library -Version: 1.2.4 -Release: 2%{?dist} - -License: LGPLv2+ -Group: System Environment/Libraries -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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -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} - +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 +BuildRequires: gcc +BuildRequires: make +BuildRequires: libjpeg-devel +BuildRequires: libXpm-devel +BuildRequires: libGL-devel +BuildRequires: libX11-devel # 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 xorg-x11-fonts-ISO8859-1-100dpi +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 @@ -35,59 +32,67 @@ 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 -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{?x_deps} +Summary: Development files for the XForms toolkit library +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libGL-devel +Requires: libX11-devel %description devel -%{summary}. +The xforms-devel package includes header files and libraries necessary for +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 -%setup -q -n %{name}-%{version}%{?pre} +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%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 %{?_smp_mflags} X_PRE_LIBS="" - +%make_build X_PRE_LIBS="" %install -rm -rf $RPM_BUILD_ROOT +%make_install INSTALL='install -p' -make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install +rm -rfv demos/.deps +cp -r demos/ $RPM_BUILD_ROOT%{_pkgdocdir}/ ## Unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} +%ldconfig_scriptlets %files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} %license COPYING.LIB Copyright %doc ChangeLog README %{_libdir}/libflimage.so.2* %{_libdir}/libformsGL.so.2* %{_libdir}/libforms.so.2* +%exclude %{_pkgdocdir}/demos/ +%exclude %{_pkgdocdir}/html/ +%exclude %{_pkgdocdir}/xforms.pdf %files devel -%defattr(-,root,root,-) %{_bindir}/fd2ps %{_bindir}/fdesign %{_includedir}/*.h @@ -95,8 +100,98 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %{_mandir}/man5/* +%files doc +%{_infodir}/xforms.info* +%{_pkgdocdir}/demos/ +%{_pkgdocdir}/html/ +%{_pkgdocdir}/xforms.pdf %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.2.4-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 1.2.4-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.2.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.2.4-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 1.2.4-26 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.2.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2.4-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.4-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 1.2.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Feb 10 2020 Robert Scheck - 1.2.4-16 +- Declare curobj as static (#1800271, thanks to Jens Thoms Toerring) + +* Fri Jan 31 2020 Fedora Release Engineering - 1.2.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 28 2015 Rex Dieter 1.2.4-5 +- tweak pkgdocdir to work on el6 too, fix %%preun doc scriptlet + +* Thu May 28 2015 Rex Dieter 1.2.4-4 +- -doc: include demos/ too + +* Tue May 26 2015 Rex Dieter 1.2.4-3 +- -doc subpkg +- trim %%changelog + * Wed Apr 08 2015 Robert Scheck - 1.2.4-2 - Some minor spec file tweaks @@ -203,7 +298,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Aug 08 2006 Rex Dieter 1.0.90-7 - cleanup -* Wed Mar 01 2006 Rex Dieter +* Wed Mar 01 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Jan 20 2006 Rex Dieter 1.0.90-6 @@ -214,14 +309,14 @@ rm -rf $RPM_BUILD_ROOT * Mon Dec 19 2005 Rex Dieter 1.0.90-4 - BR: libXpm-devel -- -devel: Req: libX11-devel +- -devel: Req: libX11-devel * Mon Oct 17 2005 Rex Dieter 1.0.90-3 - BR: libGL-devel - #BR: libXpm-devel (coming soon) * Mon Oct 17 2005 Rex Dieter 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 1.0.90-1 @@ -231,7 +326,7 @@ rm -rf $RPM_BUILD_ROOT * Sun May 22 2005 Jeremy Katz - 1.0-4 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - rebuilt * Sun Nov 23 2003 Rex Dieter 0:1.0-0.fdr.2 @@ -242,7 +337,7 @@ rm -rf $RPM_BUILD_ROOT - BuildRequires: libtiff-devel - add few more %%doc files. -* Fri Apr 02 2003 Rex Dieter 0:1.0-0.fdr.0 +* Wed Apr 02 2003 Rex Dieter 0:1.0-0.fdr.0 - fedora-ize package. * Mon Jan 20 2003 Rex Dieter 1.0-0