From 1d8a8d8a26bfd596e13040118d5ea738b424c7bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:07:58 +0000 Subject: [PATCH 01/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 733223a..c16db4f 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -139,6 +139,9 @@ fi %changelog +* 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 From 56b76916f13fb50f1aab7054f88997ea42b94e51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:43:35 +0000 Subject: [PATCH 02/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index c16db4f..a867c23 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -139,6 +139,9 @@ fi %changelog +* 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 From 29b516e514c27c455bcf4db668f9d574bd48fe66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:39:52 +0000 Subject: [PATCH 03/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index a867c23..d6dc63c 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -139,6 +139,9 @@ fi %changelog +* 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 From 101c68f753f2fb8cffae765e4e4c1f0caf7741a8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:50:54 +0100 Subject: [PATCH 04/34] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- xforms.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index d6dc63c..43c6c57 100644 --- a/xforms.spec +++ b/xforms.spec @@ -13,7 +13,6 @@ 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 From c6888413c09203bff17bf9fe4e8c92e97b975e76 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:00:40 +0100 Subject: [PATCH 05/34] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- xforms.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xforms.spec b/xforms.spec index 43c6c57..e338182 100644 --- a/xforms.spec +++ b/xforms.spec @@ -93,9 +93,6 @@ rm -fv $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 From 843ab0b4b411f3f6aee4462900beb3482144c330 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 06/34] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xforms.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xforms.spec b/xforms.spec index e338182..f0d15ca 100644 --- a/xforms.spec +++ b/xforms.spec @@ -14,6 +14,7 @@ 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: libjpeg-devel %define x_deps xorg-x11-devel libGL-devel %if 0%{?fedora} > 4 || 0%{?rhel} > 4 From ace770e0ac94908d2a769525043816d0f9488355 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:54:19 -0500 Subject: [PATCH 07/34] Remove needless use of %defattr --- xforms.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xforms.spec b/xforms.spec index f0d15ca..0b7d4bf 100644 --- a/xforms.spec +++ b/xforms.spec @@ -99,7 +99,6 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING.LIB Copyright %doc ChangeLog README @@ -111,7 +110,6 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} %exclude %{_pkgdocdir}/xforms.pdf %files devel -%defattr(-,root,root,-) %{_bindir}/fd2ps %{_bindir}/fdesign %{_includedir}/*.h @@ -128,7 +126,6 @@ if [ $1 -eq 0 ]; then fi %files doc -%defattr(-,root,root) %{_infodir}/xforms.info* %{_pkgdocdir}/demos/ %{_pkgdocdir}/html/ From 08b2ef848348403c76016b6b3ee125788b0f0c82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:18:48 +0000 Subject: [PATCH 08/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 0b7d4bf..af5abb2 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -133,6 +133,9 @@ fi %changelog +* 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 From c99be4d6e2960c8f287bf50ca8f0dfeaf9322629 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:21 +0100 Subject: [PATCH 09/34] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xforms.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xforms.spec b/xforms.spec index af5abb2..17b6e4a 100644 --- a/xforms.spec +++ b/xforms.spec @@ -95,8 +95,7 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %{!?_licensedir:%global license %%doc} From 67cc4fd4f2001f3ab24a385e4c7257c771ae25dc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 19:40:37 +0100 Subject: [PATCH 10/34] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xforms.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/xforms.spec b/xforms.spec index 17b6e4a..1133412 100644 --- a/xforms.spec +++ b/xforms.spec @@ -50,8 +50,6 @@ Requires: %{?x_deps} %package doc Summary: XForms documentation Group: Documentation -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info BuildRequires: texi2html BuildRequires: texinfo BuildRequires: texinfo-tex @@ -116,14 +114,6 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} %{_mandir}/man1/* %{_mandir}/man5/* -%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 - %files doc %{_infodir}/xforms.info* %{_pkgdocdir}/demos/ From 44e1b8ff3c6e90540fac268ff06a8e78f0a48d1b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 28 Jan 2019 00:02:27 +0100 Subject: [PATCH 11/34] Make obsolete scriptlets conditional for EPEL < 8 --- xforms.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xforms.spec b/xforms.spec index 1133412..7e14b65 100644 --- a/xforms.spec +++ b/xforms.spec @@ -50,6 +50,10 @@ Requires: %{?x_deps} %package doc Summary: XForms documentation Group: 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 @@ -114,6 +118,16 @@ 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/ From 42f5b9e3c41d1d2bcf4f18cf5c551d23c6eafe1f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 12/34] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xforms.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xforms.spec b/xforms.spec index 7e14b65..d4fdc8d 100644 --- a/xforms.spec +++ b/xforms.spec @@ -9,7 +9,6 @@ Version: 1.2.4 Release: 12%{?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 @@ -41,7 +40,6 @@ the library. %package devel Summary: Development files for the XForms toolkit library -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{?x_deps} %description devel @@ -49,7 +47,6 @@ Requires: %{?x_deps} %package doc Summary: XForms documentation -Group: Documentation %if 0%{?rhel} && 0%{?rhel} <= 7 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info From bb9fd97bb2efca9797dcf8a75e3cb3ee621fbe41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:25:54 +0000 Subject: [PATCH 13/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index d4fdc8d..9e34ff9 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -133,6 +133,9 @@ fi %changelog +* 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 From 164509e9a1d323ca55807cfc76c9fbdc67a74b35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:13:23 +0000 Subject: [PATCH 14/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 9e34ff9..2493692 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 13%{?dist} +Release: 14%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -133,6 +133,9 @@ fi %changelog +* 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 From bd047ffcfc7c37c1beaf966bb5582c90c57da27c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:29:07 +0000 Subject: [PATCH 15/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 2493692..08bb513 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -133,6 +133,9 @@ fi %changelog +* 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 From db8a4f855f31875e7d0257a4e09ef274ebb0f6d3 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 10 Feb 2020 21:47:06 +0100 Subject: [PATCH 16/34] Declare curobj as static (#1800271, thanks to Jens Thoms Toerring) --- xforms-1.2.4-gcc10.patch | 24 ++++++++++++++++++++++++ xforms.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 xforms-1.2.4-gcc10.patch 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 08bb513..3b77e65 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,12 +6,13 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 15%{?dist} +Release: 16%{?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 +Patch0: xforms-1.2.4-gcc10.patch BuildRequires: gcc BuildRequires: libjpeg-devel @@ -64,6 +65,7 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?pre} +%patch0 -p1 -b .gcc10 # rpath hack sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure @@ -133,6 +135,9 @@ fi %changelog +* 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 From 7c423ebab338c06c7b231670a82a582efe7118de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:45:06 +0000 Subject: [PATCH 17/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 3b77e65..694b02c 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 16%{?dist} +Release: 17%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -135,6 +135,9 @@ fi %changelog +* 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) From 747a3f83e9ee2f2a386d684ea12fab5544e84746 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 31 Dec 2020 23:27:01 +0100 Subject: [PATCH 18/34] Spec file cleanup --- .gitignore | 1 + sources | 5 +++-- xforms.spec | 37 ++++++++++++++++++------------------- 3 files changed, 22 insertions(+), 21 deletions(-) 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.spec b/xforms.spec index 694b02c..0b688b1 100644 --- a/xforms.spec +++ b/xforms.spec @@ -10,26 +10,26 @@ Release: 17%{?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 -Patch0: xforms-1.2.4-gcc10.patch +Source0: https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz +Source1: https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz.sig +Source2: gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg +Patch0: xforms-1.2.4-gcc10.patch -BuildRequires: gcc +BuildRequires: gnupg2 +BuildRequires: gcc +BuildRequires: make 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} +BuildRequires: libGL-devel +BuildRequires: libX11-devel # import/export: png, sgi (optional?) Requires: netpbm-progs # import eps,ps (optional?) #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 @@ -42,7 +42,9 @@ the library. %package devel Summary: Development files for the XForms toolkit library Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{?x_deps} +Requires: libGL-devel +Requires: libX11-devel + %description devel %{summary}. @@ -56,14 +58,14 @@ BuildRequires: texi2html BuildRequires: texinfo BuildRequires: texinfo-tex BuildRequires: ImageMagick -%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch -%endif + %description doc %{summary}. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -n %{name}-%{version}%{?pre} %patch0 -p1 -b .gcc10 @@ -78,13 +80,11 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure --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 DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install +%make_install INSTALL='install -p' rm -rfv demos/.deps cp -r demos/ $RPM_BUILD_ROOT%{_pkgdocdir}/ @@ -99,7 +99,6 @@ 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* From 1db0b821558b08a44b200269ad43dd2887e14698 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:04:16 +0000 Subject: [PATCH 19/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 0b688b1..3819a64 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 17%{?dist} +Release: 18%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From 86700f4c9db8935fd013cad291c798d9852a7758 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:36:01 +0000 Subject: [PATCH 20/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 3819a64..4716e75 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 18%{?dist} +Release: 19%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From 15450c3f68c1b33d7d909a4f103eb6a9d93cec2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:07:55 +0000 Subject: [PATCH 21/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 4716e75..2775e1f 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 19%{?dist} +Release: 20%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From fa189bd0ea72c2acc0aa304bc756c688cf188980 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:09:42 +0000 Subject: [PATCH 22/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 2775e1f..200addc 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 20%{?dist} +Release: 21%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From ffca047fce90c711d7cb186f8a86c6d15d097729 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:29:53 +0000 Subject: [PATCH 23/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 200addc..09b1d1f 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 21%{?dist} +Release: 22%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From 2ecb27f75023c8e64d8b709b78a150499a535c8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:52:53 +0000 Subject: [PATCH 24/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 09b1d1f..62e75bb 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 22%{?dist} +Release: 23%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From 62915a509d1eb39b3c22f6bd8cf1f29671c29fe2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:43:30 +0000 Subject: [PATCH 25/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 62e75bb..a743a9e 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 23%{?dist} +Release: 24%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From 75c9f8ca5bd80503fb5be5e4369d2bac7deeb918 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 26/34] Eliminate use of obsolete %patchN syntax (#2283636) --- xforms.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index a743a9e..64b4434 100644 --- a/xforms.spec +++ b/xforms.spec @@ -67,7 +67,7 @@ BuildArch: noarch %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -n %{name}-%{version}%{?pre} -%patch0 -p1 -b .gcc10 +%patch -P0 -p1 -b .gcc10 # rpath hack sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure From 98b41088849ef934daf64b1521b8086f3793345c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:05:27 +0000 Subject: [PATCH 27/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 64b4434..f4e56aa 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 24%{?dist} +Release: 25%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ @@ -134,6 +134,9 @@ fi %changelog +* 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 From f62d7bdbc47820362d56a49c92034477612b1712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:55:31 +0200 Subject: [PATCH 28/34] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xforms.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xforms.spec b/xforms.spec index f4e56aa..bc5cd13 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,9 +6,10 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 25%{?dist} +Release: 26%{?dist} -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: http://xforms-toolkit.org/ Source0: https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz Source1: https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz.sig @@ -134,6 +135,9 @@ fi %changelog +* 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 From 7dd066c24beec2e8be1c18c895dd20138771bbad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:51:31 +0000 Subject: [PATCH 29/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index bc5cd13..ad0cf61 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 26%{?dist} +Release: 27%{?dist} # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -135,6 +135,9 @@ fi %changelog +* 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 From 4adb685117c49b246e5ca2e238a48baef5e929a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:51:06 +0000 Subject: [PATCH 30/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index ad0cf61..deb3407 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 27%{?dist} +Release: 28%{?dist} # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -135,6 +135,9 @@ fi %changelog +* 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 From 00390dfd10fbbc95b31d030a5ad76c4fb9f533df Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 7 Sep 2025 00:48:58 +0200 Subject: [PATCH 31/34] Remove support for Red Hat Enterprise Linux 7 --- xforms.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/xforms.spec b/xforms.spec index deb3407..58784ab 100644 --- a/xforms.spec +++ b/xforms.spec @@ -51,10 +51,6 @@ Requires: libX11-devel %package doc 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 @@ -117,16 +113,6 @@ 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/ From 4743bc75686689c478442bc82ec335d855109791 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 7 Sep 2025 01:35:42 +0200 Subject: [PATCH 32/34] - Reviewed automatically converted license tag - Minor spec file cleanup --- xforms.spec | 98 +++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 56 deletions(-) diff --git a/xforms.spec b/xforms.spec index 58784ab..71d7e44 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,36 +1,27 @@ -%{!?_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: 28%{?dist} - -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ -URL: http://xforms-toolkit.org/ -Source0: https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz -Source1: https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{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 - +Summary: GUI toolkit based on Xlib for X Window Systems +Name: xforms +Version: 1.2.4 +Release: 28%{?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 -Requires: 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 @@ -41,35 +32,35 @@ 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: 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: XForms documentation -BuildRequires: texi2html -BuildRequires: texinfo -BuildRequires: texinfo-tex -BuildRequires: ImageMagick -BuildArch: noarch +Summary: Documentation files for the XForms toolkit library +BuildRequires: texi2html +BuildRequires: texinfo +BuildRequires: texinfo-tex +BuildRequires: ImageMagick +BuildArch: noarch %description doc -%{summary}. - +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} -%patch -P0 -p1 -b .gcc10 +%autosetup -n %{name}-%{version}%{?pre} -p1 # rpath hack sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure - %build %configure \ --disable-demos \ @@ -79,20 +70,16 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %make_build X_PRE_LIBS="" - %install %make_install INSTALL='install -p' 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 @@ -119,7 +106,6 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} %{_pkgdocdir}/html/ %{_pkgdocdir}/xforms.pdf - %changelog * Fri Jul 25 2025 Fedora Release Engineering - 1.2.4-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild @@ -306,7 +292,7 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} * 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 @@ -317,14 +303,14 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} * 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 @@ -334,7 +320,7 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} * 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 @@ -345,7 +331,7 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} - 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 From 426a626f4bffc04390ae026720fe8f23071c2d8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:41:05 +0000 Subject: [PATCH 33/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 71d7e44..63de3a4 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,7 +1,7 @@ Summary: GUI toolkit based on Xlib for X Window Systems Name: xforms Version: 1.2.4 -Release: 28%{?dist} +Release: 29%{?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 @@ -107,6 +107,9 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} %{_pkgdocdir}/xforms.pdf %changelog +* 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 From 221aeb9d604e8926fde3d721d2a5cb32b78f07bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:14:07 +0000 Subject: [PATCH 34/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 63de3a4..7e65762 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,7 +1,7 @@ Summary: GUI toolkit based on Xlib for X Window Systems Name: xforms Version: 1.2.4 -Release: 29%{?dist} +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 @@ -107,6 +107,9 @@ rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} %{_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