[rpms/metapixel] rawhide: spec cleanup, drop ix86 support

[rpms/metapixel] rawhide: spec cleanup, drop ix86 support

[Filipe Rosset]

A new commit has been pushed.

Repo   : rpms/metapixel
Branch : rawhide
Commit : ccbe69a93c89e28b6088858266144d2e6efdc18e
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-07-20T15:34:15-03:00
Stats  : +24/-23 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/metapixel/c/ccbe69a93c89e28b6088858266144d2e6efdc18e?branch=rawhide

Log:
spec cleanup, drop ix86 support

---
diff --git a/metapixel-install.patch b/metapixel-install.patch
index 3e41b07..38c875e 100644
--- a/metapixel-install.patch
+++ b/metapixel-install.patch
@@ -1,20 +1,25 @@
 diff -up ./Makefile.install ./Makefile
 --- ./Makefile.install	2006-12-10 12:59:54.000000000 -0500
 +++ ./Makefile	2015-08-31 11:58:40.446290655 -0400
-@@ -17,7 +17,7 @@ MACOS_CCOPTS = -I/sw/include
+@@ -17,8 +17,8 @@ MACOS_CCOPTS = -I/sw/include
+ 
  FORMATDEFS = -DRWIMG_JPEG -DRWIMG_PNG -DRWIMG_GIF
  
- LDOPTS = $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG)
+-LDOPTS = $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG)
 -CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Irwimg -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
++LDOPTS = $(LDFLAGS) $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG)
 +CCOPTS = $(CFLAGS) $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Irwimg -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
  CC = gcc
  #LIBFFM = -lffm
  
-@@ -53,6 +53,7 @@ librwimg :
+@@ -53,9 +53,10 @@ librwimg :
  
  install : metapixel metapixel.1
  	$(INSTALL) -d $(BINDIR)
 +	$(INSTALL) -d $(MANDIR)/man1
  	$(INSTALL) metapixel $(BINDIR)
  	$(INSTALL) metapixel-prepare $(BINDIR)
- 	$(INSTALL) metapixel.1 $(MANDIR)/man1
+-	$(INSTALL) metapixel.1 $(MANDIR)/man1
++	$(INSTALL) -m 644 metapixel.1 $(MANDIR)/man1
+ 	$(INSTALL) metapixel-imagesize $(BINDIR)
+ 	$(INSTALL) metapixel-sizesort $(BINDIR)

diff --git a/metapixel.spec b/metapixel.spec
index 7fae991..c230410 100644
--- a/metapixel.spec
+++ b/metapixel.spec
@@ -6,20 +6,19 @@ Release: %autorelease
 License: GPL-2.0-only AND LicenseRef-Callaway-LGPLv2+
 URL: http://www.complang.tuwien.ac.at/schani/metapixel/
 Source: http://www.complang.tuwien.ac.at/schani/%{name}/files/%{name}-%{version}.tar.gz
-
 Requires: perl-interpreter
-BuildRequires:  gcc
-BuildRequires: libpng-devel
-BuildRequires: libjpeg-devel
-BuildRequires: giflib-devel
-BuildRequires: make
-BuildRequires: perl-generators
-
-Patch0:	metapixel-build-fixes.patch
+Patch0: metapixel-build-fixes.patch
 Patch1: metapixel-copyright.patch
 Patch2: metapixel-install.patch
 # giflib-5.x compatibility
 Patch3: metapixel-giflib5.patch
+ExcludeArch:    %{ix86}
+BuildRequires:  gcc
+BuildRequires:  giflib-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  make
+BuildRequires:  perl-generators
 
 %description
 A program for generating photomosaics.  It can generate classical 
@@ -30,26 +29,23 @@ at arbitrary positions (i.e. not aligned to a matrix) are substituted by
 matching images.
 
 %prep
-%setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
+%autosetup -p1
 
 %build
-%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
+%set_build_flags
+%make_build
 
 %install
-make PREFIX=$RPM_BUILD_ROOT/usr install
+make install PREFIX=%{buildroot}%{_prefix}
 
 %files
-%doc NEWS README
 %license COPYING
-%{_mandir}/man1/metapixel.1*
-%{_bindir}/metapixel-prepare
+%doc NEWS README
 %{_bindir}/metapixel
 %{_bindir}/metapixel-imagesize
+%{_bindir}/metapixel-prepare
 %{_bindir}/metapixel-sizesort
+%{_mandir}/man1/metapixel.1*
 
 %changelog
 %autochangelog