From 207e54ec4b2074497db647e3c7009b75df45a2f5 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 19 Jul 2010 12:33:02 +0000 Subject: [PATCH] Accepting request 42726 from filesystems checked in (request 42726) OBS-URL: https://build.opensuse.org/request/show/42726 OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=8 --- xfsprogs-3.0.1.tar.bz2 | 3 +++ xfsprogs-3.1.2.tar.bz2 | 3 --- xfsprogs-docdir.diff | 12 +++--------- xfsprogs.changes | 6 ------ xfsprogs.spec | 7 +++++-- 5 files changed, 11 insertions(+), 20 deletions(-) create mode 100644 xfsprogs-3.0.1.tar.bz2 delete mode 100644 xfsprogs-3.1.2.tar.bz2 diff --git a/xfsprogs-3.0.1.tar.bz2 b/xfsprogs-3.0.1.tar.bz2 new file mode 100644 index 0000000..4966d70 --- /dev/null +++ b/xfsprogs-3.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae61ff068b7d2a5d00b5016893c513ce0f244978f090957744c4ccc45dc4394e +size 989828 diff --git a/xfsprogs-3.1.2.tar.bz2 b/xfsprogs-3.1.2.tar.bz2 deleted file mode 100644 index 43d1eb8..0000000 --- a/xfsprogs-3.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e522408e072cb85f920da1319b1acaa889a697533f2f985e4a59823a86ac6d81 -size 1078773 diff --git a/xfsprogs-docdir.diff b/xfsprogs-docdir.diff index 20b1059..c36ded0 100644 --- a/xfsprogs-docdir.diff +++ b/xfsprogs-docdir.diff @@ -1,17 +1,11 @@ -Index: include/builddefs.in -=================================================================== ---- include/builddefs.in.orig +--- include/builddefs.in +++ include/builddefs.in -@@ -56,11 +56,11 @@ PKG_ROOT_SBIN_DIR = @root_sbindir@ - PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@ - PKG_LIB_DIR = @libdir@@libdirsuffix@ +@@ -56,7 +56,7 @@ + PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ PKG_INC_DIR = @includedir@/xfs - DK_INC_DIR = @includedir@/disk PKG_MAN_DIR = @mandir@ -PKG_DOC_DIR = @datadir@/doc/@pkg_name@ +PKG_DOC_DIR = @datadir@/doc/packages/@pkg_name@ PKG_LOCALE_DIR = @datadir@/locale CC = @cc@ - AWK = @awk@ - SED = @sed@ diff --git a/xfsprogs.changes b/xfsprogs.changes index c78b8c6..7581ec1 100644 --- a/xfsprogs.changes +++ b/xfsprogs.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 29 20:17:31 UTC 2010 - seife@opensuse.org - -- updated to 3.1.2, see - /usr/share/doc/packages/xfsprogs/CHANGES.gz for details - ------------------------------------------------------------------- Fri Feb 19 21:26:53 CET 2010 - mmarek@suse.cz diff --git a/xfsprogs.spec b/xfsprogs.spec index 15b01a0..d9c6b8e 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -20,7 +20,7 @@ Name: xfsprogs BuildRequires: e2fsprogs-devel -Version: 3.1.2 +Version: 3.0.1 Release: 2 %if 0%{?suse_version} >= 1010 # hint for ZYPP @@ -90,7 +90,10 @@ export LIBUUID=/usr/%{_lib}/libuuid.a export CFLAGS="$RPM_OPT_FLAGS" ./configure \ --prefix=%{_prefix} \ - --libdir=/%{_libdir} \ + --exec-prefix=/ \ + --sbindir=/sbin \ + --bindir=%{_sbindir} \ + --libdir=/%{_lib} \ --libexecdir=/usr/%{_lib} \ --includedir=%{_includedir} \ --mandir=%{_mandir} \