Accepting request 73864 from home:dimstar:branches:GNOME:Factory

move back to /usr

OBS-URL: https://build.opensuse.org/request/show/73864
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=146

glib2.spec

@@ -21,7 +21,7 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.28.8
+Version:        2.29.8
 Release:        1
 # FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
 # FIXME: find out if tapsets should really be in devel package or in main package
@@ -55,6 +55,9 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libselinux-devel
 BuildRequires:  pkg-config
+BuildRequires:  python
+# Required by dbus-codegen
+BuildRequires:  python-xml
 %if 0%{?with_systemtap}
 # systemtap-sdt-devel on openSUSE 11.3 was missing a Requires: python.
 %if %{?suse_version} <= 1130
@@ -65,6 +68,7 @@ BuildRequires:  systemtap-sdt-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libffi) 
 %if 0%{?BUILD_FROM_VCS}
 # It's important to keep those BuildRequires inside
 # BUILD_FROM_VCS to avoid build loops in Factory
@@ -124,6 +128,8 @@ Requires:       libgmodule-2_0-0 = %{version}
 Requires:       libgio-2_0-0 = %{version}
 Requires:       libgthread-2_0-0 = %{version}
 Requires:       libgobject-2_0-0 = %{version}
+# Required by gdbus-codegen
+Requires:       python-xml
 Provides:       glib2-doc = 2.19.6
 Obsoletes:      glib2-doc < 2.19.6
 Summary:        General-Purpose Utility Library -- Development Files
@@ -278,7 +284,6 @@ autoreconf -fi -I m4macros
 %if 0%{?with_systemtap}
     --enable-systemtap \
 %endif
-    --with-runtime-libdir=../../%{_lib}
 
 %{__make} %{?_smp_mflags} V=1
 %if 0%{?BUILD_FROM_VCS}
@@ -405,23 +410,23 @@ rm -rf %{buildroot}
 %files -n libglib-2_0-0
 %defattr(-, root, root)
 %doc AUTHORS COPYING README NEWS ChangeLog
-/%{_lib}/libglib*.so.*
+%{_libdir}/libglib*.so.*
 
 %files -n libgmodule-2_0-0
 %defattr(-, root, root)
-/%{_lib}/libgmodule*.so.*
+%{_libdir}/libgmodule*.so.*
 
 %files -n libgobject-2_0-0
 %defattr(-, root, root)
-/%{_lib}/libgobject*.so.*
+%{_libdir}/libgobject*.so.*
 
 %files -n libgthread-2_0-0
 %defattr(-, root, root)
-/%{_lib}/libgthread*.so.*
+%{_libdir}/libgthread*.so.*
 
 %files -n libgio-2_0-0
 %defattr(-, root, root)
-/%{_lib}/libgio*.so.*
+%{_libdir}/libgio*.so.*
 %dir %{_libdir}/gio
 %dir %{_libdir}/gio/modules
 %ghost %{_libdir}/gio/modules/giomodule.cache
@@ -440,12 +445,14 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/gdbus-codegen
 %{_bindir}/glib-genmarshal
 %{_bindir}/glib-gettextize
 %{_bindir}/glib-mkenums
 %{_bindir}/gobject-query
 %{_bindir}/gtester
 %{_bindir}/gtester-report
+%doc %{_mandir}/man?/gdbus-codegen.*
 %doc %{_mandir}/man?/glib-genmarshal.*
 %doc %{_mandir}/man?/glib-gettextize.*
 %doc %{_mandir}/man?/glib-mkenums.*
@@ -461,12 +468,13 @@ rm -rf %{buildroot}
 %{_includedir}/gio-unix-2.0
 %{_libdir}/lib*.so
 %dir %{_libdir}/glib-2.0/
+%{_libdir}/gdbus-codegen/
 %{_libdir}/glib-2.0/include/
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gtk-doc/html/gio
 %{_datadir}/gtk-doc/html/glib
 %{_datadir}/gtk-doc/html/gobject
-%{_datadir}/gdb/auto-load/%{_lib}/*-gdb.py
+%{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
 %if 0%{?with_systemtap}
 %{_datadir}/systemtap/tapset/*.stp
 %endif
@@ -477,7 +485,8 @@ rm -rf %{buildroot}
 # Own these directories to not depend on gdb
 %dir %{_datadir}/gdb
 %dir %{_datadir}/gdb/auto-load
-%dir %{_datadir}/gdb/auto-load/%{_lib}
+%dir %{_datadir}/gdb/auto-load%{_prefix}
+%dir %{_datadir}/gdb/auto-load%{_libdir}
 
 %files devel-static
 %defattr(-,root,root)