commit b5c2da0cef16dce58da038f07ef70b082b94bee1
Author: Marcin Banasiak <[email protected]>
Date: Mon Mar 25 23:21:14 2013 +0100
Update to 2.36.0
- updated -makefile.patch and removed applied upstream -am.patch
glib2-am.patch | 11 -----------
glib2-makefile.patch | 13 ++++++-------
glib2.spec | 16 ++++++----------
3 files changed, 12 insertions(+), 28 deletions(-)
---
diff --git a/glib2.spec b/glib2.spec
index 63641a3..73b9572 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -18,15 +18,14 @@ Summary(pt_BR.UTF-8): Conjunto de funções gráficas
utilitárias
Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı
Summary(zh_CN.UTF-8): 实用工具函数库
Name: glib2
-Version: 2.34.3
-Release: 2
+Version: 2.36.0
+Release: 1
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
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/glib/2.36/glib-%{version}.tar.xz
+# Source0-md5: 2047dff287473450593edecb18f79c17
Patch0: %{name}-makefile.patch
-Patch1: %{name}-am.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.11
@@ -205,7 +204,6 @@ Bashowe uzupełnianie nazw dla narzędzi gio: gdbus i
gsettings.
%prep
%setup -q -n glib-%{version}
%patch0 -p1
-%patch1 -p1
%if %{without apidocs}
%{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
@@ -313,14 +311,12 @@ umask 022
%attr(755,root,root) %{_libdir}/libgmodule-2.0.so
%attr(755,root,root) %{_libdir}/libgobject-2.0.so
%attr(755,root,root) %{_libdir}/libgthread-2.0.so
-%dir %{_libdir}/gdbus-2.0
-%dir %{_libdir}/gdbus-2.0/codegen
-%{_libdir}/gdbus-2.0/codegen/*.py*
%{_libdir}/glib-2.0
%{_includedir}/gio-unix-2.0
%{_includedir}/glib-2.0
+%dir %{_datadir}/glib-2.0/codegen
+%{_datadir}/glib-2.0/codegen/*.py*
%dir %{_datadir}/glib-2.0/gettext
-%attr(755,root,root) %{_datadir}/glib-2.0/gettext/mkinstalldirs
%{_datadir}/glib-2.0/gettext/po
%{_datadir}/glib-2.0/schemas/gschema.dtd
%{_libdir}/libgio-2.0.la
diff --git a/glib2-am.patch b/glib2-am.patch
deleted file mode 100644
index feb9e45..0000000
--- a/glib2-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-
diff --git a/glib2-makefile.patch b/glib2-makefile.patch
index 57e2fd9..ed0a583 100644
--- a/glib2-makefile.patch
+++ b/glib2-makefile.patch
@@ -1,15 +1,14 @@
-diff -aurN glib-2.7.1.orig/glib/Makefile.am glib-2.7.1/glib/Makefile.am
---- glib-2.7.1.orig/glib/Makefile.am 2005-06-26 20:04:07.000000000 +0200
-+++ glib-2.7.1/glib/Makefile.am 2005-07-02 21:51:56.707643632 +0200
-@@ -187,11 +187,6 @@
- gprintf.h
+--- glib-2.36.0/glib/Makefile.am.makefile 2013-03-25 22:56:57.103911399
+0100
++++ glib-2.36.0/glib/Makefile.am 2013-03-25 22:57:04.707203541 +0100
+@@ -326,11 +326,6 @@ CLEANFILES += glib-public-headers.txt
+ all-local: glib-public-headers.txt
- install-data-local: install-ms-lib install-def-file
+ install-data-local: install-ms-lib
- @if test -f $(glibincludedir)/glist.h ; then
\
- echo "*** Old headers found in $(glibincludedir). You should remove
the" ; \
- echo "*** contents of this directory and type 'make install' again."
; \
- false ;
\
- fi
- uninstall-local: uninstall-ms-lib uninstall-def-file
+ uninstall-local: uninstall-ms-lib uninstall-gdb
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glib2.git/commitdiff/b5c2da0cef16dce58da038f07ef70b082b94bee1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
