diff --git a/gnome-calculator-3.38.2.tar.xz b/gnome-calculator-3.38.2.tar.xz deleted file mode 100644 index fa555317cf57fb7cac687b80a2ffd84c3b69e224..0000000000000000000000000000000000000000 Binary files a/gnome-calculator-3.38.2.tar.xz and /dev/null differ diff --git a/gnome-calculator-42.1.tar.xz b/gnome-calculator-42.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..973cc5fb055ae6d465a0b6968f0878478cb87928 Binary files /dev/null and b/gnome-calculator-42.1.tar.xz differ diff --git a/gnome-calculator.spec b/gnome-calculator.spec index f687c414d1f1ce00cd26cae0cae5becbae5c732b..b315b38563966bda9a1113307127f8da148d81eb 100644 --- a/gnome-calculator.spec +++ b/gnome-calculator.spec @@ -1,19 +1,24 @@ -Name: gnome-calculator -Version: 3.38.2 -Release: 2 -Summary: A GNOME desktop calculator application +%global gtksourceview_version 5.3.0 +%global libadwaita_version 1.0.0 +Name: gnome-calculator +Version: 42.1 +Release: 1 +Summary: A desktop calculator License: GPLv3+ URL: https://wiki.gnome.org/Apps/Calculator -Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz BuildRequires: desktop-file-utils gettext itstool libmpc-devel libsoup-devel meson mpfr-devel -BuildRequires: pkgconfig(glib-2.0) pkgconfig(gtk+-3.0) pkgconfig(gtksourceview-4) pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(glib-2.0) pkgconfig(gtk4) pkgconfig(gtksourceview-5) >= %{gtksourceview_version} pkgconfig(libxml-2.0) BuildRequires: /usr/bin/appstream-util vala vala-devel pkgconfig(gee-0.8) +BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version} Provides: gcalctool = 6.6.2-3 Obsoletes: gcalctool < 6.6.2-3 +Requires: gtksourceview5%{?_isa} >= %{gtksourceview_version} +Requires: libadwaita%{?_isa} >= %{libadwaita_version} %description it is a powerful desktop calculator with logical, scientific @@ -22,12 +27,11 @@ achieve a high degree of accuracy. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -The gnome-calculator-devel package contains libraries and header files for -developing applications that use gnome-calculator. - +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %package help Summary: Documents for gnome-calculator @@ -40,22 +44,18 @@ Man pages for gnome-calculator. %prep %autosetup -p1 - %build %meson %meson_build - %install %meson_install -%find_lang gnome-calculator --with-gnome --all-name - +%find_lang %{name} --with-gnome --all-name %check appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.gnome.Calculator.appdata.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Calculator.desktop - %files -f gnome-calculator.lang %license COPYING %doc NEWS @@ -90,18 +90,18 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Calculator %files help %{_mandir}/man1/* - %changelog -* Thu May 19 2022 loong_C - 3.38.2-2 -- fix spec changelog date +* Mon Jun 6 2022 lin zhang - 42.1-1 +- Upgrade to 42.1 * Wed Jun 16 2021 weijin deng - 3.38.2-1 - Upgrade to 3.38.2 - Delete 0001-Fix-compiler-errors.patch which existed in version 3.38.2 - Add sub package gnome-calculator-devel -* Wed Jun 10 2020 lizhenhua - 3.30.1-3 +* Wed June 10 2020 lizhenhua - 3.30.1-3 - Add patch to fix compiler errors * Wed Nov 27 2019 huyan - 3.30.1-2 - Package Initialization + diff --git a/gnome-calculator.yaml b/gnome-calculator.yaml index d7e51e4a06f8e7de8d5a184cbbd587a83885a60c..d2b3fabd69cbe47644d31144411da725dfad7039 100644 --- a/gnome-calculator.yaml +++ b/gnome-calculator.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: gnome-calculator tag_prefix: GCALCTOOL_ -seperator: _ +separator: _