commit 9e8f811c10f2e013ad3b86633a28086bd93c54ce
Author: Jakub Bogusz <[email protected]>
Date: Sat Jan 5 17:20:16 2013 +0100
- added am patch (fixes build with automake 1.13)
- rename sr@ije locale to sr@ijekavian
- release 2
glib2-am.patch | 11 +++++++++++
glib2.spec | 8 ++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/glib2.spec b/glib2.spec
index 9b93d3d..63641a3 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -19,13 +19,14 @@ Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı
Summary(zh_CN.UTF-8): 实用工具函数库
Name: glib2
Version: 2.34.3
-Release: 1
+Release: 2
Epoch: 1
License: LGPL v2+
Group: Libraries
Source0:
http://ftp.gnome.org/pub/GNOME/sources/glib/2.34/glib-%{version}.tar.xz
# Source0-md5: a4ca31e258273c3761e3de2edd607661
Patch0: %{name}-makefile.patch
+Patch1: %{name}-am.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.11
@@ -204,8 +205,9 @@ Bashowe uzupełnianie nazw dla narzędzi gio: gdbus i
gsettings.
%prep
%setup -q -n glib-%{version}
%patch0 -p1
+%patch1 -p1
-%if !%{with apidocs}
+%if %{without apidocs}
%{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
%{__sed} -e '/^docs.*Makefile$/d' -i configure.ac
echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
@@ -244,6 +246,8 @@ rm -rf $RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.la \
%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.a}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr@ije,sr@ijekavian}
+
%py_comp $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
%py_ocomp $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
%py_postclean $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
diff --git a/glib2-am.patch b/glib2-am.patch
new file mode 100644
index 0000000..feb9e45
--- /dev/null
+++ b/glib2-am.patch
@@ -0,0 +1,11 @@
+--- glib-2.34.3/configure.ac.orig 2012-11-26 18:10:04.000000000 +0100
++++ glib-2.34.3/configure.ac 2013-01-05 16:34:55.719636370 +0100
+@@ -291,7 +291,7 @@
+ AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
+ AC_LANG_RESTORE
+
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glib2.git/commitdiff/9e8f811c10f2e013ad3b86633a28086bd93c54ce
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
