From c950e8a995dfee0b6094c9854581b103754c6bb6 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 28 Aug 2019 00:33:41 +0200 Subject: [PATCH] config: Fix spec file, add manpages and new GFDL license. Now that we have manpages lets also package them. Rename COPYING to COPYING-GFDL to make it not clash with the top-level COPYING file. Also fix up the spec file so it can be used to create a srpm again. Add eu-stack to the file list. Signed-off-by: Mark Wielaard --- config/ChangeLog | 8 ++++++++ config/elfutils.spec.in | 14 +++++++++----- doc/{COPYING => COPYING-GFDL} | 0 doc/ChangeLog | 5 +++++ doc/Makefile.am | 2 +- 5 files changed, 23 insertions(+), 6 deletions(-) rename doc/{COPYING => COPYING-GFDL} (100%) diff --git a/config/ChangeLog b/config/ChangeLog index 12a141b..a7e98d7 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,11 @@ +2019-08-28 Mark Wielaard + + * elfutils.spec.in (License): Add GFDL. + (%install): Correct sub-shell syntax, use (), not {}. + (%files): Add man1/eu-*.1*. + Add eu-stack. Add COPYING-GFDL. + (%files libelf-devel): Add man3/elf_*.3*. + 2019-08-14 Dmitry V. Levin * elfutils.spec.in (%files): Add %{_bindir}/eu-elfclassify. diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in index c5896a4..513c4e7 100644 --- a/config/elfutils.spec.in +++ b/config/elfutils.spec.in @@ -4,7 +4,7 @@ Name: elfutils Version: @PACKAGE_VERSION@ Release: 1 URL: http://elfutils.org/ -License: GPLv3+ and (GPLv2+ or LGPLv3+) +License: GPLv3+ and (GPLv2+ or LGPLv3+) and GFDL Group: Development/Tools Source: ftp://sourceware.org/pub/elfutils/%{version}/elfutils-%{version}.tar.bz2 Obsoletes: libelf libelf-devel @@ -45,7 +45,7 @@ and machine-specific ELF handling and process introspection. %package devel Summary: Development libraries to handle compiled objects. Group: Development/Tools -License: GPLv2+ or LGPLv3+ +License: (GPLv2+ or LGPLv3+) and GFDL Requires: elfutils = %{version}-%{release} Requires: elfutils-libelf-devel = %{version}-%{release} @@ -134,11 +134,11 @@ chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so* chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so* # XXX Nuke unpackaged files -{ cd ${RPM_BUILD_ROOT} +( cd ${RPM_BUILD_ROOT} rm -f .%{_includedir}/elfutils/libasm.h rm -f .%{_libdir}/libasm.so rm -f .%{_libdir}/libasm.a -} +) install -Dm0644 config/10-default-yama-scope.conf ${RPM_BUILD_ROOT}%{_sysctldir}/10-default-yama-scope.conf @@ -161,11 +161,13 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%doc COPYING COPYING-GPLV2 COPYING-LGPLV3 README TODO CONTRIBUTING +%license COPYING COPYING-GPLV2 COPYING-LGPLV3 doc/COPYING-GFDL +%doc README TODO CONTRIBUTING %{_bindir}/eu-elflint %{_bindir}/eu-nm %{_bindir}/eu-readelf %{_bindir}/eu-size +%{_bindir}/eu-stack %{_bindir}/eu-strip %{_bindir}/eu-findtextrel %{_bindir}/eu-addr2line @@ -184,6 +186,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libdw.so.* %dir %{_libdir}/elfutils %{_libdir}/elfutils/lib*.so +%{_mandir}/man1/eu-*.1* %files devel %defattr(-,root,root) @@ -220,6 +223,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_includedir}/elfutils/version.h %{_libdir}/libelf.so %{_libdir}/pkgconfig/libelf.pc +%{_mandir}/man3/elf_*.3* %files libelf-devel-static %{_libdir}/libelf.a diff --git a/doc/COPYING b/doc/COPYING-GFDL similarity index 100% rename from doc/COPYING rename to doc/COPYING-GFDL diff --git a/doc/ChangeLog b/doc/ChangeLog index 248ae0a..722752d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2019-08-28 Mark Wielaard + + * COPYING: Rename to... + * COPYING-GFDL: ... this. + 2019-08-23 Ben Woodard * Updated the eu-readelf man page to make it match the options diff --git a/doc/Makefile.am b/doc/Makefile.am index f11fb8f..d6f3eca 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,6 +16,6 @@ ## ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -EXTRA_DIST = COPYING README +EXTRA_DIST = COPYING-GFDL README dist_man1_MANS=readelf.1 elfclassify.1 notrans_dist_man3_MANS=elf_update.3 elf_getdata.3 elf_clone.3 elf_begin.3 -- 2.7.4