!8 Update to 4.2.0

From: @dwl301 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125

0001-libweather-modification-summary.patch

@@ -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
-

libgweather.spec

@@ -1,16 +1,22 @@
 Name:           libgweather
-Version:        3.32.2
+Version:        4.2.0
-Release:        3
+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.32/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/libgweather/4.2/libgweather-%{version}.tar.xz
 
-Patch9000:	0001-libweather-modification-summary.patch
+BuildRequires:  gcc
-
+BuildRequires:  gettext
-BuildRequires:  gettext gtk-doc meson vala geocode-glib-devel glade-devel 
+BuildRequires:  gi-docgen
-BuildRequires:  gobject-introspection-devel gtk3-devel libsoup-devel libxml2-devel
+BuildRequires:  meson
+BuildRequires:  pkgconfig(geocode-glib-2.0)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libsoup-3.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  python3-gobject-base
+BuildRequires:  vala
 
 %description
 libgweather is the location/timezone/weather library/database used by InitialSetup,
@@ -27,7 +33,7 @@ developing applications that use %{name}.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -p1 -n libgweather-%{version}
 
 %build
 %meson -Dgtk_doc=true
@@ -36,30 +42,53 @@ developing applications that use %{name}.
 %install
 %meson_install
 
-%files
+%find_lang %{name} --all-name
-%defattr(-,root,root)
+
+%files -f %{name}.lang
+%doc CONTRIBUTING.md NEWS README.md
 %license COPYING
-%{_libdir}/libgweather-3.so.15*
+%{_libdir}/libgweather-4.so.0*
-%{_libdir}/girepository-1.0/GWeather-3.0.typelib
+%{_libdir}/girepository-1.0/GWeather-4.0.typelib
-%{_datadir}/libgweather/*
+%dir %{_libdir}/libgweather-4
-%{_datadir}/glib-2.0/schemas/*
+%{_libdir}/libgweather-4/Locations.bin
-%{_datadir}/locale/*
+%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-4.0
-%{_includedir}/libgweather-3.0
+%{_libdir}/libgweather-4.so
-%{_libdir}/libgweather-3.so
+%{_libdir}/pkgconfig/gweather4.pc
-%{_libdir}/pkgconfig/gweather-3.0.pc
+%{_datadir}/gir-1.0/GWeather-4.0.gir
-%{_datadir}/gir-1.0/GWeather-3.0.gir
+%dir %{_datadir}/vala/
-%{_datadir}/glade/catalogs/libgweather.xml
+%dir %{_datadir}/vala/vapi/
-%{_datadir}/vala/vapi/*
+%{_datadir}/vala/vapi/gweather4.deps
+%{_datadir}/vala/vapi/gweather4.vapi
 
 %files help
-%defattr(-,root,root)
+%license COPYING
-%doc NEWS HACKING README.md
+%{_docdir}/libgweather-4.0
-%{_datadir}/gtk-doc/html/libgweather/
+
 
 %changelog
+* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 4.2.0-1
+- Update to 4.2.0
+
+* 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'
+
+* Wed Jan 27 2021 hanhui <hanhui15@huawei.com> - 3.36.1-1
+- Type: enhancement
+- ID:   NA
+- SUG:  NA
+- DESC: update to 3.36.1
+
 * Mon Dec 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.32.2-3
 - Type:bugfix
 - ID:NA

libgweather.yaml

@@ -1,4 +1,4 @@
 version_control: gitlab.gnome
 src_repo: libgweather
 tag_prefix: LIBGWEATHER_
-seperator: "."
+seperator: "_"