[packages/gnome-calculator] - updated to 3.34.1 - added libgcalc* packages

qboosh qboosh at pld-linux.org
Sat Nov 16 23:04:39 CET 2019


commit 50cda593ed5e615103c8b4087d2a9838cf165589
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 16 23:04:48 2019 +0100

    - updated to 3.34.1
    - added libgcalc* packages

 gnome-calculator.spec | 102 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 19 deletions(-)
---
diff --git a/gnome-calculator.spec b/gnome-calculator.spec
index a3c24e7..1598c91 100644
--- a/gnome-calculator.spec
+++ b/gnome-calculator.spec
@@ -1,29 +1,30 @@
 Summary:	GNOME calculator
 Summary(pl.UTF-8):	Kalkulator dla GNOME
 Name:		gnome-calculator
-Version:	3.30.1
+Version:	3.34.1
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-calculator/3.30/%{name}-%{version}.tar.xz
-# Source0-md5:	333092a29e48a2f9fd216d0c4f37f925
-URL:		https://live.gnome.org/Calculator
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-calculator/3.34/%{name}-%{version}.tar.xz
+# Source0-md5:	9157b93a3f41fdad80df26c062b95c7b
+URL:		https://wiki.gnome.org/Apps/Calculator
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-tools >= 0.19.8
-BuildRequires:	glib2-devel >= 1:2.40.0
+BuildRequires:	glib2-devel >= 1:2.50
 BuildRequires:	gtk+3-devel >= 3.20.0
-BuildRequires:	gtksourceview3-devel >= 3.15.1
+BuildRequires:	gtksourceview4-devel >= 4.0.2
+BuildRequires:	libgee-devel >= 0.20.0
 BuildRequires:	libmpc-devel
 BuildRequires:	libsoup-devel >= 2.42.0
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxml2-progs
-BuildRequires:	meson
+BuildRequires:	meson >= 0.42
 BuildRequires:	mpfr-devel
-BuildRequires:	ninja
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.727
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	vala >= 2:0.24.0
 BuildRequires:	xz
@@ -31,15 +32,13 @@ BuildRequires:	yelp-tools
 Requires(post,postun):	glib2 >= 1:2.40.0
 Requires(post,postun):	gtk-update-icon-cache
 Requires:	dconf
-Requires:	glib2 >= 1:2.40.0
 Requires:	gtk+3 >= 3.20.0
-Requires:	gtksourceview3 >= 3.15.1
+Requires:	gtksourceview4 >= 4.0.2
 Requires:	hicolor-icon-theme
+Requires:	libgcalc = %{version}-%{release}
 Requires:	libsoup >= 2.42.0
 Provides:	gcalctool = 6.6.3-1
 Obsoletes:	gcalctool < 6.6.3-1
-# sr at Latn vs. sr at latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,11 +48,54 @@ functions.
 %description -l pl.UTF-8
 gnome-calculator jest prostym kalkulatorem spełniającym wiele funkcji.
 
+%package -n libgcalc
+Summary:	GNOME Calculator library
+Summary(pl.UTF-8):	Biblioteka kalkulatora GNOME
+Group:		Libraries
+Requires:	glib2 >= 1:2.50
+Requires:	libgee >= 0.20.0
+
+%description -n libgcalc
+GNOME Calculator library.
+
+%description -n libgcalc -l pl.UTF-8
+Biblioteka kalkulatora GNOME.
+
+%package -n libgcalc-devel
+Summary:	Header files for GNOME Calculator library
+Summary(pl.UTF-8):	Pliki nagłówkowe kalkulatora GNOME
+Group:		Development/Libraries
+Requires:	libgcalc = %{version}-%{release}
+Requires:	glib2-devel >= 1:2.50
+
+%description -n libgcalc-devel
+Header files for GNOME Calculator library.
+
+%description -n libgcalc-devel -l pl.UTF-8
+Pliki nagłówkowe kalkulatora GNOME.
+
+%package -n vala-libgcalc
+Summary:	Vala API for gcalc library
+Summary(pl.UTF-8):	API języka Vala do biblioteki gcalc
+Group:		Development/Libraries
+Requires:	libgcalc-devel = %{version}-%{release}
+Requires:	vala >= 2:0.24.0
+Requires:	vala-libgee >= 0.20.0
+
+%description -n vala-libgcalc
+Vala API for gcalc library.
+
+%description -n vala-libgcalc -l pl.UTF-8
+API języka Vala do biblioteki gcalc.
+
 %prep
 %setup -q
 
 %build
-%meson build
+# --default-library=both causes duplicate ninja rules for gcalc/gcalc.h
+%meson build \
+	--default-library=shared
+
 %ninja_build -C build
 
 %install
@@ -74,18 +116,40 @@ rm -rf $RPM_BUILD_ROOT
 %glib_compile_schemas
 %update_icon_cache hicolor
 
+%post	-n libgcalc -p /sbin/ldconfig
+%postun	-n libgcalc -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc NEWS
+%doc NEWS README.md
 %attr(755,root,root) %{_bindir}/gcalccmd
 %attr(755,root,root) %{_bindir}/gnome-calculator
 %attr(755,root,root) %{_libexecdir}/gnome-calculator-search-provider
-%{_desktopdir}/org.gnome.Calculator.desktop
-%{_datadir}/metainfo/org.gnome.Calculator.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.Calculator.SearchProvider.service
 %{_datadir}/glib-2.0/schemas/org.gnome.calculator.gschema.xml
 %{_datadir}/gnome-shell/search-providers/org.gnome.Calculator-search-provider.ini
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/scalable/*/*.svg
+%{_datadir}/metainfo/org.gnome.Calculator.appdata.xml
+%{_desktopdir}/org.gnome.Calculator.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Calculator.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Calculator.Devel.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Calculator-symbolic.svg
 %{_mandir}/man1/gcalccmd.1*
 %{_mandir}/man1/gnome-calculator.1*
+
+%files -n libgcalc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgcalc-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgcalc-1.so.0
+%{_libdir}/girepository-1.0/GCalc-1.typelib
+
+%files -n libgcalc-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgcalc-1.so
+%{_includedir}/gcalc-1
+%{_datadir}/gir-1.0/GCalc-1.gir
+%{_pkgconfigdir}/gcalc-1.pc
+
+%files -n vala-libgcalc
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gcalc-1.deps
+%{_datadir}/vala/vapi/gcalc-1.vapi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-calculator.git/commitdiff/50cda593ed5e615103c8b4087d2a9838cf165589



More information about the pld-cvs-commit mailing list