- updated to 2.36.2

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 4ee09568a95fbdb71314da656c9813827f4e0fa9..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 apidocs         # disable gtk-doc
+%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,13 +18,13 @@ 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.33.10
+Version:       2.36.2
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.33/glib-%{version}.tar.xz
-# Source0-md5: f817af6c6794200af23f9ef084c85219
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.36/glib-%{version}.tar.xz
+# Source0-md5: d791774ac49eaf8ba59792427bb74af7
 Patch0:                %{name}-makefile.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
@@ -44,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
@@ -60,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 +209,7 @@ Bashowe uzupełnianie nazw dla narzędzi gio: gdbus i gsettings.
 %setup -q -n glib-%{version}
 %patch0 -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,7 +248,7 @@ 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}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__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
@@ -311,16 +315,19 @@ 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
+%{_libdir}/libglib-2.0.la
+%{_libdir}/libgmodule-2.0.la
+%{_libdir}/libgobject-2.0.la
+%{_libdir}/libgthread-2.0.la
 %{_pkgconfigdir}/gio-2.0.pc
 %{_pkgconfigdir}/gio-unix-2.0.pc
 %{_pkgconfigdir}/glib-2.0.pc