[gamin] try to fix the build
Matthias Clasen
mclasen at fedoraproject.org
Thu Jul 21 00:59:31 UTC 2011
commit 9dbf7b41b4047a237af210f2306fb21d72897bce
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Jul 20 20:58:40 2011 -0400
try to fix the build
gamin-manape.patch | 12 ++++++++++++
gamin.spec | 5 ++++-
2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/gamin-manape.patch b/gamin-manape.patch
new file mode 100644
index 0000000..9fc82b4
--- /dev/null
+++ b/gamin-manape.patch
@@ -0,0 +1,12 @@
+diff -up gamin-0.1.10/server/Makefile.in.manape gamin-0.1.10/server/Makefile.in
+--- gamin-0.1.10/server/Makefile.in.manape 2011-07-20 20:56:58.591544554 -0400
++++ gamin-0.1.10/server/Makefile.in 2011-07-20 20:57:12.058376195 -0400
+@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
+ INCLUDES = $(default_includes) -I$(top_builddir) \
+ -I$(top_builddir)/libgamin -I$(top_builddir)/protocol \
+ -I$(top_srcdir)/lib -I$(top_srcdir)/libgamin $(DAEMON_CFLAGS) \
+- -DBINDIR=\""$(libexecdir)"\" -DG_DISABLE_DEPRECATED \
++ -DBINDIR=\""$(libexecdir)"\" \
+ $(am__append_1)
+ gam_server_SOURCES = gam_subscription.c gam_subscription.h \
+ gam_listener.c gam_listener.h gam_server.c gam_server.h \
diff --git a/gamin.spec b/gamin.spec
index e59e3b3..aa76df4 100644
--- a/gamin.spec
+++ b/gamin.spec
@@ -9,7 +9,6 @@ License: LGPLv2
#License: GPLv2
Group: Development/Libraries
Source: http://ftp.gnome.org/pub/GNOME/sources/gamin/0.1/gamin-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.gnome.org/~veillard/gamin/
Obsoletes: fam < 2.6.10-12
Provides: fam = 2.6.10-12
@@ -23,6 +22,9 @@ BuildRequires: automake, libtool
# Patch by Kedar Sovani <kedars at marvell.com>
Patch1: gamin-0.1.10-gnueabi.patch
+# Don't try to build with -DG_DISABLE_DEPRECATED - glib has moved on
+Patch2: gamin-manape.patch
+
%description
This C library provides an API and ABI compatible file alteration
@@ -54,6 +56,7 @@ of the gamin package.
%prep
%setup -q
%patch1 -p1 -b .gnueabi
+%patch2 -p1 -b .manape
# recode docs into UTF-8
for i in ChangeLog NEWS ; do
More information about the scm-commits
mailing list