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 <luoyonggang@gmail.com>
Signed-off-by: Mark Wielaard <mark@klomp.org>

diff --git a/ChangeLog b/ChangeLog
index ee566f53dbe77e801dea3291075a1865baa004b3..7bbb2c0fe97ef36042acf29cdf853be1043b9c42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-10-20  Mark Wielaard  <mark@klomp.org>
+
+       * Makefile.am (rpm): Remove --sign.
+
 2022-10-22  Mark Wielaard  <mark@klomp.org>
 
        * configure.ac: Use AC_PROG_CC with autoconf 2.70, or AC_PROG_CC_C99

diff --git a/Makefile.am b/Makefile.am
index 8643312a068bc2db3d1f714fb28a85653b9e9f8d..e92e05c20062af2ca4696469a64be81d0ac5ca76 100644 (file)
--- 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 15fee44f0d3a45506ff264b58cb132328426be21..9c2816b505eceb6f0aee143f3b759c4ae4f94e3c 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2022-10-20  Mark Wielaard  <mark@klomp.org>
+
+       * elfutils.spec.in: Escape % in comments.
+
 2022-10-27  Mark Wielaard  <mark@klomp.org>
 
        * eu.am: Use grep -F instead of fgrep.

diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in
index 333c6239cadcf3a1ff38f6b64cb33dbd2b4e5bfe..f491ce0a01a908697a7ce9f7ab9ebc545cfb3752 100644 (file)
--- 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 949dab8af4af3b85802f2f0f155503e290d3b15b..a240a70506b17a9ab32040d4f9ca96d5da894504 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,12 @@
+2022-09-20  Yonggang Luo  <luoyonggang@gmail.com>
+
+       * 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ć  <arsen@aarsen.me>
 
        * run-readelf-s.sh: Add tests for the --syms alias.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f680d3e14a750279e852375dcdfb78d4e52430cc..ced4a826623647b06ef4aadd0bd5fbeb16cd7652 100644 (file)
--- 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