[packages/gnome-menus] - szl[_PL] locale is supported now; release 3

qboosh qboosh at pld-linux.org
Thu May 14 21:20:56 CEST 2015


commit 4084fc371cf47156a1440195df3957255f380298
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu May 14 21:22:30 2015 +0200

    - szl[_PL] locale is supported now; release 3

 gnome-menus.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gnome-menus.spec b/gnome-menus.spec
index 7d43b38..aee8607 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -1,8 +1,12 @@
+#
+# Conditional build:
+%bcond_without	static_libs	# static library
+#
 Summary:	Implementation of the draft Desktop Menu Specification
 Summary(pl.UTF-8):	Implementacja specyfikacji menu systemów biurkowych
 Name:		gnome-menus
 Version:	3.10.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/3.10/%{name}-%{version}.tar.xz
@@ -42,6 +46,7 @@ freedesktop.org: http://www.freedesktop.org/Standards/menu-spec .
 Summary:	gnome-menus library
 Summary(pl.UTF-8):	Biblioteka gnome-menus
 Group:		Libraries
+Requires:	glib2 >= 1:2.30.0
 Provides:	gnome-vfs-menu-module = 1.1-1
 Provides:	gnome-vfs2-module-menu = 1.1-1
 Obsoletes:	gnome-vfs-menu-module
@@ -93,7 +98,7 @@ Statyczna biblioteka gnome-menu.
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	--enable-static
+	%{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
@@ -106,8 +111,8 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged
 
-# not supported by glibc (as of 2.13-3)
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{gn,io,szl}
+# not supported by glibc (as of 2.21-5)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{gn,io}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -136,6 +141,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libgnome-menu-3.0.pc
 %{_includedir}/gnome-menus-3.0
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgnome-menu-3.a
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-menus.git/commitdiff/4084fc371cf47156a1440195df3957255f380298



More information about the pld-cvs-commit mailing list