pool/xfsprogs
4
0
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 599764 from filesystems

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/599764
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsprogs?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2018-04-26 11:34:40 +00:00 committed by Git OBS Bridge
commit 73f85e5df4
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xfsprogs.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Apr 19 20:46:25 UTC 2018 - lurodriguez@suse.com
- Fix SLE15 build (bsc#1090290) due to systemd. Systemd is present since
OpenSUSE Leap 42.1 and SLE12-SP1, so we need to ensure the build
has systemd available on these release. We also then need to indicate
the new files installed when on systemd. So this fixes the build issue
on SLE15 and also makes available the systemd service unit files now
on all releases which support systemd.
-------------------------------------------------------------------
Tue Apr 17 21:02:42 UTC 2018 - olaf@aepfle.de
- xfsprogs-devel needs uuid/uuid.h, Require pkgconfig(uuid) (bsc#1089947)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 7 19:51:21 UTC 2018 - lurodriguez@suse.com Wed Mar 7 19:51:21 UTC 2018 - lurodriguez@suse.com

19
xfsprogs.spec
View File

@ -48,7 +48,11 @@ BuildRequires: suse-module-tools
%endif %endif
BuildRequires: xz BuildRequires: xz
Requires(post): coreutils Requires(post): coreutils
# Starting with OpenSUSE Leap 42.1 and SLE12-SP1 we get systemd
%if 0%{?sle_version} >= 120100
BuildRequires: pkgconfig
BuildRequires: pkgconfig(systemd)
%endif
%description %description
A set of commands to use the XFS file system, including mkfs.xfs. A set of commands to use the XFS file system, including mkfs.xfs.
@ -67,6 +71,7 @@ IRIX version of XFS.
Summary: XFS Filesystem-specific Static Libraries and Headers Summary: XFS Filesystem-specific Static Libraries and Headers
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: xfsprogs = %{version} Requires: xfsprogs = %{version}
Requires: pkgconfig(uuid)
%description devel %description devel
xfsprogs-devel contains the libraries and header files needed to xfsprogs-devel contains the libraries and header files needed to
@ -90,7 +95,10 @@ autoconf
export OPTIMIZER="-fPIC" export OPTIMIZER="-fPIC"
export DEBUG=-DNDEBUG export DEBUG=-DNDEBUG
export LIBUUID=%{_libdir}/libuuid.a export LIBUUID=%{_libdir}/libuuid.a
%configure --enable-readline=yes %if 0%{?sle_version} >= 120100
export USE_SYSTEMD="--with-systemd-unit-dir=%{_unitdir}"
%endif
%configure --enable-readline=yes $USE_SYSTEMD
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
PATH_TO_HELP="%{_dracutmodulesdir}/95suse-xfs/dracut-fsck-help.txt" PATH_TO_HELP="%{_dracutmodulesdir}/95suse-xfs/dracut-fsck-help.txt"
@ -137,6 +145,13 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
%{_libdir}/libhandle.so.* %{_libdir}/libhandle.so.*
%dir %{_libdir}/xfsprogs/ %dir %{_libdir}/xfsprogs/
%{_libdir}/xfsprogs/xfs_scrub_all.cron %{_libdir}/xfsprogs/xfs_scrub_all.cron
%if 0%{?sle_version} >= 120100
%{_libdir}/xfsprogs/xfs_scrub_fail
%{_unitdir}/xfs_scrub@.service
%{_unitdir}/xfs_scrub_all.service
%{_unitdir}/xfs_scrub_all.timer
%{_unitdir}/xfs_scrub_fail@.service
%endif
%doc %{_mandir}/man[258]/* %doc %{_mandir}/man[258]/*
%doc %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}
%dir %{_libexecdir}/dracut %dir %{_libexecdir}/dracut