diff --git a/diffutils.changes b/diffutils.changes index f971e58..679dac6 100644 --- a/diffutils.changes +++ b/diffutils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 4 09:29:27 UTC 2016 - mpluskal@suse.com + +- Make building more verbose +- Move info page removal to preun +- Cleanup spec file with spec-cleaner +- Update provides/obsoletes + ------------------------------------------------------------------- Mon Jul 6 10:13:58 UTC 2015 - coolo@suse.com diff --git a/diffutils.spec b/diffutils.spec index cbeaf91..d64bc6e 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -1,7 +1,7 @@ # # spec file for package diffutils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,23 @@ Name: diffutils -Url: http://www.gnu.org/software/diffutils/ -Provides: diff -Obsoletes: diff -PreReq: %{install_info_prereq} Version: 3.3 Release: 0 Summary: GNU diff Utilities License: GFDL-1.2 and GPL-3.0+ Group: Productivity/Text/Utilities -Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz -Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig +Url: https://www.gnu.org/software/diffutils/ +Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig # http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=diffutils -Source2: %name.keyring +Source2: %{name}.keyring Patch0: gnulib-perl522.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# will be check by source service -#BuildRequires: gpg-offline BuildRequires: xz +Requires(pre): %{install_info_prereq} +Requires(preun): %{install_info_prereq} +Provides: diff = %{version} +Obsoletes: diff < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The GNU diff utilities find differences between files. diff is used to @@ -45,22 +44,22 @@ make source code patches, for instance. %patch0 -p1 %build -export CFLAGS="%optflags -fPIE" +export CFLAGS="%{optflags} -fPIE" export LDFLAGS="-pie" %configure -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %check -make check +make %{?_smp_mflags} check %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} gzip -9 %{buildroot}%{_infodir}/%{name}.info %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%postun +%preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %files @@ -70,7 +69,10 @@ gzip -9 %{buildroot}%{_infodir}/%{name}.info %{_bindir}/diff %{_bindir}/diff3 %{_bindir}/sdiff -%doc %{_infodir}/%{name}.info.gz -%doc %{_mandir}/man1/*.gz +%{_infodir}/diffutils.info.* +%{_mandir}/man1/cmp.1%{ext_man} +%{_mandir}/man1/diff.1%{ext_man} +%{_mandir}/man1/diff3.1%{ext_man} +%{_mandir}/man1/sdiff.1%{ext_man} %changelog