Notification time stamped 2020-12-31 22:27:20 UTC
From 747a3f83e9ee2f2a386d684ea12fab5544e84746 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert(a)fedoraproject.org>
Date: Dec 31 2020 22:27:01 +0000
Subject: Spec file cleanup
---
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-%{vers...
-Source1:
http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{vers...
-Patch0: xforms-1.2.4-gcc10.patch
-
-BuildRequires: gcc
+Source0:
https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{ver...
+Source1:
https://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{ver...
+Source2: gpgkey-B5049F22184B56AF7C3AFBDBEB9474E50D5C15EB.gpg
+Patch0: xforms-1.2.4-gcc10.patch
+
+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....
-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*
https://src.fedoraproject.org/rpms/xforms/c/747a3f83e9ee2f2a386d684ea12fa...