diff --git a/xfsprogs.changes b/xfsprogs.changes index 8fce790..4d96cb7 100644 --- a/xfsprogs.changes +++ b/xfsprogs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 29 18:58:55 UTC 2015 - mpluskal@suse.com + +- Trigger regeneration of initrd n recent releases (bsc#960273) +- Remove conditions for unsupported releases +- Make building more verbose + ------------------------------------------------------------------- Thu Nov 26 09:32:27 UTC 2015 - jack@suse.cz diff --git a/xfsprogs.spec b/xfsprogs.spec index b33980e..d867e72 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -30,19 +30,14 @@ Patch0: xfsprogs-docdir.diff BuildRequires: libblkid-devel BuildRequires: readline-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 0 -%if 0%{?suse_version} < 1100 -BuildRequires: e2fsprogs-devel -%else BuildRequires: libuuid-devel -%endif -%else -BuildRequires: libuuid-devel -%endif %if 0%{?suse_version} >= 1010 # hint for ZYPP Supplements: filesystem(xfs) %endif +%if 0%{?suse_version} >= 1310 +BuildRequires: suse-module-tools +%endif %description A set of commands to use the XFS file system, including mkfs.xfs. @@ -82,7 +77,7 @@ export OPTIMIZER="-fPIC" export DEBUG=-DNDEBUG export LIBUUID=%{_libdir}/libuuid.a %configure --enable-readline=yes -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install export DIST_ROOT=%{buildroot} @@ -95,9 +90,22 @@ rm %{buildroot}/%{_lib}/libhandle.la mv %{buildroot}/%{_lib}/* %{buildroot}%{_libdir} %find_lang %{name} +%if 0%{?suse_version} >= 1310 +%post +%{?regenerate_initrd_post} +/sbin/ldconfig + +%postun +%{?regenerate_initrd_post} +/sbin/ldconfig + +%posttrans +%{?regenerate_initrd_posttrans} +%else %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%endif %files -f %{name}.lang %defattr(-,root,root,755)