From fe4e2d5346853c3236d46576f5345ffcc9586afc Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Wed, 21 Feb 2024 13:26:05 +0300
Subject: [PATCH] fixup! [INF-951] adapted the spec file for 8

---
 .../57-sorkintype-merriweather-sans-fonts.xml | 12 -----
 SPECS/sorkintype-merriweather-sans-fonts.spec | 44 ++++++++-----------
 2 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 SOURCES/57-sorkintype-merriweather-sans-fonts.xml

diff --git a/SOURCES/57-sorkintype-merriweather-sans-fonts.xml b/SOURCES/57-sorkintype-merriweather-sans-fonts.xml
deleted file mode 100644
index 8461454..0000000
--- a/SOURCES/57-sorkintype-merriweather-sans-fonts.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- SPDX-License-Identifier: MIT -->
-<fontconfig>
-  <group>
-    <target>Merriweather Sans</target>
-    <like>
-      <family>sans-serif</family>
-    </like>
-  </group>
-</fontconfig>
-
diff --git a/SPECS/sorkintype-merriweather-sans-fonts.spec b/SPECS/sorkintype-merriweather-sans-fonts.spec
index e16df97..e47608b 100644
--- a/SPECS/sorkintype-merriweather-sans-fonts.spec
+++ b/SPECS/sorkintype-merriweather-sans-fonts.spec
@@ -2,15 +2,16 @@ BuildArch: noarch
 
 Name: sorkintype-merriweather-sans-fonts
 Version: 1.008
-Release: 8%{?dist}
+Release: 8.20240109gitf36d6e1%{?dist}
 URL:     https://github.com/SorkinType/Merriweather-Sans
 License: OFL
 Summary: Merriweather Sans, a low-contrast semi-condensed sans-serif font family
 
+Requires: fontpackages-filesystem
+
 Source0:  Merriweather-Sans-f36d6e1eb17fd4eead50c320fc8313f5353c9f5f.tar.gz
-Source10: 57-%{name}.xml
-Source11: 57-%{name}.conf
-Source12: org.fedoraproject.sorkintype-merriweather-sans-fonts.metainfo.xml
+Source10: 57-%{name}.conf
+Source11: org.fedoraproject.sorkintype-merriweather-sans-fonts.metainfo.xml
 
 %description
 Merriweather Sans is a low-contrast semi-condensed sans-serif font family
@@ -20,7 +21,7 @@ companion to the serif font family Merriweather.
 
 
 %prep
-%setup -n Merriweather-Sans-f36d6e1eb17fd4eead50c320fc8313f5353c9f5f
+%autosetup -n Merriweather-Sans-f36d6e1eb17fd4eead50c320fc8313f5353c9f5f
 
 
 %build
@@ -28,39 +29,30 @@ companion to the serif font family Merriweather.
 
 
 %install
-install -m 0755 -d %{buildroot}/etc/fonts/conf.d/
-ln -sf ../../../usr/share/fontconfig/conf.avail/57-%{name}.conf %{buildroot}/etc/fonts/conf.d/57-%{name}.conf
-
-install -m 0755 -d %{buildroot}/usr/share/fontconfig/conf.avail/
-install -m 0644 -t %{buildroot}/usr/share/fontconfig/conf.avail/ %{SOURCE11}
-
-install -m 0755 -d %{buildroot}/usr/share/fonts/
-install -m 0755 -d %{buildroot}/usr/share/fonts/%{name}/
-install -m 0644 -t %{buildroot}/usr/share/fonts/%{name}/ fonts/ttfs/MerriweatherSans-Black.ttf fonts/ttfs/MerriweatherSans-Bold.ttf fonts/ttfs/MerriweatherSans-BoldItalic.ttf fonts/ttfs/MerriweatherSans-Italic.ttf
-install -m 0644 -t %{buildroot}/usr/share/fonts/%{name}/ fonts/ttfs/MerriweatherSans-Light.ttf fonts/ttfs/MerriweatherSans-LightItalic.ttf fonts/ttfs/MerriweatherSans-Regular.ttf fonts/ttfs/MerriweatherSans-UltraBoldItalic.ttf
+install -m 0755 -d %{buildroot}%{_datadir}/fonts/%{name}
+install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
+install -m 0755 -d %{buildroot}%{_datadir}/fontconfig/conf.avail
+install -m 0755 -d %{buildroot}%{_datadir}/metainfo
 
-install -m 0755 -d %{buildroot}/usr/share/licenses/
-install -m 0755 -d %{buildroot}/usr/share/licenses/%{name}/
-install -m 0644 -t %{buildroot}/usr/share/licenses/%{name}/ OFL.txt
+install -m 0644 -t %{buildroot}%{_datadir}/fontconfig/conf.avail/ %{SOURCE10}
 
-install -m 0755 -d %{buildroot}/usr/share/doc/%{name}
-install -m 0644 -t %{buildroot}/usr/share/doc/%{name} AUTHORS.txt CONTRIBUTORS.txt README.md requirements.txt TRADEMARKS.txt
+ln -sr %{buildroot}%{_datadir}/fontconfig/conf.avail/* %{buildroot}%{_sysconfdir}/fonts/conf.d/
 
-install -m 0755 -d %{buildroot}/usr/share/metainfo/
-install -m 0644 -t %{buildroot}/usr/share/metainfo/ %{SOURCE12}
+cp fonts/ttfs/*.ttf fonts/variable/*.ttf %{buildroot}%{_datadir}/fonts/%{name}
+install -m 0644 -t %{buildroot}%{_datadir}/metainfo/ %{SOURCE11}
 
 
 %files
-%{_sysconfdir}/fonts/conf.d/57-%{name}.conf
+%config %{_sysconfdir}/fonts/conf.d/57-%{name}.conf
 %{_datadir}/fontconfig/conf.avail/57-%{name}.conf
 %{_datadir}/fonts/%{name}/*.ttf
-%{_datadir}/licenses/%{name}/OFL.txt
-%{_docdir}/%{name}/*
+%license OFL.txt
+%doc README.md AUTHORS.txt CONTRIBUTORS.txt TRADEMARKS.txt
 %{_datadir}/metainfo/*.xml
 
 
 %changelog
-* Wed Feb 21 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.008-8
+* Wed Feb 21 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.008-8.20240109gitf36d6e1
 - Rebuilt for MSVSphere 8.9
 
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.008-8