diff --git a/0001-libweather-modification-summary.patch b/0001-libweather-modification-summary.patch new file mode 100644 index 0000000..a4a9c5e --- /dev/null +++ b/0001-libweather-modification-summary.patch @@ -0,0 +1,97 @@ +From c9de14ddd586a9e4660ae6ae0c43665ef023e0b0 Mon Sep 17 00:00:00 2001 +From: huzunhao +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 +--- + 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 @@ + + + +- <_name msgctxt="Country">Macau ++ <_name msgctxt="Country">Macao + MO + MC + +- ++ + +- Asia/Macau ++ Asia/Macao + + Taipa + VMMC + 22.166667 113.566667 + + +- +- <_name msgctxt="City in Macau">Macau ++ <_name msgctxt="City in Macao">Macao + 22.200556 113.546111 + + +- + <_name>Taipa +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 + diff --git a/libgweather-3.36.2.tar.xz b/libgweather-3.36.2.tar.xz new file mode 100644 index 0000000..1aa64d3 Binary files /dev/null and b/libgweather-3.36.2.tar.xz differ diff --git a/libgweather-4.0.0.tar.xz b/libgweather-4.0.0.tar.xz deleted file mode 100644 index fac22a6..0000000 Binary files a/libgweather-4.0.0.tar.xz and /dev/null differ diff --git a/libgweather.spec b/libgweather.spec index e88bfc1..30d7aab 100644 --- a/libgweather.spec +++ b/libgweather.spec @@ -1,16 +1,16 @@ -%global tarball_version %%(echo %{version} | tr '~' '.') - Name: libgweather -Version: 4.0.0 -Release: 1 +Version: 3.36.2 +Release: 2 Summary: A library for weather information + License: GPLv2+ URL: https://wiki.gnome.org/Projects/LibGWeather -Source0: https://download.gnome.org/sources/libgweather/4.0/libgweather-%{tarball_version}.tar.xz +Source0: https://download.gnome.org/sources/libgweather/3.36/%{name}-%{version}.tar.xz + +Patch9000: 0001-libweather-modification-summary.patch BuildRequires: gettext gtk-doc meson vala geocode-glib-devel glade-devel -BuildRequires: gobject-introspection-devel gtk4-devel libsoup-devel libxml2-devel -BuildRequires: gcc gi-docgen python3-gobject-base +BuildRequires: gobject-introspection-devel gtk3-devel libsoup-devel libxml2-devel %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 -p1 -n libgweather-%{tarball_version} +%autosetup -n %{name}-%{version} -p1 %build %meson -Dgtk_doc=true @@ -36,36 +36,33 @@ developing applications that use %{name}. %install %meson_install -%find_lang %{name} --all-name - -%files -f %{name}.lang -%doc CONTRIBUTING.md NEWS README.md +%files +%defattr(-,root,root) %license COPYING -%{_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 +%{_libdir}/libgweather-3.so.16* +%{_libdir}/girepository-1.0/GWeather-3.0.typelib +%{_datadir}/libgweather/* +%{_datadir}/glib-2.0/schemas/* +%{_datadir}/locale/* %files devel -%{_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 +%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/* %files help -%license COPYING -%{_docdir}/libgweather-4.0 +%defattr(-,root,root) +%doc NEWS HACKING README.md +%{_datadir}/gtk-doc/html/libgweather/ %changelog +* Fri Nov 04 2022 peijiankang - 3.36.2-2 +- Fallback version to 3.36.2 + * Mon Mar 28 2022 lin zhang - 4.0.0-1 - Update to 4.0.0