From 055cbc717a0d3e6f986dec20a60deedee1a326a8 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Tue, 18 May 2021 20:12:06 +0200 Subject: [PATCH] Revert "Remove %autopatch which is not needed" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d0313930ec0263ecc68e88f56052de64272a02f3. “%autopatch -p0” is actually needed, removing it had the effect that the patches are not applied anymore. There used to be “%autosetup -p0” in the “%prep” section which applied the patches but I replaced this with “%autosetup -N” which does not apply the patches and added “%autopatch -p0” after unpacking the inscript2 and m17n-db-sayura tarballs to make it possible to apply patches to the contents of these sources as well. m17n-db-1.8.0-inscript2-mni-sat.patch needs to be applied to the inscript2 tarball. --- m17n-db-1.8.0-ml-mozhi-bug-59681.patch | 4 ++-- m17n-db.spec | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/m17n-db-1.8.0-ml-mozhi-bug-59681.patch b/m17n-db-1.8.0-ml-mozhi-bug-59681.patch index 18fc28c..269b796 100644 --- a/m17n-db-1.8.0-ml-mozhi-bug-59681.patch +++ b/m17n-db-1.8.0-ml-mozhi-bug-59681.patch @@ -6,8 +6,8 @@ Date: Mon Dec 14 15:58:11 2020 +0530 diff --git a/MIM/ml-mozhi.mim b/MIM/ml-mozhi.mim index e502c7a..ce0b84f 100644 ---- a/MIM/ml-mozhi.mim -+++ b/MIM/ml-mozhi.mim +--- MIM/ml-mozhi.mim ++++ MIM/ml-mozhi.mim @@ -113,7 +113,7 @@ For the details, see the page: ("N__" "ണ്‍") ("n__" "ന്‍") diff --git a/m17n-db.spec b/m17n-db.spec index 1095d1b..d80bc46 100644 --- a/m17n-db.spec +++ b/m17n-db.spec @@ -1,7 +1,7 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib Version: 1.8.0 -Release: 13%{?dist} +Release: 14%{?dist} License: LGPLv2+ URL: http://www.nongnu.org/m17n @@ -61,6 +61,8 @@ tar xzf %{SOURCE1} ##extract m17n-db-sayura tar xzf %{SOURCE3} +%autopatch -p0 + # Following fixes https://bugzilla.redhat.com/show_bug.cgi?id=1487512 sed -i 's/ ("ld" "སྡ")/ ("ld" "ལྡ")/g' MIM/bo-ewts.mim @@ -145,6 +147,9 @@ cp -p m17n-db-sayura-1.0.0/icons/si-sayura.png %{buildroot}%{_datadir}/m17n/icon %{_datadir}/pkgconfig/m17n-db.pc %changelog +* Tue May 18 2021 Mike FABIAN - 1.8.0-14 +- Add back autopatch to apply the patches again + * Sun Apr 04 2021 Rajeesh KV - 1.8.0-13 - Malayalam Mozhi input scheme bug fix