From 3c19e8b27f5545c2c3035086ea004ddeba57fd16 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 5 Nov 2009 15:25:43 +0000 Subject: [PATCH 01/65] - xforms-1.9.92sp2 --- .cvsignore | 2 +- sources | 2 +- xforms.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2500a11..4d79ff4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xforms-1.0.92sp1.tar.gz +xforms-1.0.92sp2.tar.gz diff --git a/sources b/sources index 28f273f..3ed810b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d23731c0bdd065b54d258c92d15cbd2 xforms-1.0.92sp1.tar.gz +3c2806dff3022c536eabd93d32e3dab7 xforms-1.0.92sp2.tar.gz diff --git a/xforms.spec b/xforms.spec index 296ff4a..e9e9735 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,10 +1,10 @@ -%define pre sp1 +%define pre sp2 Name: xforms Summary: XForms toolkit library Version: 1.0.92 -Release: 1.%{pre}%{?dist} +Release: 2.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 05 2009 Rex Dieter - 1.0.92-2.sp2 +- xforms-1.9.92sp2 + * Mon Sep 21 2009 Rex Dieter - 1.0.92-1.sp1 - xforms-1.0.92sp1 From b738766ce48b051edef2b8169d8d715d093a1570 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:58 +0000 Subject: [PATCH 02/65] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b10ce79..444b49b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 147c4d6f2b622c8dc3e297786ae13ff00fc344fb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 18 May 2010 16:48:38 +0000 Subject: [PATCH 03/65] - xforms-1.0.93pre7 - Requires: xorg-x11-fonts-ISO8859-1-75dpi --- .cvsignore | 3 ++- sources | 3 ++- xforms.spec | 23 +++++++++++++++-------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4d79ff4..2315169 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -xforms-1.0.92sp2.tar.gz +xforms-1.0.93pre7.tar.gz +xforms-1.0.93pre7.tar.gz.sig diff --git a/sources b/sources index 3ed810b..650d6d2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -3c2806dff3022c536eabd93d32e3dab7 xforms-1.0.92sp2.tar.gz +9e5317c49c233d3a4f9a59b86f7806c1 xforms-1.0.93pre7.tar.gz +69df84af137bb7bb20a8276f9cee1066 xforms-1.0.93pre7.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index e9e9735..977fff9 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,17 +1,19 @@ -%define pre sp2 +%define pre pre7 Name: xforms Summary: XForms toolkit library -Version: 1.0.92 -Release: 2.%{pre}%{?dist} +Version: 1.0.93 +Release: 0.1.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries #URL: http://www.nongnu.org/xforms/ URL: http://xforms-toolkit.org/ -Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz +#Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz #Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig +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 @@ -27,7 +29,8 @@ BuildRequires: %{x_deps} 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 %description XForms is a GUI toolkit based on Xlib for X Window Systems. It @@ -82,9 +85,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.LIB Copyright ChangeLog NEWS README -%{_libdir}/libflimage.so.1* -%{_libdir}/libformsGL.so.1* -%{_libdir}/libforms.so.1* +%{_libdir}/libflimage.so.2* +%{_libdir}/libformsGL.so.2* +%{_libdir}/libforms.so.2* %files devel %defattr(-,root,root,-) @@ -97,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 18 2010 Rex Dieter - 1.0.93-0.1.pre7 +- xforms-1.0.93pre7 +- Requires: xorg-x11-fonts-ISO8859-1-75dpi + * Thu Nov 05 2009 Rex Dieter - 1.0.92-2.sp2 - xforms-1.9.92sp2 From 0cdc006cf2559f3bbb9aa566c1ffaf07198136a2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 23 May 2010 20:07:03 +0000 Subject: [PATCH 04/65] - xforms-1.0.93 --- .cvsignore | 4 ++-- sources | 4 ++-- xforms.spec | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2315169..473bf56 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xforms-1.0.93pre7.tar.gz -xforms-1.0.93pre7.tar.gz.sig +xforms-1.0.93.tar.gz +xforms-1.0.93.tar.gz.sig diff --git a/sources b/sources index 650d6d2..532463d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9e5317c49c233d3a4f9a59b86f7806c1 xforms-1.0.93pre7.tar.gz -69df84af137bb7bb20a8276f9cee1066 xforms-1.0.93pre7.tar.gz.sig +7d7c2b539ce4a6a5072204aa73fa9dc8 xforms-1.0.93.tar.gz +f67c16b3d767d3a521eb3cc4afd6d4e7 xforms-1.0.93.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index 977fff9..6d7a850 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,10 +1,8 @@ -%define pre pre7 - Name: xforms Summary: XForms toolkit library Version: 1.0.93 -Release: 0.1.%{pre}%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 23 2010 Rex Dieter - 1.0.93-1 +- xforms-1.0.93 + * Tue May 18 2010 Rex Dieter - 1.0.93-0.1.pre7 - xforms-1.0.93pre7 - Requires: xorg-x11-fonts-ISO8859-1-75dpi From a9ea6bf96fb9cd66b3c26f78b0c165ed1e2b5adf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:51:03 +0000 Subject: [PATCH 05/65] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 444b49b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# 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 $$d/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) From 0ec179d9f65837149fbde5f360114ed5d6e79080 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:03:22 -0600 Subject: [PATCH 06/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 6d7a850..4b172fa 100644 --- a/xforms.spec +++ b/xforms.spec @@ -2,7 +2,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.93 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.93-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun May 23 2010 Rex Dieter - 1.0.93-1 - xforms-1.0.93 From 56ec9caba080451538a38b66540db6d6383b2000 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 Aug 2011 07:56:37 -0500 Subject: [PATCH 07/65] 1.0.94pre5 --- .gitignore | 6 ++++-- sources | 4 ++-- xforms.spec | 9 +++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 473bf56..841ba1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -xforms-1.0.93.tar.gz -xforms-1.0.93.tar.gz.sig +/xforms-1.0.93.tar.gz +/xforms-1.0.93.tar.gz.sig +/xforms-1.0.94pre5.tar.gz +/xforms-1.0.94pre5.tar.gz.sig diff --git a/sources b/sources index 532463d..bbccdaa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7d7c2b539ce4a6a5072204aa73fa9dc8 xforms-1.0.93.tar.gz -f67c16b3d767d3a521eb3cc4afd6d4e7 xforms-1.0.93.tar.gz.sig +9787c05a91d0fe7eaff8e318826ff36c xforms-1.0.94pre5.tar.gz +cd0b11c9625de1e7ff60ae5ec9977886 xforms-1.0.94pre5.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index 4b172fa..b56c361 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,8 +1,10 @@ +%define pre pre5 + Name: xforms Summary: XForms toolkit library -Version: 1.0.93 -Release: 2%{?dist} +Version: 1.0.94 +Release: 0.1.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -98,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 15 2011 Rex Dieter 1.0.94-0.1.pre5 +- 1.0.94pre5 + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.93-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 6868223ab7a0567a4e50be7e25b5a192c80a4a61 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:55:26 -0600 Subject: [PATCH 08/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index b56c361..3b072cc 100644 --- a/xforms.spec +++ b/xforms.spec @@ -4,7 +4,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.1.%{pre}%{?dist} +Release: 0.2.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.94-0.2.pre5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Aug 15 2011 Rex Dieter 1.0.94-0.1.pre5 - 1.0.94pre5 From 2b5dbeff69d2680ec57bae384a4d111e61a34596 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 15 May 2012 12:40:27 -0500 Subject: [PATCH 09/65] xforms-1.9.94pre11 --- .gitignore | 2 ++ sources | 4 ++-- xforms.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 841ba1f..f5bd310 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /xforms-1.0.93.tar.gz.sig /xforms-1.0.94pre5.tar.gz /xforms-1.0.94pre5.tar.gz.sig +/xforms-1.0.94pre11.tar.gz +/xforms-1.0.94pre11.tar.gz.sig diff --git a/sources b/sources index bbccdaa..9223df6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9787c05a91d0fe7eaff8e318826ff36c xforms-1.0.94pre5.tar.gz -cd0b11c9625de1e7ff60ae5ec9977886 xforms-1.0.94pre5.tar.gz.sig +c63746b0ed004dd0ac23a0690f6418d2 xforms-1.0.94pre11.tar.gz +153b0860deaa5c040f255d072c63b0e3 xforms-1.0.94pre11.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index 3b072cc..df9162a 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,10 +1,10 @@ -%define pre pre5 +%define pre pre11 Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.2.%{pre}%{?dist} +Release: 0.3.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 15 2012 Rex Dieter 1.0.94-0.3.pre11 +- xforms-1.9.94pre11 + * Sat Jan 14 2012 Fedora Release Engineering - 1.0.94-0.2.pre5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 0ba6dc144641f52cfe0c781474703ee95525b837 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 6 Jul 2012 10:29:13 -0500 Subject: [PATCH 10/65] xforms-1.9.94pre12 --- .gitignore | 4 ++-- sources | 4 ++-- xforms.spec | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f5bd310..23aaae3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ /xforms-1.0.93.tar.gz.sig /xforms-1.0.94pre5.tar.gz /xforms-1.0.94pre5.tar.gz.sig -/xforms-1.0.94pre11.tar.gz -/xforms-1.0.94pre11.tar.gz.sig +/xforms-1.0.94pre12.tar.gz +/xforms-1.0.94pre12.tar.gz.sig diff --git a/sources b/sources index 9223df6..dc739de 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c63746b0ed004dd0ac23a0690f6418d2 xforms-1.0.94pre11.tar.gz -153b0860deaa5c040f255d072c63b0e3 xforms-1.0.94pre11.tar.gz.sig +5e81c5b48d57bfad83c061fdabcc7f83 xforms-1.0.94pre12.tar.gz +abe3b3943419f8788d25c00f26d325a7 xforms-1.0.94pre12.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index df9162a..afc7ecf 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,10 +1,10 @@ -%define pre pre11 +%define pre pre12 Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.3.%{pre}%{?dist} +Release: 0.4.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 06 2012 Rex Dieter 1.0.94-0.4.pre12 +- xforms-1.9.94pre12 + * Tue May 15 2012 Rex Dieter 1.0.94-0.3.pre11 - xforms-1.9.94pre11 From a3851ffb3713260f39603690f5f297cbadac3a14 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:27:50 -0500 Subject: [PATCH 11/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index afc7ecf..396fbd0 100644 --- a/xforms.spec +++ b/xforms.spec @@ -4,7 +4,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.4.%{pre}%{?dist} +Release: 0.5.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.0.94-0.5.pre12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jul 06 2012 Rex Dieter 1.0.94-0.4.pre12 - xforms-1.9.94pre12 From 7b55462522547aa68a3975fc570b0ee18890312e Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 21 Dec 2012 20:41:31 +0100 Subject: [PATCH 12/65] rebuild against new libjpeg Signed-off-by: Adam Tkac --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 396fbd0..1ef1265 100644 --- a/xforms.spec +++ b/xforms.spec @@ -4,7 +4,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.5.%{pre}%{?dist} +Release: 0.6.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 21 2012 Adam Tkac - 1.0.94-0.6.pre12 +- rebuild against new libjpeg + * Sun Jul 22 2012 Fedora Release Engineering - 1.0.94-0.5.pre12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 08fe1fa4a2936b8fcd0c1bff445f313ab628e516 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 4 Jan 2013 13:30:24 -0600 Subject: [PATCH 13/65] 1.9.94pre17 --- .gitignore | 2 ++ sources | 4 ++-- xforms.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 23aaae3..ad1ee9b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /xforms-1.0.94pre5.tar.gz.sig /xforms-1.0.94pre12.tar.gz /xforms-1.0.94pre12.tar.gz.sig +/xforms-1.0.94pre17.tar.gz +/xforms-1.0.94pre17.tar.gz.sig diff --git a/sources b/sources index dc739de..dfefdb3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5e81c5b48d57bfad83c061fdabcc7f83 xforms-1.0.94pre12.tar.gz -abe3b3943419f8788d25c00f26d325a7 xforms-1.0.94pre12.tar.gz.sig +1b934e4bb561f3b84933c8d3df5281cb xforms-1.0.94pre17.tar.gz +a2aaf620e6d97552bec8e1303587242c xforms-1.0.94pre17.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index 1ef1265..3f71c1e 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,10 +1,10 @@ -%define pre pre12 +%define pre pre17 Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.6.%{pre}%{?dist} +Release: 0.7.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 04 2013 Rex Dieter 1.0.94-0.7.pre17 +- 1.9.94pre17 + * Fri Dec 21 2012 Adam Tkac - 1.0.94-0.6.pre12 - rebuild against new libjpeg From 3505211d475d754ad52148b5e8a419f030f738e9 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 21 Jan 2013 18:05:56 +0100 Subject: [PATCH 14/65] Rebuild due to "jpeg8-ABI" feature drop Signed-off-by: Adam Tkac --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 3f71c1e..77189f4 100644 --- a/xforms.spec +++ b/xforms.spec @@ -4,7 +4,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.7.%{pre}%{?dist} +Release: 0.8.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 21 2013 Adam Tkac - 1.0.94-0.8.pre17 +- rebuild due to "jpeg8-ABI" feature drop + * Fri Jan 04 2013 Rex Dieter 1.0.94-0.7.pre17 - 1.9.94pre17 From 1d61ce2d42909d16ccfed3a3e70673ae2f09b36c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:42:52 -0600 Subject: [PATCH 15/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 77189f4..fcc05aa 100644 --- a/xforms.spec +++ b/xforms.spec @@ -4,7 +4,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.8.%{pre}%{?dist} +Release: 0.9.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.0.94-0.9.pre17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Jan 21 2013 Adam Tkac - 1.0.94-0.8.pre17 - rebuild due to "jpeg8-ABI" feature drop From 6ad08ce6065af3b969ffbe845c3b01fd6c51b0ab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:13:03 -0500 Subject: [PATCH 16/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index fcc05aa..1e34906 100644 --- a/xforms.spec +++ b/xforms.spec @@ -4,7 +4,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.94 -Release: 0.9.%{pre}%{?dist} +Release: 0.10.%{pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.0.94-0.10.pre17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.0.94-0.9.pre17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From f77bb24b0bf02c7e88e76e6485e4c2c8e41bd382 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Jan 2014 19:22:04 -0600 Subject: [PATCH 17/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- .gitignore | 10 ++-------- sources | 4 ++-- xforms.spec | 8 +++----- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ad1ee9b..8420236 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ -/xforms-1.0.93.tar.gz -/xforms-1.0.93.tar.gz.sig -/xforms-1.0.94pre5.tar.gz -/xforms-1.0.94pre5.tar.gz.sig -/xforms-1.0.94pre12.tar.gz -/xforms-1.0.94pre12.tar.gz.sig -/xforms-1.0.94pre17.tar.gz -/xforms-1.0.94pre17.tar.gz.sig +/xforms-1.2.2.tar.gz +/xforms-1.2.2.tar.gz.sig diff --git a/sources b/sources index dfefdb3..c88c6a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1b934e4bb561f3b84933c8d3df5281cb xforms-1.0.94pre17.tar.gz -a2aaf620e6d97552bec8e1303587242c xforms-1.0.94pre17.tar.gz.sig +4d45cb038e5d1e4cfd8a346ad072df4b xforms-1.2.2.tar.gz +1ddacf1db4af9b831056866e7bb314e8 xforms-1.2.2.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index 1e34906..44833ae 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,10 +1,8 @@ -%define pre pre17 - Name: xforms Summary: XForms toolkit library -Version: 1.0.94 -Release: 0.10.%{pre}%{?dist} +Version: 1.2.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -84,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING.LIB Copyright ChangeLog NEWS README +%doc COPYING.LIB Copyright ChangeLog %{_libdir}/libflimage.so.2* %{_libdir}/libformsGL.so.2* %{_libdir}/libforms.so.2* From 45342ce8a5199747681c163af641963845d90db6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Jan 2014 19:25:21 -0600 Subject: [PATCH 18/65] awol changelog added --- xforms.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xforms.spec b/xforms.spec index 44833ae..f50873b 100644 --- a/xforms.spec +++ b/xforms.spec @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 14 2014 Rex Dieter 1.2.2-1 +- 1.2.2 + * Sun Aug 04 2013 Fedora Release Engineering - 1.0.94-0.10.pre17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 4b83aee8757e342ac4ea9c48fb12aa0c21122567 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Jan 2014 09:53:39 -0600 Subject: [PATCH 19/65] 1.2.3 --- .gitignore | 4 ++-- sources | 4 ++-- xforms.spec | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8420236..7e3fe41 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/xforms-1.2.2.tar.gz -/xforms-1.2.2.tar.gz.sig +/xforms-1.2.3.tar.gz +/xforms-1.2.3.tar.gz.sig diff --git a/sources b/sources index c88c6a8..0ab8975 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4d45cb038e5d1e4cfd8a346ad072df4b xforms-1.2.2.tar.gz -1ddacf1db4af9b831056866e7bb314e8 xforms-1.2.2.tar.gz.sig +235720a758a8b8d9e6e452dc67190e9b xforms-1.2.3.tar.gz +507069d04c1a830aed496277a257ae0b xforms-1.2.3.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index f50873b..8e35c8b 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,7 +1,7 @@ Name: xforms Summary: XForms toolkit library -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist} License: LGPLv2+ @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 15 2014 Rex Dieter 1.2.3-1 +- 1.2.3 + * Tue Jan 14 2014 Rex Dieter 1.2.2-1 - 1.2.2 From 2f2a50f3fbf4d8df89e3afbb1c77c81aa155e5c6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:51:27 -0500 Subject: [PATCH 20/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 8e35c8b..d5f420c 100644 --- a/xforms.spec +++ b/xforms.spec @@ -2,7 +2,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Jan 15 2014 Rex Dieter 1.2.3-1 - 1.2.3 From 28f1571e81c3aabf6149b834987275b2b617fcc7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:02:28 +0000 Subject: [PATCH 21/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index d5f420c..b3db529 100644 --- a/xforms.spec +++ b/xforms.spec @@ -2,7 +2,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 042609da078ae1e7d297c30b369b3fb13052b9f1 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 8 Apr 2015 02:15:05 +0200 Subject: [PATCH 22/65] Upgrade to 1.2.4 --- .gitignore | 4 ++-- sources | 4 ++-- xforms.spec | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7e3fe41..192c861 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/xforms-1.2.3.tar.gz -/xforms-1.2.3.tar.gz.sig +/xforms-1.2.?.tar.gz +/xforms-1.2.?.tar.gz.sig diff --git a/sources b/sources index 0ab8975..0c50c2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -235720a758a8b8d9e6e452dc67190e9b xforms-1.2.3.tar.gz -507069d04c1a830aed496277a257ae0b xforms-1.2.3.tar.gz.sig +d4414c9eb3b284aa2f603a49f376ed22 xforms-1.2.4.tar.gz +b16dfa7da68a467307295f647392d893 xforms-1.2.4.tar.gz.sig diff --git a/xforms.spec b/xforms.spec index b3db529..d8388b1 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,15 +1,12 @@ Name: xforms Summary: XForms toolkit library -Version: 1.2.3 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -#URL: http://www.nongnu.org/xforms/ URL: http://xforms-toolkit.org/ -#Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz -#Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig 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) @@ -98,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 08 2015 Robert Scheck - 1.2.4-1 +- Upgrade to 1.2.4 + * Mon Aug 18 2014 Fedora Release Engineering - 1.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From d9639521e745799b9466866378c730679e23a07d Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 8 Apr 2015 16:21:09 +0200 Subject: [PATCH 23/65] Some minor spec file tweaks --- xforms.spec | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/xforms.spec b/xforms.spec index d8388b1..3ed0c04 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,8 +1,7 @@ - Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -25,21 +24,22 @@ 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 +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 rich set of objects, such as buttons, sliders, and menus -etc. integrated into an easy and efficient object/event callback -execution model that allows fast and easy construction of -X-applications. In addition, the library is extensible and new objects -can easily be created and added to the library. +XForms is a GUI toolkit based on Xlib for X Window Systems. It features a +rich set of objects, such as buttons, sliders, browsers, and menus etc. +integrated into an easy and efficient object/event callback execution model +that allows fast and easy construction of X-applications. In addition, the +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} + %description devel %{summary}. @@ -62,7 +62,7 @@ make %{?_smp_mflags} X_PRE_LIBS="" %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install ## Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la @@ -79,7 +79,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING.LIB Copyright ChangeLog +%{!?_licensedir:%global license %%doc} +%license COPYING.LIB Copyright +%doc ChangeLog README %{_libdir}/libflimage.so.2* %{_libdir}/libformsGL.so.2* %{_libdir}/libforms.so.2* @@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 08 2015 Robert Scheck - 1.2.4-2 +- Some minor spec file tweaks + * Wed Apr 08 2015 Robert Scheck - 1.2.4-1 - Upgrade to 1.2.4 @@ -243,4 +248,3 @@ rm -rf $RPM_BUILD_ROOT * Mon Jan 20 2003 Rex Dieter 1.0-0 - 1.0-release - redhat-ize specfile - From 2e3fcec29d388508b6b6bbefc41d71fa5ddbf765 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 27 May 2015 13:05:49 -0500 Subject: [PATCH 24/65] doc subpkg --- xforms.spec | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/xforms.spec b/xforms.spec index 3ed0c04..8ab1778 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,7 +1,9 @@ +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -39,10 +41,24 @@ Summary: Development files for the XForms toolkit library Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{?x_deps} - %description devel %{summary}. +%package doc +Summary: XForms documentation +Group: Documentation +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +BuildRequires: texi2html +BuildRequires: texinfo +BuildRequires: texinfo-tex +BuildRequires: ImageMagick +%if 0%{?fedora} || 0%{?rhel} >= 6 +BuildArch: noarch +%endif +%description doc +%{summary}. + %prep %setup -q -n %{name}-%{version}%{?pre} @@ -53,6 +69,8 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build %configure \ + --disable-demos \ + --enable-docs --htmldir=%{_docdir}/%{name}/html --pdfdir=%{_docdir}/%{name} \ --disable-static \ --enable-optimization="$RPM_OPT_FLAGS" @@ -65,7 +83,8 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install ## Unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -rfv $RPM_BUILD_ROOT%{_infodir}/{dir,xforms_images} %clean @@ -73,10 +92,8 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} @@ -85,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libflimage.so.2* %{_libdir}/libformsGL.so.2* %{_libdir}/libforms.so.2* +%if "%{_pkgdocdir}" == "%{_docdir}/%{name}" +%exclude %{_pkgdocdir}/html/ +%exclude %{_pkgdocdir}/xforms.pdf +%endif %files devel %defattr(-,root,root,-) @@ -95,8 +116,25 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %{_mandir}/man5/* +%post doc +/sbin/install-info %{_infodir}/xforms.info %{_infodir}/dir ||: + +%preun +if [ $1 -eq 0 ]; then +/sbin/install-info --delete %{_infodir}/xforms.info %{_infodir}/dir ||: +fi + +%files doc +%defattr(-,root,root) +%{_infodir}/xforms.info* +%{_pkgdocdir}/html/ +%{_pkgdocdir}/xforms.pdf + %changelog +* Tue May 26 2015 Rex Dieter 1.2.4-3 +- -doc subpkg + * Wed Apr 08 2015 Robert Scheck - 1.2.4-2 - Some minor spec file tweaks From a39060ffc56b37f75e9ed0f3e97bf7d5b65c032a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 27 May 2015 13:06:53 -0500 Subject: [PATCH 25/65] trim changelog --- xforms.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xforms.spec b/xforms.spec index 8ab1778..c34f88c 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,5 +1,8 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +# 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 @@ -134,6 +137,7 @@ fi %changelog * 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 From 50a59c3374352fb1a5bc4c8607813b8f2a133d04 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 May 2015 08:48:41 -0500 Subject: [PATCH 26/65] use %_pkgdocdir consistently --- xforms.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index c34f88c..44698f1 100644 --- a/xforms.spec +++ b/xforms.spec @@ -73,7 +73,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build %configure \ --disable-demos \ - --enable-docs --htmldir=%{_docdir}/%{name}/html --pdfdir=%{_docdir}/%{name} \ + --enable-docs --htmldir=%{_pkgdocdir}/html --pdfdir=%{_pkgdocdir} \ --disable-static \ --enable-optimization="$RPM_OPT_FLAGS" From 1a98c76d8b5c4e0ad747848588eaed9cc6dd11e0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 May 2015 09:00:17 -0500 Subject: [PATCH 27/65] doc: include demos/ too --- xforms.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 44698f1..1e4ccdb 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -85,6 +85,10 @@ 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} @@ -106,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libformsGL.so.2* %{_libdir}/libforms.so.2* %if "%{_pkgdocdir}" == "%{_docdir}/%{name}" +%exclude %{_pkgdocdir}/demos/ %exclude %{_pkgdocdir}/html/ %exclude %{_pkgdocdir}/xforms.pdf %endif @@ -130,11 +135,15 @@ fi %files doc %defattr(-,root,root) %{_infodir}/xforms.info* +%{_pkgdocdir}/demos/ %{_pkgdocdir}/html/ %{_pkgdocdir}/xforms.pdf %changelog +* 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 From a5a3dcce8b935cfa9f958d8b7769ba4edba34f52 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 May 2015 09:25:08 -0500 Subject: [PATCH 28/65] tweak pkgdocdir to work on el6 too, fix %preun doc scriptlet --- xforms.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xforms.spec b/xforms.spec index 1e4ccdb..a229ace 100644 --- a/xforms.spec +++ b/xforms.spec @@ -1,4 +1,4 @@ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} # trim changelog included in binary rpms %global _changelog_trimtime %(date +%s -d "1 year ago") @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -109,11 +109,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libflimage.so.2* %{_libdir}/libformsGL.so.2* %{_libdir}/libforms.so.2* -%if "%{_pkgdocdir}" == "%{_docdir}/%{name}" %exclude %{_pkgdocdir}/demos/ %exclude %{_pkgdocdir}/html/ %exclude %{_pkgdocdir}/xforms.pdf -%endif %files devel %defattr(-,root,root,-) @@ -127,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT %post doc /sbin/install-info %{_infodir}/xforms.info %{_infodir}/dir ||: -%preun +%preun doc if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/xforms.info %{_infodir}/dir ||: fi @@ -141,6 +139,9 @@ fi %changelog +* 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 From 069761785c5de4018efb128e64ddeded5fb717d0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:01:37 +0000 Subject: [PATCH 29/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index a229ace..af82a28 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -139,6 +139,9 @@ fi %changelog +* 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 From 909dd3df1502198812bb83ee507e75626a46476b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:30:45 +0000 Subject: [PATCH 30/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index af82a28..1e1a970 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -139,6 +139,9 @@ fi %changelog +* 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 From ea440d7374fb6df4ed3ddb46d869c63aea10b406 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:52:14 +0000 Subject: [PATCH 31/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xforms.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xforms.spec b/xforms.spec index 1e1a970..733223a 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,7 +6,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -139,6 +139,9 @@ fi %changelog +* 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 From 1d8a8d8a26bfd596e13040118d5ea738b424c7bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:07:58 +0000 Subject: [PATCH 32/65] - 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 33/65] - 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 34/65] - 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 35/65] 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 36/65] 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 37/65] 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 38/65] 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 39/65] - 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 40/65] 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 41/65] 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 42/65] 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 43/65] 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 44/65] - 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 45/65] - 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 46/65] - 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 47/65] 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 48/65] - 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 49/65] 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 50/65] - 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 51/65] - 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 52/65] - 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 53/65] 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 54/65] 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 55/65] 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 56/65] 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 57/65] 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 58/65] 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 59/65] 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 60/65] 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 61/65] 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 62/65] 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 63/65] - 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 64/65] 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 65/65] 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