From 4bf3909faeed51920cc721321f8c3e24d233b37a0ae3932d3cbbcee76585b16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 8 Mar 2013 13:36:47 +0000 Subject: [PATCH] - Use autoreconf directly instead of makeconf.sh OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=46 --- fuse.changes | 5 +++++ fuse.spec | 3 +-- makeconf.sh | 45 --------------------------------------------- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 makeconf.sh diff --git a/fuse.changes b/fuse.changes index 7d0de19..f7618d8 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 8 13:36:12 UTC 2013 - idonmez@suse.com + +- Use autoreconf directly instead of makeconf.sh + ------------------------------------------------------------------- Mon Mar 4 15:04:08 UTC 2013 - archie@dellroad.org diff --git a/fuse.spec b/fuse.spec index 2b5a000..adf2c59 100644 --- a/fuse.spec +++ b/fuse.spec @@ -26,7 +26,6 @@ Release: 0 Source: %{name}-%{version}.tar.gz Source2: fuse.rpmlintrc Source3: baselibs.conf -Source4: makeconf.sh Patch: fuse-install-fix.diff Patch2: fuse-gnu_source.patch Patch3: fusermount-compile-as-pie.patch @@ -141,11 +140,11 @@ http://fuse.sourceforge.net/wiki %patch -p1 %patch2 -p1 %patch3 -p1 -sh %{SOURCE4} %build export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing" export MOUNT_FUSE_PATH=%{_sbindir} +autoreconf -fi %configure --with-pic \ --with-pkgconfigdir=%{_libdir}/pkgconfig \ --enable-lib \ diff --git a/makeconf.sh b/makeconf.sh deleted file mode 100644 index a266745..0000000 --- a/makeconf.sh +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh - -echo Running libtoolize... -libtoolize --automake -c -f - -CONFIG_RPATH=/usr/share/gettext/config.rpath -if ! [ -f $CONFIG_RPATH ]; then - CONFIG_RPATH=/usr/local/share/gettext/config.rpath -fi -if ! [ -f $CONFIG_RPATH ]; then - if [ -f config.rpath ]; then - CONFIG_RPATH= - else - echo "config.rpath not found!" >&2 - exit 1 - fi -fi -if ! [ -z "$CONFIG_RPATH" ]; then - cp "$CONFIG_RPATH" . -fi - -if test ! -z "`which autoreconf`"; then - echo Running autoreconf... - autoreconf -i -f -else - echo Running aclocal... - aclocal - echo Running autoheader... - autoheader - echo Running autoconf... - autoconf - echo Running automake... - automake -a -c - ( - echo Entering directory: kernel - cd kernel - echo Running autoheader... - autoheader - echo Running autoconf... - autoconf - ) -fi - -rm -f config.cache config.status -echo "To compile run './configure', and then 'make'."