]> git.pld-linux.org Git - packages/glib2.git/blobdiff - glib2.spec
- updated to 2.36.2
[packages/glib2.git] / glib2.spec
index 0e85b59d885c4613cb5dbe60e0b78d39c429d6a0..e2f4c00699ae57fb75d9c2c5161d328e20f8b505 100644 (file)
@@ -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,29 +18,35 @@ 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.30.0
+Version:       2.36.2
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-%{version}.tar.xz
-# Source0-md5: 68ac9516233044f27e76577d4f4e6de9
+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
 BuildRequires: automake >= 1:1.11
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
+BuildRequires: elfutils-devel
 BuildRequires: fam-devel
 BuildRequires: gettext-devel
-%{?with_apidocs:BuildRequires: gtk-doc >= 1.17}
-%{?with_apidocs:BuildRequires: gtk-doc-automake >= 1.17}
+%if %{with apidocs}
+BuildRequires: gtk-doc >= 1.17
+BuildRequires: gtk-doc-automake >= 1.17
+%endif
 BuildRequires: libffi-devel >= 3.0.0
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool >= 2:2.2
-BuildRequires: pcre-devel >= 8.11
+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
 BuildRequires: rpm-pythonprov
@@ -50,12 +56,14 @@ BuildRequires:      tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: zlib-devel
 Requires:      iconv
-Requires:      pcre >= 8.11
+Requires:      pcre >= 8.13
 Suggests:      gvfs
 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
@@ -112,7 +120,7 @@ Summary(pl.UTF-8):  Pliki nagłówkowe i dokumentacja do GLib
 Summary(pt_BR.UTF-8):  Conjunto de ferramentas e biblioteca do kit de desenho do GIMP
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      pcre-devel >= 8.11
+Requires:      pcre-devel >= 8.13
 # gio only
 %{?with_selinux:Requires:      libselinux-devel}
 Requires:      zlib-devel
@@ -172,7 +180,7 @@ Dokumentacja API GLib.
 Summary:       GDB Python pretty printers for GObject/GLib types
 Summary(pl.UTF-8):     Skrypty Pythona dla GDB do ładnego wypisywania typów GObject/GLib
 Group:         Development/Debuggers
-Requires:      python-gdb
+Requires:      gdb
 
 %description gdb
 GDB Python pretty printers for GObject/GLib types. This includes
@@ -188,7 +196,7 @@ ramek sygnagłów w zrzutach wywołań (backtrace).
 Summary:       bash-completion for gio utilities
 Summary(pl.UTF-8):     Bashowe uzupełnianie nazw dla narzędzi gio
 Group:         Applications/Shells
-Requires:      bash-completion
+Requires:      bash-completion >= 2.0
 Obsoletes:     bash-completion-gdbus
 
 %description -n bash-completion-gio
@@ -201,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
@@ -222,7 +230,6 @@ echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
        %{__enable_disable static_libs static} \
        --enable-debug=%{?debug:yes} \
        --enable-man \
-       --enable-threads \
        --with-pcre=system
 
 %{__make}
@@ -241,6 +248,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
@@ -293,10 +302,12 @@ umask 022
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_bindir}/gdbus-codegen
+%attr(755,root,root) %{_bindir}/glib-compile-resources
 %attr(755,root,root) %{_bindir}/glib-genmarshal
 %attr(755,root,root) %{_bindir}/glib-gettextize
 %attr(755,root,root) %{_bindir}/glib-mkenums
 %attr(755,root,root) %{_bindir}/gobject-query
+%attr(755,root,root) %{_bindir}/gresource
 %attr(755,root,root) %{_bindir}/gtester
 %attr(755,root,root) %{_bindir}/gtester-report
 %attr(755,root,root) %{_libdir}/libgio-2.0.so
@@ -304,21 +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
-%{_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
-%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
@@ -332,10 +341,12 @@ umask 022
 %{_aclocaldir}/gsettings.m4
 %if %{with apidocs}
 %{_mandir}/man1/gdbus-codegen.1*
+%{_mandir}/man1/glib-compile-resources.1*
 %{_mandir}/man1/glib-genmarshal.1*
 %{_mandir}/man1/glib-gettextize.1*
 %{_mandir}/man1/glib-mkenums.1*
 %{_mandir}/man1/gobject-query.1*
+%{_mandir}/man1/gresource.1*
 %{_mandir}/man1/gtester-report.1*
 %{_mandir}/man1/gtester.1*
 %endif
@@ -367,5 +378,6 @@ umask 022
 
 %files -n bash-completion-gio
 %defattr(644,root,root,755)
-%{_sysconfdir}/bash_completion.d/gdbus-bash-completion.sh
-%{_sysconfdir}/bash_completion.d/gsettings-bash-completion.sh
+%{_datadir}/bash-completion/completions/gdbus
+%{_datadir}/bash-completion/completions/gresource
+%{_datadir}/bash-completion/completions/gsettings
This page took 0.037017 seconds and 4 git commands to generate.