- back to 2.30.2 on HEAD; 2.31.0 stays on DEVEL branch

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index e28029540c0b76798d6895cce15b9fa4ebdc4181..92ccebc2141719020552f69f14bef791237c4bc9 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 %bcond_without apidocs         # disable gtk-doc
 %bcond_without static_libs     # don't build static library
 %bcond_with    selinux         # gio with SELinux support
-#
+
 %include       /usr/lib/rpm/macros.perl
 Summary:       Useful routines for 'C' programming
 Summary(cs.UTF-8):     Šikovná knihovna s funkcemi pro pomocné programy
@@ -18,36 +18,40 @@ 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.28.1
+Version:       2.30.2
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-%{version}.tar.bz2
-# Source0-md5: 9c097e61dc34eb5c6347e94f1f90be07
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-%{version}.tar.xz
+# Source0-md5: b7dd26aa83de0b59c867a0b9eb9f9462
 Patch0:                %{name}-makefile.patch
-Patch1:                %{name}-pc.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
-BuildRequires: automake >= 1:1.10
+BuildRequires: automake >= 1:1.11
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: fam-devel
 BuildRequires: gettext-devel
-%{?with_apidocs:BuildRequires: gtk-doc >= 1.15}
-%{?with_apidocs:BuildRequires: gtk-doc-automake >= 1.15}
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.17}
+%{?with_apidocs:BuildRequires: gtk-doc-automake >= 1.17}
+BuildRequires: libffi-devel >= 3.0.0
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool >= 2:2.2
 BuildRequires: pcre-devel >= 8.11
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.16
+BuildRequires: python >= 1:2.5
 BuildRequires: rpm-perlprov
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.527
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 BuildRequires: zlib-devel
 Requires:      iconv
 Requires:      pcre >= 8.11
+Suggests:      gvfs
 Provides:      glib2-libs
 Obsoletes:     glib2-libs
 # sr@Latn vs. sr@latin
@@ -111,6 +115,7 @@ Requires:   %{name} = %{epoch}:%{version}-%{release}
 Requires:      pcre-devel >= 8.11
 # gio only
 %{?with_selinux:Requires:      libselinux-devel}
+Requires:      zlib-devel
 
 %description devel
 Header files for the support library for the GIMP's X libraries, which
@@ -195,7 +200,6 @@ Bashowe uzupełnianie nazw dla narzędzi gio: gdbus i gsettings.
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %if !%{with apidocs}
 %{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
@@ -203,12 +207,6 @@ Bashowe uzupełnianie nazw dla narzędzi gio: gdbus i gsettings.
 echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
 %endif
 
-# fix broken tarball
-cp docs/reference/gio/{html/,}gvfs-overview.png
-cp docs/reference/glib/{html/,}mainloop-states.gif
-mkdir docs/reference/gobject/images
-cp docs/reference/gobject/{html,images}/glue.png
-
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
@@ -238,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT
        pkgconfigdir=%{_pkgconfigdir}
 
 > $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
+> $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.la \
        %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.a}
@@ -255,8 +254,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 umask 022
-%{_bindir}/gio-querymodules %{_libdir}/gio/modules
-exit 0
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules || :
 
 %postun        -p /sbin/ldconfig
 
@@ -283,6 +281,7 @@ exit 0
 %ghost %{_libdir}/gio/modules/giomodule.cache
 %dir %{_datadir}/glib-2.0
 %dir %{_datadir}/glib-2.0/schemas
+%ghost %{_datadir}/glib-2.0/schemas/gschemas.compiled
 %if %{with apidocs}
 %{_mandir}/man1/gdbus.1*
 %{_mandir}/man1/gio-querymodules.1*
@@ -293,6 +292,7 @@ exit 0
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
+%attr(755,root,root) %{_bindir}/gdbus-codegen
 %attr(755,root,root) %{_bindir}/glib-genmarshal
 %attr(755,root,root) %{_bindir}/glib-gettextize
 %attr(755,root,root) %{_bindir}/glib-mkenums
@@ -309,6 +309,9 @@ exit 0
 %{_libdir}/libgmodule-2.0.la
 %{_libdir}/libgobject-2.0.la
 %{_libdir}/libgthread-2.0.la
+%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
@@ -328,6 +331,7 @@ exit 0
 %{_aclocaldir}/glib-gettext.m4
 %{_aclocaldir}/gsettings.m4
 %if %{with apidocs}
+%{_mandir}/man1/gdbus-codegen.1*
 %{_mandir}/man1/glib-genmarshal.1*
 %{_mandir}/man1/glib-gettextize.1*
 %{_mandir}/man1/glib-mkenums.1*
@@ -349,6 +353,7 @@ exit 0
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
+%{_gtkdocdir}/gdbus-object-manager-example
 %{_gtkdocdir}/gio
 %{_gtkdocdir}/glib
 %{_gtkdocdir}/gobject