From 82ef4e43da39ef5b188aa40b53a1596cf7547be4 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sat, 21 Mar 2015 17:54:40 +0100 Subject: [PATCH] up to 3.19 build system changed to autoconf BR: libcom_err-devel, xmlto --- btrfs-progs-man.patch | 6 +++--- btrfs-progs.spec | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/btrfs-progs-man.patch b/btrfs-progs-man.patch index 668d72b..2d58025 100644 --- a/btrfs-progs-man.patch +++ b/btrfs-progs-man.patch @@ -1,11 +1,11 @@ --- btrfs-progs-v3.16/Documentation/Makefile~ 2014-08-26 15:50:36.000000000 +0200 -+++ btrfs-progs-v3.16/Documentation/Makefile 2014-11-08 20:42:52.850482084 +0100 ++++ btrfs-progs-v3.16/Documentation/Makefile.in 2014-11-08 20:42:52.850482084 +0100 @@ -89,7 +89,7 @@ # want to keep the code generic mv $(DESTDIR)$(man5dir)/btrfs-mount.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir) -- $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz -+ $(LNS) btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8. +- $(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz ++ $(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8. uninstall: cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8) diff --git a/btrfs-progs.spec b/btrfs-progs.spec index a21d121..0aed562 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,21 +1,25 @@ Summary: Utilities belonging to the btrfs filesystem Summary(pl.UTF-8): Narzędzia należące do systemu plików btrfs Name: btrfs-progs -Version: 3.18.2 -Release: 2 +Version: 3.19 +Release: 1 License: GPL v2 Group: Applications/System Source0: https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/%{name}-v%{version}.tar.xz -# Source0-md5: 1059a9f7e444be704cfaccc0df128265 +# Source0-md5: edb76ab11d78df7a5d5981807583acc2 Patch0: %{name}-man.patch URL: http://btrfs.wiki.kernel.org/ BuildRequires: acl-devel BuildRequires: asciidoc +BuildRequires: autoconf >= 2.60 BuildRequires: e2fsprogs-devel BuildRequires: libblkid-devel +BuildRequires: libcom_err-devel BuildRequires: libuuid-devel BuildRequires: lzo-devel >= 2 +BuildRequires: pkgconfig BuildRequires: tar >= 1:1.22 +BuildRequires: xmlto BuildRequires: xz BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -64,10 +68,11 @@ Statyczna biblioteka dla systemu plików btrfs. %patch0 -p1 %build +%{__aclocal} +%{__autoconf} +%configure %{__make} \ - V=1 \ - CC="%{__cc}" \ - CFLAGS="%{rpmcppflags} %{rpmcflags} -fno-strict-aliasing" + V=1 %install rm -rf $RPM_BUILD_ROOT @@ -98,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_sbindir}/btrfs-map-logical %attr(755,root,root) %{_sbindir}/btrfs-zero-log %attr(755,root,root) %{_sbindir}/btrfs-find-root +%attr(755,root,root) %{_sbindir}/btrfs-select-super %attr(755,root,root) %{_sbindir}/btrfs-show-super %attr(755,root,root) %{_libdir}/libbtrfs.so.*.* %attr(755,root,root) %ghost %{_libdir}/libbtrfs.so.0 -- 2.44.0