!19 [sync] PR-18: Remove locale files rather than exclude them

From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng
Remove locale files rather than exclude them
2024-12-04 08:47:51 +00:00 · 2024-11-28 19:48:20 +08:00 · 2024-02-07 06:15:31 +00:00 · 2024-02-02 09:12:02 +00:00 · 2022-12-12 12:12:22 +00:00 · 2022-11-07 13:56:28 +00:00
5 changed files with 101 additions and 62 deletions
--- a/0001-Remove-sub-classing-from-OO.o-mime-types.patch
+++ b/0001-Remove-sub-classing-from-OO.o-mime-types.patch
@ -1,4 +1,4 @@
-From dc15dd50b198b0b2a135abd16151206dd9acca75 Mon Sep 17 00:00:00 2001
+From da0e63ccd86ead63e6b29828286897fb1236eb81 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess@hadess.net>
 Date: Thu, 25 Aug 2011 10:54:47 +0100
 Subject: [PATCH] Remove sub-classing from OO.o mime-types
@ -9,90 +9,90 @@ https://bugs.freedesktop.org/show_bug.cgi?id=40354
 1 file changed, 31 deletions(-)
 
 diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
-index 1c17b8d..ad464e1 100644
+index 8020b13..00e8d90 100644
 --- a/data/freedesktop.org.xml.in
 +++ b/data/freedesktop.org.xml.in
-@@ -877,7 +877,6 @@ command to generate the output files.
+@@ -941,7 +941,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.calc">
-     <comment>OpenOffice Calc spreadsheet</comment>
+     <comment>LibreOffice Calc spreadsheet</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -890,7 +889,6 @@ command to generate the output files.
+@@ -954,7 +953,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.calc.template">
-     <comment>OpenOffice Calc template</comment>
+     <comment>LibreOffice Calc template</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -903,7 +901,6 @@ command to generate the output files.
+@@ -967,7 +965,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.draw">
-     <comment>OpenOffice Draw drawing</comment>
+     <comment>LibreOffice Draw drawing</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -916,7 +913,6 @@ command to generate the output files.
+@@ -980,7 +977,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.draw.template">
-     <comment>OpenOffice Draw template</comment>
+     <comment>LibreOffice Draw template</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -929,7 +925,6 @@ command to generate the output files.
+@@ -993,7 +989,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.impress">
-     <comment>OpenOffice Impress presentation</comment>
+     <comment>LibreOffice Impress presentation</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -942,7 +937,6 @@ command to generate the output files.
+@@ -1006,7 +1001,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.impress.template">
-     <comment>OpenOffice Impress template</comment>
+     <comment>LibreOffice Impress template</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -955,7 +949,6 @@ command to generate the output files.
+@@ -1019,7 +1013,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.math">
-     <comment>OpenOffice Math formula</comment>
+     <comment>LibreOffice Math formula</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -968,7 +961,6 @@ command to generate the output files.
+@@ -1032,7 +1025,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer">
-     <comment>OpenOffice Writer document</comment>
+     <comment>LibreOffice Writer document</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -981,7 +973,6 @@ command to generate the output files.
+@@ -1045,7 +1037,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer.global">
-     <comment>OpenOffice Writer global document</comment>
+     <comment>LibreOffice Writer global document</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -994,7 +985,6 @@ command to generate the output files.
+@@ -1058,7 +1049,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer.template">
-     <comment>OpenOffice Writer template</comment>
+     <comment>LibreOffice Writer template</comment>
 -    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1009,7 +999,6 @@ command to generate the output files.
+@@ -1073,7 +1063,6 @@ command to generate the output files.
     <comment>ODT document</comment>
     <acronym>ODT</acronym>
     <expanded-acronym>OpenDocument Text</expanded-acronym>
@ -100,7 +100,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1024,7 +1013,6 @@ command to generate the output files.
+@@ -1088,7 +1077,6 @@ command to generate the output files.
     <comment>ODT document (Flat XML)</comment>
     <acronym>FODT</acronym>
     <expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
@ -108,7 +108,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-document"/>
     <glob pattern="*.fodt"/>
   </mime-type>
-@@ -1032,7 +1020,6 @@ command to generate the output files.
+@@ -1096,7 +1084,6 @@ command to generate the output files.
     <comment>ODT template</comment>
     <acronym>ODT</acronym>
     <expanded-acronym>OpenDocument Text</expanded-acronym>
@ -116,7 +116,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1047,7 +1034,6 @@ command to generate the output files.
+@@ -1111,7 +1098,6 @@ command to generate the output files.
     <comment>OTH template</comment>
     <acronym>OTH</acronym>
     <expanded-acronym>OpenDocument HTML</expanded-acronym>
@ -124,7 +124,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="text-html"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1062,7 +1048,6 @@ command to generate the output files.
+@@ -1126,7 +1112,6 @@ command to generate the output files.
     <comment>ODM document</comment>
     <acronym>ODM</acronym>
     <expanded-acronym>OpenDocument Master</expanded-acronym>
@ -132,7 +132,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1077,7 +1062,6 @@ command to generate the output files.
+@@ -1141,7 +1126,6 @@ command to generate the output files.
     <comment>ODG drawing</comment>
     <acronym>ODG</acronym>
     <expanded-acronym>OpenDocument Drawing</expanded-acronym>
@ -140,7 +140,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1092,7 +1076,6 @@ command to generate the output files.
+@@ -1156,7 +1140,6 @@ command to generate the output files.
     <comment>ODG drawing (Flat XML)</comment>
     <acronym>FODG</acronym>
     <expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
@ -148,7 +148,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="image-x-generic"/>
     <glob pattern="*.fodg"/>
   </mime-type>
-@@ -1100,7 +1083,6 @@ command to generate the output files.
+@@ -1164,7 +1147,6 @@ command to generate the output files.
     <comment>ODG template</comment>
     <acronym>ODG</acronym>
     <expanded-acronym>OpenDocument Drawing</expanded-acronym>
@ -156,7 +156,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1115,7 +1097,6 @@ command to generate the output files.
+@@ -1179,7 +1161,6 @@ command to generate the output files.
     <comment>ODP presentation</comment>
     <acronym>ODP</acronym>
     <expanded-acronym>OpenDocument Presentation</expanded-acronym>
@ -164,7 +164,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1130,7 +1111,6 @@ command to generate the output files.
+@@ -1194,7 +1175,6 @@ command to generate the output files.
     <comment>ODP presentation (Flat XML)</comment>
     <acronym>FODP</acronym>
     <expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
@ -172,7 +172,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-presentation"/>
     <glob pattern="*.fodp"/>
   </mime-type>
-@@ -1138,7 +1118,6 @@ command to generate the output files.
+@@ -1202,7 +1182,6 @@ command to generate the output files.
     <comment>ODP template</comment>
     <acronym>ODP</acronym>
     <expanded-acronym>OpenDocument Presentation</expanded-acronym>
@ -180,7 +180,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1153,7 +1132,6 @@ command to generate the output files.
+@@ -1217,7 +1196,6 @@ command to generate the output files.
     <comment>ODS spreadsheet</comment>
     <acronym>ODS</acronym>
     <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@ -188,7 +188,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1168,7 +1146,6 @@ command to generate the output files.
+@@ -1232,7 +1210,6 @@ command to generate the output files.
     <comment>ODS spreadsheet (Flat XML)</comment>
     <acronym>FODS</acronym>
     <expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
@ -196,7 +196,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-spreadsheet"/>
     <glob pattern="*.fods"/>
   </mime-type>
-@@ -1176,7 +1153,6 @@ command to generate the output files.
+@@ -1240,7 +1217,6 @@ command to generate the output files.
     <comment>ODS template</comment>
     <acronym>ODS</acronym>
     <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@ -204,7 +204,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1191,7 +1167,6 @@ command to generate the output files.
+@@ -1255,7 +1231,6 @@ command to generate the output files.
     <comment>ODC chart</comment>
     <acronym>ODC</acronym>
     <expanded-acronym>OpenDocument Chart</expanded-acronym>
@ -212,7 +212,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1206,7 +1181,6 @@ command to generate the output files.
+@@ -1270,7 +1245,6 @@ command to generate the output files.
     <comment>ODC template</comment>
     <acronym>ODC</acronym>
     <expanded-acronym>OpenDocument Chart</expanded-acronym>
@ -220,7 +220,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1221,7 +1195,6 @@ command to generate the output files.
+@@ -1285,7 +1259,6 @@ command to generate the output files.
     <comment>ODF formula</comment>
     <acronym>ODF</acronym>
     <expanded-acronym>OpenDocument Formula</expanded-acronym>
@ -228,7 +228,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1236,7 +1209,6 @@ command to generate the output files.
+@@ -1300,7 +1273,6 @@ command to generate the output files.
     <comment>ODF template</comment>
     <acronym>ODF</acronym>
     <expanded-acronym>OpenDocument Formula</expanded-acronym>
@ -236,7 +236,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1251,7 +1223,6 @@ command to generate the output files.
+@@ -1315,7 +1287,6 @@ command to generate the output files.
     <comment>ODB database</comment>
     <acronym>ODB</acronym>
     <expanded-acronym>OpenDocument Database</expanded-acronym>
@ -244,7 +244,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1267,7 +1238,6 @@ command to generate the output files.
+@@ -1331,7 +1302,6 @@ command to generate the output files.
     <comment>ODI image</comment>
     <acronym>ODI</acronym>
     <expanded-acronym>OpenDocument Image</expanded-acronym>
@ -252,7 +252,7 @@ index 1c17b8d..ad464e1 100644
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
-@@ -1280,7 +1250,6 @@ command to generate the output files.
+@@ -1344,7 +1314,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.openofficeorg.extension">
     <comment>OpenOffice.org extension</comment>
@ -261,5 +261,5 @@ index 1c17b8d..ad464e1 100644
     <glob pattern="*.oxt" />
   </mime-type>
 -- 
-2.26.2
- 
+2.41.0
+ 
--- a/0002-Fix-build-with-libxml2-2.12.0.patch
+++ b/0002-Fix-build-with-libxml2-2.12.0.patch
@ -0,0 +1,23 @@
+From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 19 Nov 2023 11:18:11 +0100
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes #219
+---
+ src/test-subclassing.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/test-subclassing.c b/src/test-subclassing.c
+index dd099e44..0758164f 100644
+--- a/src/test-subclassing.c
+++ b/src/test-subclassing.c
+@@ -1,4 +1,5 @@
+ #include <libxml/tree.h>
+#include <libxml/parser.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
+-- 
+GitLab
+
--- a/shared-mime-info-2.1.tar.xz
+++ b/shared-mime-info-2.1.tar.xz
--- a/shared-mime-info-2.4.tar.gz
+++ b/shared-mime-info-2.4.tar.gz
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@ -1,16 +1,19 @@
 Name:	    shared-mime-info	
-Version:	2.1
-Release:	1
+Version:	2.4
+Release:	2
 Summary:	Shared MIME information database
-License:	GPLv2+
+License:	GPL-2.0-or-later
 URL:		https://freedesktop.org/wiki/Software/shared-mime-info/
-
-Source0:	https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz
+Source0:	https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/shared-mime-info-%{version}.tar.gz
 Source1:    mimeapps.list

 Patch0:     0001-Remove-sub-classing-from-OO.o-mime-types.patch
+Patch1:     0002-Fix-build-with-libxml2-2.12.0.patch

-BuildRequires:	gcc libxml2-devel glib2-devel gettext intltool perl-XML-Parser meson itstool xmlto
+BuildRequires: gcc gcc-c++ gettext intltool perl-XML-Parser meson itstool xmlto
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(glib-2.0) >= 2.6.0
+BuildRequires: pkgconfig(libxml-2.0) >= 2.4

 %global __requires_exclude ^/usr/bin/pkg-config$

@ -27,14 +30,10 @@ the maintainers.
 %autosetup -n %{name}-%{version} -p1 

 %build
-#%%configure  --disable-silent-rules  --disable-update-mimedb
-#make
 %meson
 %meson_build

 %install
-#PKGSYSTEM_ENABLE_FSYNC=0 \
-#%%make_install
 %meson_install

 find $RPM_BUILD_ROOT%{_datadir}/mime -type d \
@ -45,7 +44,9 @@ find $RPM_BUILD_ROOT%{_datadir}/mime -type f -not -path "*/packages/*" \
 install -d  $RPM_BUILD_ROOT%{_datadir}/applications
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/mimeapps.list

-
+# remove bogus translation files
+# translations are already in the xml file installed
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*

 %check
 %meson_test
@ -60,20 +61,35 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 update-mime-database -n %{_datadir}/mime &> /dev/null ||:

 %files
-%defattr(-,root,root)
 %license COPYING
 %{_bindir}/update-mime-database
 %{_datadir}/applications/*.list
 %{_datadir}/mime/packages/*.org.xml
+%dir %{_datadir}/pkgconfig
 %{_datadir}/pkgconfig/shared-mime-info.pc
-%{_datadir}/gettext/*
-%exclude %{_datadir}/locale/*
+%dir %{_datadir}/gettext
+%dir %{_datadir}/gettext/its
+%{_datadir}/gettext/its/shared-mime-info.its
+%{_datadir}/gettext/its/shared-mime-info.loc

 %files help
-%doc README.md  NEWS HACKING.md data/shared-mime-info-spec.xml
-%{_mandir}/man1/*.gz
+%doc README.md NEWS HACKING.md data/shared-mime-info-spec.xml
+%{_mandir}/man1/*

 %changelog
+* Wed Aug 07 2024 Funda Wang <fundawang@yeah.net> - 2.4-2
+- Remove locale files rather than exclude them
+- fix build with libxml 2.12
+
+* Fri Feb 02 2024 zhouwenpei <zhouwenpei1@h-partners.com> - 2.4-1
+- Upgrade to 2.4
+
+* Sat Oct 29 2022 wangkerong <wangkeorng@h-partners.com> - 2.2-1
+- Upgrade to 2.2
+
+* Mon Jun 20 2022 hanhui <hanhui15@h-partners.com> - 2.1-2
+- migrate from custom itstool to builtin msgfmt for creating translated XML
+
 * Mon Feb 1 2021 jinzhimin <jinzhimin2@huawei.com> - 2.1-1
 - Upgrade to 2.1

@ -83,7 +99,7 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 - SUG:NA
 - DESC:modify source url

-* Thu Jul 31 2020 chxssg<chxssg@qq.com> - 2.0-1
+* Fri Jul 31 2020 chxssg<chxssg@qq.com> - 2.0-1
 - Update to 2.0

 * Tue Aug 27 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.10-4
Author	SHA1	Message	Date
openeuler-ci-bot	45445d0bc4	!19 [sync] PR-18: Remove locale files rather than exclude them From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng	2024-12-04 08:47:51 +00:00
Funda Wang	50cb09511f	Remove locale files rather than exclude them (cherry picked from commit 4e9ec93d8a80a23682b2b203cd93910ec9c21494)	2024-11-28 19:48:20 +08:00
openeuler-ci-bot	3face457a1	!17 update to 2.4 From: @zhouwenpei Reviewed-by: @t_feng Signed-off-by: @t_feng	2024-02-07 06:15:31 +00:00
zhouwenpei	3d3451859b	update to 2.4	2024-02-02 09:12:02 +00:00
openeuler-ci-bot	f59d0993aa	!7 【轻量级 PR】：fix bogus date in %changelog From: @zhangkea Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-12-12 12:12:22 +00:00
openeuler-ci-bot	53c0ab4521	!11 upgrade to 2.2 From: @kerongw Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-11-07 13:56:28 +00:00
wangkerong	3784d0eda2	upgrade to 2.2	2022-10-29 07:08:19 +00:00
openeuler-ci-bot	5b8fc863c6	!9 Solve compilation failure due to meson upgrade From: @shirely16 Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-06-20 09:35:22 +00:00
shirely	ee2c52c078	fix build failed	2022-06-20 14:50:58 +08:00
zhangkea	86c133bf49	fix bogus date in %changelog	2022-06-17 16:27:43 +08:00