diff --git a/glib2.spec b/glib2.spec index de88458..026cbad 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,3 @@ -%define libdir /%{_lib} - Summary: A library of handy utility functions Name: glib2 Version: 2.31.0 @@ -28,6 +26,7 @@ BuildRequires: libffi-devel # required for GIO content-type support Requires: shared-mime-info +Conflicts: filesystem < 3 %description GLib is the low-level core library that forms the basis for projects @@ -63,8 +62,7 @@ The glib2-static package includes static libraries of the GLib library. (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; %configure $CONFIGFLAGS \ --enable-systemtap \ - --enable-static \ - --with-runtime-libdir=../../%{_lib}) + --enable-static ) make %{?_smp_mflags} @@ -99,11 +97,11 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %files -f glib20.lang %doc AUTHORS COPYING NEWS README -%{libdir}/libglib-2.0.so.* -%{libdir}/libgthread-2.0.so.* -%{libdir}/libgmodule-2.0.so.* -%{libdir}/libgobject-2.0.so.* -%{libdir}/libgio-2.0.so.* +%{_libdir}/libglib-2.0.so.* +%{_libdir}/libgthread-2.0.so.* +%{_libdir}/libgmodule-2.0.so.* +%{_libdir}/libgobject-2.0.so.* +%{_libdir}/libgio-2.0.so.* %{_sysconfdir}/bash_completion.d/*.sh %dir %{_datadir}/glib-2.0 %dir %{_datadir}/glib-2.0/schemas @@ -149,8 +147,8 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %doc %{_mandir}/man1/gtester-report.1.gz %doc %{_mandir}/man1/gtester.1.gz %doc %{_mandir}/man1/gdbus-codegen.1.gz -%{_datadir}/gdb/auto-load%{libdir}/libglib-2.0.so.*-gdb.py* -%{_datadir}/gdb/auto-load%{libdir}/libgobject-2.0.so.*-gdb.py* +%{_datadir}/gdb/auto-load%{_libdir}/libglib-2.0.so.*-gdb.py* +%{_datadir}/gdb/auto-load%{_libdir}/libgobject-2.0.so.*-gdb.py* %{_datadir}/systemtap/tapset/*.stp