btrfs-progs-4.3.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9865 ec354946-7b23-47d6-9f5a-488ba84defc7

b/btrfs-progs/btrfs-progs-vl.spec

@@ -1,23 +1,31 @@
 Name:           btrfs-progs
-Version:        0.19
+Version:        4.3.1
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        Userspace programs for btrfs
 Summary(ja):    btrfs ファイルシステム用ユーザスペースプログラム集
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
-Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
+Source0:        https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version}.tar.xz
-Patch0: btrfs-progs-upstream.patch
+
-Patch1: btrfs-progs-fix-labels.patch
+# Patches no longer applied, but kept for posterity
-Patch2: btrfs-progs-build-everything.patch
+# Still must reverse-engineer fixes in there and get upstream
-Patch3: btrfs-progs-valgrind.patch
+Patch0:         btrfs-progs-valgrind.patch
-Patch4: btrfs-progs-build-fixes.patch
+Patch1:         btrfs-init-dev-list.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel
+BuildRequires:  autoconf, automake
+BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel
+BuildRequires:  libacl-devel, libblkid-devel, lzo-devel
+BuildRequires:  asciidoc, xmlto
 
-%define _root_sbindir /sbin
+%define _sbindir /sbin
+%define _libdir /%{_lib}
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 %description
@@ -28,54 +36,68 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 btrfs-progs パッケージには、btrfs ファイルシステムを作成、チェック、
 変更、不整合の修正などを行うためのユーザスペースプログラムが収録されています。
 
+%package devel
+Summary:        btrfs filesystem-specific libraries and headers
+Summary(ja):    btrfs ファイルシステム固有のライブラリ・ヘッダ
+Group:          Development/Libraries
+Requires:       btrfs-progs = %{version}-%{release}
 
-%prep
+%description devel
-%setup -q
+btrfs-progs-devel contains the libraries and header files needed to
-%patch0 -p1
+develop btrfs filesystem-specific programs.
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
+You should install btrfs-progs-devel if you want to develop
+btrfs filesystem-specific programs.
 
-%build
+%description -l ja devel
-make CFLAGS="%{optflags}" %{?_smp_mflags}
+　btrfs-progs-develにはbtrfs固有のプログラムを開発するために必要な
-make CFLAGS="%{optflags}" %{?_smp_mflags} LDFLAGS="-lcom_err" convert
+ライブラリ・ヘッダファイルが収録されています。
 
+%prep
+%setup -q -n %{name}-v%{version}
 
-%install
+%build
-rm -rf %{buildroot}
+./autogen.sh
-make mandir=%{_mandir} bindir=%{_root_sbindir} install DESTDIR=%{buildroot}
+%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make %{?_smp_mflags}
 
+%install
+rm -rf $RPM_BUILD_ROOT
+make mandir=%{_mandir} bindir=%{_sbindir} libdir=%{_libdir} incdir=%{_includedir}/btrfs install DESTDIR=$RPM_BUILD_ROOT
+# Nuke the static lib
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
-%doc COPYING INSTALL
+%doc COPYING
-%{_root_sbindir}/btrfsctl
+%{_libdir}/libbtrfs.so.0*
-%{_root_sbindir}/btrfsck
+%{_sbindir}/btrfsck
-%{_root_sbindir}/mkfs.btrfs
+%{_sbindir}/fsck.btrfs
-%{_root_sbindir}/btrfs-debug-tree
+%{_sbindir}/mkfs.btrfs
-%{_root_sbindir}/btrfs-image
+%{_sbindir}/btrfs-debug-tree
-%{_root_sbindir}/btrfs-show
+%{_sbindir}/btrfs-image
-%{_root_sbindir}/btrfs-vol
+%{_sbindir}/btrfs-convert
-%{_root_sbindir}/btrfs-convert
+%{_sbindir}/btrfs-select-super
-%{_root_sbindir}/btrfstune
+%{_sbindir}/btrfstune
-%{_root_sbindir}/btrfs
+%{_sbindir}/btrfs
-%{_root_sbindir}/btrfs-map-logical
+%{_sbindir}/btrfs-map-logical
-%{_root_sbindir}/btrfs-zero-log
+%{_sbindir}/btrfs-zero-log
-%{_mandir}/man8/btrfs-image.8.gz
+%{_sbindir}/btrfs-find-root
-%{_mandir}/man8/btrfs-show.8.gz
+%{_sbindir}/btrfs-show-super
-%{_mandir}/man8/btrfsck.8.gz
+%{_mandir}/man5/*.gz
-%{_mandir}/man8/btrfsctl.8.gz
+%{_mandir}/man8/*.gz
-%{_mandir}/man8/mkfs.btrfs.8.gz
+
-%{_mandir}/man8/btrfs.8.gz
+%files devel
-
+%{_includedir}/*
+%{_libdir}/libbtrfs.so
 
 %changelog
+* Sun Dec 13 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.3.1-1
+- new upstream release.
+
 * Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.19-2
 - rebuild
 
@@ -146,7 +168,7 @@ rm -rf %{buildroot}
 * Sat Jan 10 2009 Marek Mahut <mmahut@fedoraproject.org> 0.16-1
 - Upstream release 0.16
 
-* Mon Jun 25 2008 Josef Bacik <josef@toxicpanda.com> 0.15-4
+* Wed Jun 25 2008 Josef Bacik <josef@toxicpanda.com> 0.15-4
 -use fedoras normal CFLAGS
 
 * Mon Jun 23 2008 Josef Bacik <josef@toxicpanda.com> 0.15-3