From c86e948eceeea1d9996e3b64616b2a71dab9e21c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 May 2007 19:18:36 +0000 Subject: [PATCH] fix destdir support --- gtk+-2.11.0-destdir.patch | 20 ++++++++++++++++++++ gtk2.spec | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 gtk+-2.11.0-destdir.patch diff --git a/gtk+-2.11.0-destdir.patch b/gtk+-2.11.0-destdir.patch new file mode 100644 index 0000000..1676914 --- /dev/null +++ b/gtk+-2.11.0-destdir.patch @@ -0,0 +1,20 @@ +--- gtk+-2.11.0/modules/input/Makefile.am.destdir 2007-05-24 15:11:49.000000000 -0400 ++++ gtk+-2.11.0/modules/input/Makefile.am 2007-05-24 15:12:17.000000000 -0400 +@@ -91,7 +91,7 @@ if USE_WIN32 + IM_IME_MODULE=im-ime.la + endif + +-multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(DESTDIR)$(sysconfdir)/gtk-2.0"\" ++multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" + im_multipress_la_CPPFLAGS = $(multipress_defs) + im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_multipress_la_SOURCES = \ +@@ -100,7 +100,7 @@ im_multipress_la_SOURCES = \ + immultipress.c + im_multipress_la_LIBADD = $(LDADDS) + +-imconffiledir = $(DESTDIR)$(sysconfdir)/gtk-2.0 ++imconffiledir = $(sysconfdir)/gtk-2.0 + dist_imconffile_DATA = im-multipress.conf + + if CROSS_COMPILING diff --git a/gtk2.spec b/gtk2.spec index 26bfe4a..9b21c0e 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -30,6 +30,8 @@ Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch # use fam for recent-files #Patch2: gtk+-2.10.3-fam.patch Patch3: gtk+-2.10.11-user-dirs.patch +# destdir support is broken in input +Patch4: gtk+-2.11.0-destdir.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -113,6 +115,7 @@ docs for the GTK+ widget toolkit. %patch1 -p1 -b .set-invisible-char-to-bullet #%patch2 -p1 -b .fam %patch3 -p1 -b .user-dirs +%patch4 -p1 -b .destdir for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .