From: Yonggang Luo Date: Tue, 20 Sep 2022 08:43:01 +0000 (+0800) Subject: Rename 'hello{2,3}.spec.' -> 'hello{2,3}.specfile' X-Git-Tag: elfutils-0.188~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d8cd51a460fc29f35a016836c39fcea6bf59fb0;p=thirdparty%2Felfutils.git Rename 'hello{2,3}.spec.' -> 'hello{2,3}.specfile' These filenames are invalid on win32. We don't want to include multiple .spec files for make rpm. rpmbuild --sign is not supported anymore. Also include hello3.specfile in EXTRA_DIST. Escape some macros in the elfutils.spec.in file comments. Signed-off-by: Yonggang Luo Signed-off-by: Mark Wielaard --- diff --git a/ChangeLog b/ChangeLog index ee566f53d..7bbb2c0fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2022-10-20 Mark Wielaard + + * Makefile.am (rpm): Remove --sign. + 2022-10-22 Mark Wielaard * configure.ac: Use AC_PROG_CC with autoconf 2.70, or AC_PROG_CC_C99 diff --git a/Makefile.am b/Makefile.am index 8643312a0..e92e05c20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ distcheck-hook: chmod -R u+w $(distdir) rpm: dist - rpmbuild -ts --sign elfutils-@PACKAGE_VERSION@.tar.bz2 + rpmbuild -ts elfutils-@PACKAGE_VERSION@.tar.bz2 if GCOV diff --git a/config/ChangeLog b/config/ChangeLog index 15fee44f0..9c2816b50 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2022-10-20 Mark Wielaard + + * elfutils.spec.in: Escape % in comments. + 2022-10-27 Mark Wielaard * eu.am: Use grep -F instead of fgrep. diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in index 333c6239c..f491ce0a0 100644 --- a/config/elfutils.spec.in +++ b/config/elfutils.spec.in @@ -265,18 +265,18 @@ fi %dir %{_includedir}/elfutils %{_includedir}/elfutils/elf-knowledge.h %{_includedir}/elfutils/known-dwarf.h -#%{_includedir}/elfutils/libasm.h +#%%{_includedir}/elfutils/libasm.h %{_includedir}/elfutils/libdw.h %{_includedir}/elfutils/libdwfl.h %{_includedir}/elfutils/libdwelf.h %{_includedir}/elfutils/version.h -#%{_libdir}/libasm.so +#%%{_libdir}/libasm.so %{_libdir}/libdw.so %{_libdir}/pkgconfig/libdw.pc %files devel-static %{_libdir}/libdw.a -#%{_libdir}/libasm.a +#%%{_libdir}/libasm.a %files libelf %license COPYING-GPLV2 COPYING-LGPLV3 diff --git a/tests/ChangeLog b/tests/ChangeLog index 949dab8af..a240a7050 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,12 @@ +2022-09-20 Yonggang Luo + + * Makefile.am (EXTRA_DIST): Remove debuginfod-rpms/hello2.spec. + Add debuginfod-rpms/hello{2,3}.specfile. + * tests/debuginfod-rpms/hello2.spec.: Renamed to... + * tests/debuginfod-rpms/hello2.specfile: ...this. + * tests/debuginfod-rpms/hello3.spec.: Renamed to... + * tests/debuginfod-rpms/hello3.specfile: ...this. + 2022-10-28 Arsen Arsenović * run-readelf-s.sh: Add tests for the --syms alias. diff --git a/tests/Makefile.am b/tests/Makefile.am index f680d3e14..ced4a8266 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -566,7 +566,8 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \ debuginfod-rpms/fedora31/hello3-debugsource-1.0-2.x86_64.rpm \ debuginfod-rpms/fedora31/hello3-two-1.0-2.x86_64.rpm \ debuginfod-rpms/fedora31/hello3-two-debuginfo-1.0-2.x86_64.rpm \ - debuginfod-rpms/hello2.spec. \ + debuginfod-rpms/hello2.specfile \ + debuginfod-rpms/hello3.specfile \ debuginfod-rpms/rhel6/hello2-1.0-2.i686.rpm \ debuginfod-rpms/rhel6/hello2-1.0-2.src.rpm \ debuginfod-rpms/rhel6/hello2-debuginfo-1.0-2.i686.rpm \ diff --git a/tests/debuginfod-rpms/hello2.spec. b/tests/debuginfod-rpms/hello2.specfile similarity index 100% rename from tests/debuginfod-rpms/hello2.spec. rename to tests/debuginfod-rpms/hello2.specfile diff --git a/tests/debuginfod-rpms/hello3.spec. b/tests/debuginfod-rpms/hello3.specfile similarity index 100% rename from tests/debuginfod-rpms/hello3.spec. rename to tests/debuginfod-rpms/hello3.specfile