From 396f955723e511208d6b92d6af140a496f958acd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 8 May 2013 23:38:05 +0200 Subject: [PATCH] - rel 2; fix build --- fuse-build.patch | 12 ++++++++++++ libfuse.spec | 15 +++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 fuse-build.patch diff --git a/fuse-build.patch b/fuse-build.patch new file mode 100644 index 0000000..83d9864 --- /dev/null +++ b/fuse-build.patch @@ -0,0 +1,12 @@ +diff -urN fuse-2.9.2.org/configure.in fuse-2.9.2/configure.in +--- fuse-2.9.2.org/configure.in 2012-10-01 17:58:00.000000000 +0200 ++++ fuse-2.9.2/configure.in 2013-05-08 23:32:36.488170649 +0200 +@@ -4,7 +4,7 @@ + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) +-AM_CONFIG_HEADER(include/config.h) ++AC_CONFIG_HEADERS(include/config.h) + + AC_PROG_LIBTOOL + AC_PROG_CC diff --git a/libfuse.spec b/libfuse.spec index edaca00..faed72b 100644 --- a/libfuse.spec +++ b/libfuse.spec @@ -1,13 +1,8 @@ -# TODO: -# - unpackaged: -# /etc/rc.d/init.d/fuse -# /etc/udev/rules.d/99-fuse.rules -# Summary: Filesystem in Userspace Summary(pl.UTF-8): System plików w przestrzeni użytkownika Name: libfuse Version: 2.9.2 -Release: 1 +Release: 2 Epoch: 0 License: GPL v2 Group: Applications/System @@ -15,6 +10,7 @@ Source0: http://downloads.sourceforge.net/fuse/fuse-%{version}.tar.gz # Source0-md5: 7d80d0dc9cc2b9199a0c53787c151205 Source1: fuse.conf Patch0: kernel-misc-fuse-Makefile.am.patch +Patch1: fuse-build.patch URL: http://fuse.sourceforge.net/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -70,6 +66,7 @@ Statyczna biblioteka libfuse. %prep %setup -q -n fuse-%{version} %patch0 -p1 +%patch1 -p1 sed -i '/FUSERMOUNT_PROG/s,fusermount,%{_bindir}/fusermount,' lib/mount.c @@ -107,6 +104,12 @@ ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libfuse.so.*.*) \ install fuse.pc $RPM_BUILD_ROOT%{_pkgconfigdir} install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} +# part of default udev rules nowdays +rm $RPM_BUILD_ROOT/etc/udev/rules.d/99-fuse.rules + +# not needed +rm $RPM_BUILD_ROOT/etc/rc.d/init.d/fuse + %clean rm -rf $RPM_BUILD_ROOT -- 2.44.0