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 <mark@klomp.org>

diff --git a/config/ChangeLog b/config/ChangeLog
index 12a141b2cb283e9e879c67e92da6d291a0fe7f68..a7e98d77b87aa505e16e1b0b35e6bf77604e817f 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,11 @@
+2019-08-28  Mark Wielaard  <mark@klomp.org>
+
+       * 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  <ldv@altlinux.org>
 
        * elfutils.spec.in (%files): Add %{_bindir}/eu-elfclassify.

diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in
index c5896a414f506fcf9d95bd7595d1dce64bf2bfc9..513c4e7966e846c1d80fa13fe81b43f05e6791c8 100644 (file)
--- 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 248ae0adea570ba43ca7ce674a5a1d044b1739ea..722752da45e30ee34cc94eff64494b5a01698f2a 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-28  Mark Wielaard  <mark@klomp.org>
+
+       * COPYING: Rename to...
+       * COPYING-GFDL: ... this.
+
 2019-08-23  Ben Woodard  <woodard@redhat.com>
 
        * Updated the eu-readelf man page to make it match the options

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f11fb8f0fa958c7ac3b3689f9e75ba62727eecc0..d6f3eca849a8b8bfa741e6c5830aebdecc65cbde 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
-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