- updated to 2.36.2

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 63641a3bda989b7eb0a32836c5dc3fca82a1e03b..e2f4c00699ae57fb75d9c2c5161d328e20f8b505 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,8 +1,8 @@
 #
 # Conditional build:
 %bcond_without apidocs         # disable gtk-doc
-%bcond_without static_libs     # don't build static library
-%bcond_with    selinux         # gio with SELinux support
+%bcond_without static_libs     # static library
+%bcond_without selinux         # SELinux support in gio
 
 %include       /usr/lib/rpm/macros.perl
 Summary:       Useful routines for 'C' programming
@@ -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.2
+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: d791774ac49eaf8ba59792427bb74af7
 Patch0:                %{name}-makefile.patch
-Patch1:                %{name}-am.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11
@@ -45,6 +44,8 @@ BuildRequires:        libtool >= 2:2.2
 BuildRequires: pcre-devel >= 8.13
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.16
+# advised
+#BuildRequires:        pkgconfig(libelf) >= 0.8.12
 BuildRequires: pkgconfig(libffi) >= 3.0.0
 BuildRequires: python >= 1:2.5
 BuildRequires: rpm-perlprov
@@ -61,6 +62,8 @@ Provides:     glib2-libs
 Obsoletes:     glib2-libs
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
+# see https://bugzilla.xfce.org/show_bug.cgi?id=9709
+Conflicts:     xfce4-session < 4.10.0-5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -205,7 +208,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 +315,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