SPECS/motif.spec

@@ -1,8 +1,9 @@
 Summary: Run-time libraries and programs
 Name: motif
 Version: 2.3.4
-Release: 27%{?dist}
+Release: 19%{?dist}
 License: LGPLv2+
+Group: System Environment/Libraries
 Source: http://downloads.sf.net/motif/motif-%{version}-src.tgz
 Source1: xmbind
 URL: http://www.motifzone.net/
@@ -11,7 +12,6 @@ Provides: openmotif = %{version}-%{release}
 Requires: xorg-x11-xbitmaps
 Requires: xorg-x11-xinit
 
-BuildRequires: make
 BuildRequires: automake, libtool, autoconf, flex
 # flex static libs have been part of flex for RHEL <= 6 and Fedora <= 12
 %if 0%{?fedora} > 12 || 0%{?rhel} > 6
@@ -29,6 +29,9 @@ Patch43: openMotif-2.3.0-rgbtxt.patch
 Patch45: motif-2.3.4-mwmrc_dir.patch
 Patch46: motif-2.3.4-bindings.patch
 Patch47: openMotif-2.3.0-no_X11R6.patch
+# FTBFS #1448819
+Patch48: motif-2.3.4-Fix-issues-with-Werror-format-security.patch
+
 Patch49: openmotif-2.3.1-rhbz_997241.patch
 Patch50: motif-2.3.5-motifzone_1654.patch
 Patch51: motif-2.3.4-motifzone_1564-88bdce1.patch
@@ -36,9 +39,6 @@ Patch52: revert-of-motifzone_1565.patch
 Patch53: motifzone_1660.patch
 Patch54: motifzone_1612.patch
 
-# FTBFS #1448819
-Patch48: motif-2.3.4-Fix-issues-with-Werror-format-security.patch
-# rhbz#2125560
 Patch55: 0001-EditresCom-Fix-build-with-modern-systems.patch
 
 Conflicts: lesstif <= 0.92.32-6
@@ -50,6 +50,7 @@ linked against Motif and the Motif Window Manager mwm.
 
 %package devel
 Summary: Development libraries and header files
+Group: Development/Libraries
 Conflicts: lesstif-devel <= 0.92.32-6
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: libjpeg-devel%{?_isa} libpng-devel%{?_isa}
@@ -64,6 +65,7 @@ header files and also static libraries necessary to build Motif applications.
 
 %package static
 Summary: Static libraries
+Group: Development/Libraries
 Conflicts: lesstif-devel <= 0.92.32-6
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
@@ -79,6 +81,7 @@ This package contains the static Motif libraries.
 %patch46 -p1 -b .bindings
 %patch47 -p1 -b .no_X11R6
 %patch48 -p1 -b .format-security
+
 %patch49 -p1 -b .rhbz_997241
 %patch50 -p1 -b .motifzone_1654
 %patch51 -p1 -b .motifzone_1564-88bdce1
@@ -88,8 +91,12 @@ This package contains the static Motif libraries.
 %patch55 -p1 -b .long_bit
 
 %build
-./autogen.sh
-%configure --enable-static --enable-xft --enable-jpeg --enable-png
+CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
+./autogen.sh --libdir=%{_libdir} --enable-static --enable-xft --enable-jpeg \
+   --enable-png
+
+%configure --libdir=%{_libdir} --enable-static --enable-xft --enable-jpeg \
+   --enable-png
 
 make clean %{?_smp_mflags}
 make -C include
@@ -103,7 +110,11 @@ install -m 755 %{SOURCE1} %{buildroot}/etc/X11/xinit/xinitrc.d/xmbind.sh
 
 rm -f %{buildroot}%{_libdir}/*.la
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+rm -rf %{buildroot}
 
 %files
 %doc COPYING README RELEASE RELNOTES
@@ -135,43 +146,18 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/lib*.a
 
 %changelog
-* Mon Sep 26 2022 Olivier Fourdan <ofourdan@redhat.com> - 2.3.4-27
-- Fix LONG_BIT definition missing (rhbz#2125560)
+* Mon Sep 26 2022 Olivier Fourdan <ofourdan@redhat.com> - 2.3.4-19
+- Fix LONG_BIT definition missing (rhbz#2124810)
 
-* Thu May 12 2022 Mika Penttila <mpenttil@redhat.com> - 2.3.4-26
-- Added patches from rhel-7
+* Wed Sep 07 2022 Mika Penttila <mpenttil@redhat.com> - 2.3.4-18
+- Version bump
 
-* Thu Feb 03 2022 Adam Jackson <ajax@redhat.com> - 2.3.4-25
-- Fix invoking autogen/configure so the default CFLAGS actually get applied
-  Resolves: rhbz#2044881
+* Fri Apr 08 2022 Mika Penttila <mpenttil@redhat.com> - 2.3.4-17
+- Added forgotten patches and corrected release number
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.4-24
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.4-23
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Tue Sep 11 2018 Carlos Soriano <csoriano@redhat.com> - 2.3.4-16
+- Fix hardened flags, make sure to always pass LDFLAGS on the spec
+- Resolves: RHBZ#1624143
 
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild