Accepting request 262304 from home:dsterba:branches:filesystems

- package mkinitrd scripts conditionally (bsc#893577)
- spec: minor updates

OBS-URL: https://build.opensuse.org/request/show/262304
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=180

btrfsprogs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 19 00:00:00 CET 2014 - dsterba@suse.cz
+
+- package mkinitrd scripts conditionally (bsc#893577)
+- spec: minor updates
+
 -------------------------------------------------------------------
 Fri Nov  7 00:00:00 CET 2014 - dsterba@suse.cz
 

btrfsprogs.spec

@@ -16,7 +16,6 @@
 #
 
 
-%define tar_version v3.17.1
 Name:           btrfsprogs
 Version:        3.17.1
 Release:        0
@@ -26,9 +25,12 @@ Group:          System/Filesystems
 Url:            http://btrfs.wiki.kernel.org/index.php/Main_Page
 #Git-Web:	http://git.kernel.org/cgit/linux/kernel/git/kdave/btrfs-progs.git
 #Git-Clone:	git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs
-Source:         https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-%{tar_version}.tar.gz
+Source:         https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v%{version}.tar.gz
+# support for mkinitrd
+%if 0%{?suse_version} < 1310
 Source1:        boot-btrfs.sh
 Source4:        setup-btrfs.sh
+%endif
 
 Patch10:        0010-btrfs-progs-move-group-type-and-profile-pretty-print.patch
 Patch11:        0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch
@@ -66,6 +68,9 @@ BuildRequires:  libblkid-devel
 BuildRequires:  libext2fs-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  lzo-devel
+%if 0%{?suse_version} >= 1310
+BuildRequires:  suse-module-tools
+%endif
 BuildRequires:  udev
 BuildRequires:  xmlto
 BuildRequires:  zlib-devel
@@ -94,7 +99,7 @@ This package contains the libraries and headers files for developers to
 build applications to interface with btrfs.
 
 %prep
-%setup -q -n btrfs-progs-%{tar_version}
+%setup -q -n btrfs-progs-v%{version}
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -151,9 +156,11 @@ ln -s %{_sbindir}/btrfs-debug-tree %{buildroot}/sbin
 ln -s %{_sbindir}/btrfs-show-super %{buildroot}/sbin
 ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin
 ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin
+%if 0%{?suse_version} < 1310
 install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/
 install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/
 install -m 0755 %{SOURCE4} %{buildroot}/lib/mkinitrd/scripts/
+%endif
 find %{buildroot} -type f -name "*.la" -delete -print
 # don't install .a for now
 rm -f %{buildroot}/%{_libdir}/*.a
@@ -173,6 +180,11 @@ done
 
 %postun -n libbtrfs0 -p /sbin/ldconfig
 
+%if 0%{?suse_version} >= 1310
+%posttrans
+%{?regenerate_initrd_posttrans}
+%endif
+
 %files
 %defattr(-, root, root)
 /sbin/fsck.btrfs
@@ -196,10 +208,12 @@ done
 %{_sbindir}/mkfs.btrfs
 %{_sbindir}/btrfs-debug-tree
 %{_sbindir}/btrfs-show-super
+%if 0%{?suse_version} < 1310
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/boot-btrfs.sh
 /lib/mkinitrd/scripts/setup-btrfs.sh
+%endif
 %{_bindir}/btrfs-map-logical
 %{_mandir}/man8/btrfs-image.8.gz
 %{_mandir}/man8/btrfsck.8.gz

local-version-override.patch

@@ -7,7 +7,7 @@ Index: btrfs-progs-v3.16.1/version.sh
  # Released under the GNU GPLv2
   
 -v="v3.17.1"
-+v="v3.17.1+20141107"
++v="v3.17.1+20141119"
  
  lib_major=0
  lib_minor=1