Update to 4.0.0
(cherry picked from commit 64a0a48e63c2475dcaff4c14fbce970bada15216)
This commit is contained in:
zhang__3125
openeuler-sync-bot
parent
6cfb860a0d
commit
f4ce30b1fb
@ -1,97 +0,0 @@
|
||||
From c9de14ddd586a9e4660ae6ae0c43665ef023e0b0 Mon Sep 17 00:00:00 2001
|
||||
From: huzunhao <huzunhao2@huawei.com>
|
||||
Date: Sat, 21 Dec 2019 18:09:08 +0800
|
||||
Subject: [PATCH] libweather: modify Macau to Macao
|
||||
|
||||
reason:modify Macau to Macao
|
||||
|
||||
Signed-off-by: huzunhao <huzunhao2@huawei.com>
|
||||
---
|
||||
data/Locations.xml | 14 +++++++-------
|
||||
po-locations/zh_CN.po | 12 ++++++------
|
||||
2 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/data/Locations.xml b/data/Locations.xml
|
||||
index 77f0539..0dcc3d8 100644
|
||||
--- a/data/Locations.xml
|
||||
+++ b/data/Locations.xml
|
||||
@@ -5097,31 +5097,31 @@
|
||||
</country>
|
||||
<country>
|
||||
<!-- MO - Macao, aka "Macao Special Administrative Region of
|
||||
- China". (The spellings "Macao" and "Macau" are both widely
|
||||
+ China". (The spellings "Macao" and "Macao" are both widely
|
||||
used. The "u" spelling is currently slightly more popular in
|
||||
English.)
|
||||
-->
|
||||
- <_name msgctxt="Country">Macau</_name>
|
||||
+ <_name msgctxt="Country">Macao</_name>
|
||||
<iso-code>MO</iso-code>
|
||||
<fips-code>MC</fips-code>
|
||||
<timezones>
|
||||
- <timezone id="Asia/Macau" />
|
||||
+ <timezone id="Asia/Macao" />
|
||||
</timezones>
|
||||
- <tz-hint>Asia/Macau</tz-hint>
|
||||
+ <tz-hint>Asia/Macao</tz-hint>
|
||||
<location>
|
||||
<name>Taipa</name>
|
||||
<code>VMMC</code>
|
||||
<coordinates>22.166667 113.566667</coordinates>
|
||||
</location>
|
||||
<city>
|
||||
- <!-- The capital of Macau.
|
||||
+ <!-- The capital of Macao.
|
||||
The local name in Chinese is "Aomen / 澳门".
|
||||
-->
|
||||
- <_name msgctxt="City in Macau">Macau</_name>
|
||||
+ <_name msgctxt="City in Macao">Macao</_name>
|
||||
<coordinates>22.200556 113.546111</coordinates>
|
||||
</city>
|
||||
<city>
|
||||
- <!-- A city in Macau.
|
||||
+ <!-- A city in Macao.
|
||||
The local name in Chinese is "Dangzai / 氹仔".
|
||||
-->
|
||||
<_name>Taipa</_name>
|
||||
diff --git a/po-locations/zh_CN.po b/po-locations/zh_CN.po
|
||||
index 1e43088..4ef886b 100644
|
||||
--- a/po-locations/zh_CN.po
|
||||
+++ b/po-locations/zh_CN.po
|
||||
@@ -627,12 +627,12 @@ msgid "Luxembourg"
|
||||
msgstr "卢森堡"
|
||||
|
||||
#. MO - Macao, aka "Macao Special Administrative Region of
|
||||
-#. China". (The spellings "Macao" and "Macau" are both widely
|
||||
+#. China". (The spellings "Macao" and "Macao" are both widely
|
||||
#. used. The "u" spelling is currently slightly more popular in
|
||||
#. English.)
|
||||
#.
|
||||
msgctxt "Country"
|
||||
-msgid "Macau"
|
||||
+msgid "Macao"
|
||||
msgstr "中国澳门"
|
||||
|
||||
#. MK - The Former Yugoslav Republic of Macedonia
|
||||
@@ -8959,14 +8959,14 @@ msgctxt "City in Luxembourg"
|
||||
msgid "Luxembourg"
|
||||
msgstr "卢森堡"
|
||||
|
||||
-#. The capital of Macau.
|
||||
+#. The capital of Macao.
|
||||
#. The local name in Chinese is "Aomen / 澳门".
|
||||
#.
|
||||
-msgctxt "City in Macau"
|
||||
-msgid "Macau"
|
||||
+msgctxt "City in Macao"
|
||||
+msgid "Macao"
|
||||
msgstr "澳门"
|
||||
|
||||
-#. A city in Macau.
|
||||
+#. A city in Macao.
|
||||
#. The local name in Chinese is "Dangzai / 氹仔".
|
||||
#.
|
||||
msgid "Taipa"
|
||||
--
|
||||
2.19.1
|
||||
|
||||
Binary file not shown.
BIN
libgweather-4.0.0.tar.xz
Normal file
BIN
libgweather-4.0.0.tar.xz
Normal file
Binary file not shown.
@ -1,16 +1,16 @@
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: libgweather
|
||||
Version: 3.36.2
|
||||
Version: 4.0.0
|
||||
Release: 1
|
||||
Summary: A library for weather information
|
||||
|
||||
License: GPLv2+
|
||||
URL: https://wiki.gnome.org/Projects/LibGWeather
|
||||
Source0: https://download.gnome.org/sources/libgweather/3.36/%{name}-%{version}.tar.xz
|
||||
|
||||
Patch9000: 0001-libweather-modification-summary.patch
|
||||
Source0: https://download.gnome.org/sources/libgweather/4.0/libgweather-%{tarball_version}.tar.xz
|
||||
|
||||
BuildRequires: gettext gtk-doc meson vala geocode-glib-devel glade-devel
|
||||
BuildRequires: gobject-introspection-devel gtk3-devel libsoup-devel libxml2-devel
|
||||
BuildRequires: gobject-introspection-devel gtk4-devel libsoup-devel libxml2-devel
|
||||
BuildRequires: gcc gi-docgen python3-gobject-base
|
||||
|
||||
%description
|
||||
libgweather is the location/timezone/weather library/database used by InitialSetup,
|
||||
@ -27,7 +27,7 @@ developing applications that use %{name}.
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
%autosetup -p1 -n libgweather-%{tarball_version}
|
||||
|
||||
%build
|
||||
%meson -Dgtk_doc=true
|
||||
@ -36,30 +36,39 @@ developing applications that use %{name}.
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%find_lang %{name} --all-name
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc CONTRIBUTING.md NEWS README.md
|
||||
%license COPYING
|
||||
%{_libdir}/libgweather-3.so.16*
|
||||
%{_libdir}/girepository-1.0/GWeather-3.0.typelib
|
||||
%{_datadir}/libgweather/*
|
||||
%{_datadir}/glib-2.0/schemas/*
|
||||
%{_datadir}/locale/*
|
||||
%{_libdir}/libgweather-4.so.0*
|
||||
%{_libdir}/girepository-1.0/GWeather-4.0.typelib
|
||||
%dir %{_libdir}/libgweather-4
|
||||
%{_libdir}/libgweather-4/Locations.bin
|
||||
%dir %{_datadir}/libgweather-4
|
||||
%{_datadir}/libgweather-4/Locations.xml
|
||||
%{_datadir}/libgweather-4/locations.dtd
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.GWeather4.enums.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.GWeather4.gschema.xml
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/libgweather-3.0
|
||||
%{_libdir}/libgweather-3.so
|
||||
%{_libdir}/pkgconfig/gweather-3.0.pc
|
||||
%{_datadir}/gir-1.0/GWeather-3.0.gir
|
||||
%{_datadir}/glade/catalogs/libgweather.xml
|
||||
%{_datadir}/vala/vapi/*
|
||||
%{_includedir}/libgweather-4.0
|
||||
%{_libdir}/libgweather-4.so
|
||||
%{_libdir}/pkgconfig/gweather4.pc
|
||||
%{_datadir}/gir-1.0/GWeather-4.0.gir
|
||||
%dir %{_datadir}/vala/
|
||||
%dir %{_datadir}/vala/vapi/
|
||||
%{_datadir}/vala/vapi/gweather4.deps
|
||||
%{_datadir}/vala/vapi/gweather4.vapi
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
%doc NEWS HACKING README.md
|
||||
%{_datadir}/gtk-doc/html/libgweather/
|
||||
%license COPYING
|
||||
%{_docdir}/libgweather-4.0
|
||||
|
||||
%changelog
|
||||
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 4.0.0-1
|
||||
- Update to 4.0.0
|
||||
|
||||
* Mon May 24 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.36.2-1
|
||||
- Upgrade to 3.36.2
|
||||
- Update Version, BuildRequires, stage 'install' and 'files'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user