fix build

This commit is contained in:
Matthias Clasen 2011-02-02 16:23:21 -05:00
parent 46e427cbba
commit bef135bcef
2 changed files with 17 additions and 0 deletions

12
dconf-libtool.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up dconf-0.7.1/gsettings/Makefile.am.libtool dconf-0.7.1/gsettings/Makefile.am
--- dconf-0.7.1/gsettings/Makefile.am.libtool 2011-02-02 16:22:02.188286083 -0500
+++ dconf-0.7.1/gsettings/Makefile.am 2011-02-02 16:22:14.612130764 -0500
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/common -I$(to
giomodules_PROGRAMS = libdconfsettings.so
libdconfsettings_so_LDADD = $(gio_LIBS)
-libdconfsettings_so_LDFLAGS = -module -avoid-version -shared
+libdconfsettings_so_LDFLAGS = -shared
libdconfsettings_so_SOURCES = \
../engine/dconf-engine.c \
../common/dconf-shmdir.c \

View File

@ -10,6 +10,8 @@ License: LGPLv2+
URL: http://live.gnome.org/dconf URL: http://live.gnome.org/dconf
#VCS: git:git://git.gnome.org/dconf #VCS: git:git://git.gnome.org/dconf
Source0: http://download.gnome.org/sources/dconf/0.7/dconf-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/dconf/0.7/dconf-%{version}.tar.bz2
# upstream fix
Patch0: dconf-libtool.patch
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: dbus-devel BuildRequires: dbus-devel
@ -51,6 +53,9 @@ docnf-editor allows you to browse and modify dconf databases.
%prep %prep
%setup -q %setup -q
%patch -p1 -b .libtool
automake
%build %build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;