[packages/galculator] - up to 2.1.4; - using GTK+3 as default over GTK+2

mrozowik mrozowik at pld-linux.org
Thu Sep 28 02:29:54 CEST 2023


commit 8e4983c22900153f8fc64251519750ea0db94beb
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Wed Sep 27 22:34:07 2023 +0000

    - up to 2.1.4;
    - using GTK+3 as default over GTK+2

 galculator.spec | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/galculator.spec b/galculator.spec
index f607675..3828374 100644
--- a/galculator.spec
+++ b/galculator.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
-%bcond_with	gtk3	# use GTK+ 3.x instead of 2.x
+%bcond_without	gtk3	# use GTK+ 3.x instead of 2.x
 
-Summary:	A GTK+ 2 based scientific calculator
-Summary(pl.UTF-8):	Kalkulator naukowy bazujący na GTK+ 2
+Summary:	A GTK+3 based scientific calculator
+Summary(pl.UTF-8):	Kalkulator naukowy bazujący na GTK+3
 Name:		galculator
-Version:	2.1.2
-Release:	2
+Version:	2.1.4
+Release:	1
 License:	GPL v2+
 Group:		Applications/Math
-Source0:	http://downloads.sourceforge.net/galculator/%{name}-%{version}.tar.bz2
-# Source0-md5:	01c97ec3e18c26c64af78dca9f700d43
+Source0:	http://galculator.mnim.org/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5:	1a115d6799dc453a29760e7bd4a56374
 Patch0:		%{name}-desktop.patch
-URL:		http://galculator.sourceforge.net/
+URL:		http://galculator.mnim.org
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	flex
@@ -24,12 +24,12 @@ Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-GTK+ 2 based scientific calculator with ordinary notation/reverse
+GTK+3 based scientific calculator with ordinary notation/reverse
 polish notation, different number bases (DEC, HEX, OCT, BIN) and
 different angle bases (DEG, RAD, GRAD).
 
 %description -l pl.UTF-8
-Kalkulator naukowy bazujący na GTK+ 2 z notacją zwykłą i odwrotną
+Kalkulator naukowy bazujący na GTK+3 z notacją zwykłą i odwrotną
 polską, różnymi systemami liczbowymi (dziesiętny, szesnastkowy,
 ósemkowy, binarny) i różnymi miarami kątowymi (stopień, radian,
 gradus).
@@ -42,6 +42,9 @@ gradus).
 %{__aclocal}
 %{__autoconf}
 %{__automake}
+# workaround for GCC10 build failure
+export CFLAGS="%(echo %{optflags}) -fcommon"
+export CXXFLAGS="$CFLAGS"
 %configure \
 	%{__enable_disable gtk3}
 %{__make}
@@ -51,9 +54,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{da_DK,da}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{kk_KZ,kk}
-
 %find_lang %{name}
 
 %clean
@@ -72,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/%{name}
+%{_datadir}/appdata/galculator.appdata.xml
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.xpm
 %{_iconsdir}/hicolor/*/apps/galculator.png
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/galculator.git/commitdiff/8e4983c22900153f8fc64251519750ea0db94beb



More information about the pld-cvs-commit mailing list