From 8feebc4b3b808712c0a561ab6e66523bf0115cc9 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Tue, 10 Oct 2023 23:11:24 -0400
Subject: [PATCH] Clean and simplify spec and drop EL7 stuff

Use official released tarball
---
 .gitignore  |  1 +
 LibRaw.spec | 36 ++++++++++++++++--------------------
 sources     |  2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7508323..a934ee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,4 @@ LibRaw-0.9.1.tar.gz
 /0.20.2.tar.gz
 /0.21.0.tar.gz
 /0.21.1.tar.gz
+/LibRaw-0.21.1.tar.gz
diff --git a/LibRaw.spec b/LibRaw.spec
index 15599ce..71940e2 100644
--- a/LibRaw.spec
+++ b/LibRaw.spec
@@ -1,15 +1,14 @@
-
-# feature macro to enable samples (or not)
-%if 0%{?rhel} != 7
-%global samples 1
-%endif
+%global somajor 23
 
 Summary: Library for reading RAW files obtained from digital photo cameras
 Name: LibRaw
 Version: 0.21.1
-Release: 5%{?dist}
-License: BSD-3-Clause and (CDDL-1.0 or  LGPL-2.1-only)
-URL: http://www.libraw.org
+Release: 6%{?dist}
+License: BSD-3-Clause and (CDDL-1.0 or LGPL-2.1-only)
+URL: https://www.libraw.org
+Source0: %{url}/data/%{name}-%{version}.tar.gz
+Patch0: LibRaw-pkgconfig.patch
+Patch1: 9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch
 
 BuildRequires: gcc-c++
 BuildRequires: pkgconfig(lcms2)
@@ -18,9 +17,6 @@ BuildRequires: pkgconfig(libjpeg)
 BuildRequires: autoconf automake libtool
 BuildRequires: make
 
-Source0: http://github.com/LibRaw/LibRaw/archive/%{version}.tar.gz
-Patch0: LibRaw-pkgconfig.patch
-Patch1: 9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch
 Provides: bundled(dcraw) = 9.25
 
 %description
@@ -32,7 +28,7 @@ drawbacks have already been eliminated and part will be fixed in future.
 
 %package devel
 Summary: LibRaw development libraries
-Requires:   %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 LibRaw development libraries.
@@ -49,7 +45,7 @@ LibRaw static development libraries.
 
 %package samples
 Summary: LibRaw sample programs
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description samples
 LibRaw sample programs
@@ -60,7 +56,7 @@ LibRaw sample programs
 %build
 autoreconf -if
 %configure \
-    --enable-examples=%{?samples:yes}%{!?samples:no} \
+    --enable-examples=yes \
     --enable-jasper \
     --enable-jpeg \
     --enable-lcms \
@@ -86,13 +82,11 @@ rm -fv samples/*.o
 
 rm -fv %{buildroot}%{_libdir}/lib*.la
 
-%ldconfig_scriptlets
-
 %files
 %doc Changelog.txt
 %license LICENSE.CDDL LICENSE.LGPL COPYRIGHT
-%{_libdir}/libraw.so.23*
-%{_libdir}/libraw_r.so.23*
+%{_libdir}/libraw.so.%{somajor}{,.*}
+%{_libdir}/libraw_r.so.%{somajor}{,.*}
 
 %files static
 %{_libdir}/libraw.a
@@ -108,13 +102,15 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
 %{_libdir}/pkgconfig/libraw_r.pc
 %exclude %{_docdir}/libraw/*
 
-%if 0%{?samples}
 %files samples
 %{_bindir}/*
-%endif
 
 
 %changelog
+* Tue Oct 10 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.21.1-6
+- Clean and simplify spec and drop EL7 stuff
+- Use official released tarball
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 3a19d29..6806b0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (0.21.1.tar.gz) = 6cea6d859961d713382a9017107c730c7a8777be85d454bd05f1417a69fda902aa9591151eac5f4bd231ce2a86fc39da56e3a024104101f24d6069197fcabbc7
+SHA512 (LibRaw-0.21.1.tar.gz) = 8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d