From 5d8cd51a460fc29f35a016836c39fcea6bf59fb0 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Tue, 20 Sep 2022 16:43:01 +0800 Subject: 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 --- ChangeLog | 4 +++ Makefile.am | 2 +- config/ChangeLog | 4 +++ config/elfutils.spec.in | 6 ++-- tests/ChangeLog | 9 ++++++ tests/Makefile.am | 3 +- tests/debuginfod-rpms/hello2.spec. | 57 --------------------------------- tests/debuginfod-rpms/hello2.specfile | 57 +++++++++++++++++++++++++++++++++ tests/debuginfod-rpms/hello3.spec. | 60 ----------------------------------- tests/debuginfod-rpms/hello3.specfile | 60 +++++++++++++++++++++++++++++++++++ 10 files changed, 140 insertions(+), 122 deletions(-) delete mode 100644 tests/debuginfod-rpms/hello2.spec. create mode 100644 tests/debuginfod-rpms/hello2.specfile delete mode 100644 tests/debuginfod-rpms/hello3.spec. create mode 100644 tests/debuginfod-rpms/hello3.specfile diff --git a/ChangeLog b/ChangeLog index ee566f53..7bbb2c0f 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 8643312a..e92e05c2 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 15fee44f..9c2816b5 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 333c6239..f491ce0a 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 949dab8a..a240a705 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 f680d3e1..ced4a826 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.spec. deleted file mode 100644 index 0690992f..00000000 --- a/tests/debuginfod-rpms/hello2.spec. +++ /dev/null @@ -1,57 +0,0 @@ -Summary: hello2 -- double hello, world rpm -Name: hello2 -Version: 1.0 -Release: 2 -Group: Utilities -License: GPL -Distribution: RPM ^W Elfutils test suite. -Vendor: Red Hat Software -Packager: Red Hat Software -URL: http://www.redhat.com -BuildRequires: gcc make -Source0: hello-1.0.tar.gz - -%description -Simple rpm demonstration with an eye to consumption by debuginfod. - -%package two -Summary: hello2two -License: GPL - -%description two -Dittoish. - -%prep -%setup -q -n hello-1.0 - -%build -gcc -g -O1 hello.c -o hello -gcc -g -O2 -D_FORTIFY_SOURCE=2 hello.c -o hello2 - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/local/bin -cp hello $RPM_BUILD_ROOT/usr/local/bin/ -cp hello2 $RPM_BUILD_ROOT/usr/local/bin/ - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%attr(0751,root,root) /usr/local/bin/hello - -%files two -%defattr(-,root,root) -%attr(0751,root,root) /usr/local/bin/hello2 - -%changelog -* Thu Nov 14 2019 Frank Ch. Eigler -- Added source code right here to make spec file self-contained. -- Dropped misc files not relevant to debuginfod testing. - -* Wed May 18 2016 Mark Wielaard -- Add hello2 for dwz testing support. - -* Tue Oct 20 1998 Jeff Johnson -- create. diff --git a/tests/debuginfod-rpms/hello2.specfile b/tests/debuginfod-rpms/hello2.specfile new file mode 100644 index 00000000..0690992f --- /dev/null +++ b/tests/debuginfod-rpms/hello2.specfile @@ -0,0 +1,57 @@ +Summary: hello2 -- double hello, world rpm +Name: hello2 +Version: 1.0 +Release: 2 +Group: Utilities +License: GPL +Distribution: RPM ^W Elfutils test suite. +Vendor: Red Hat Software +Packager: Red Hat Software +URL: http://www.redhat.com +BuildRequires: gcc make +Source0: hello-1.0.tar.gz + +%description +Simple rpm demonstration with an eye to consumption by debuginfod. + +%package two +Summary: hello2two +License: GPL + +%description two +Dittoish. + +%prep +%setup -q -n hello-1.0 + +%build +gcc -g -O1 hello.c -o hello +gcc -g -O2 -D_FORTIFY_SOURCE=2 hello.c -o hello2 + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/local/bin +cp hello $RPM_BUILD_ROOT/usr/local/bin/ +cp hello2 $RPM_BUILD_ROOT/usr/local/bin/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%attr(0751,root,root) /usr/local/bin/hello + +%files two +%defattr(-,root,root) +%attr(0751,root,root) /usr/local/bin/hello2 + +%changelog +* Thu Nov 14 2019 Frank Ch. Eigler +- Added source code right here to make spec file self-contained. +- Dropped misc files not relevant to debuginfod testing. + +* Wed May 18 2016 Mark Wielaard +- Add hello2 for dwz testing support. + +* Tue Oct 20 1998 Jeff Johnson +- create. diff --git a/tests/debuginfod-rpms/hello3.spec. b/tests/debuginfod-rpms/hello3.spec. deleted file mode 100644 index ffb95134..00000000 --- a/tests/debuginfod-rpms/hello3.spec. +++ /dev/null @@ -1,60 +0,0 @@ -Summary: hello3 -- double hello, world rpm -Name: hello3 -Version: 1.0 -Release: 2 -Group: Utilities -License: GPL -Distribution: RPM ^W Elfutils test suite. -Vendor: Red Hat Software -Packager: Red Hat Software -URL: http://www.redhat.com -BuildRequires: gcc make -Source0: hello-1.0.tar.gz - -%description -Simple rpm demonstration with an eye to consumption by debuginfod. - -%package two -Summary: hello3two -License: GPL - -%description two -Dittoish. - -%prep -%setup -q -n hello-1.0 - -%build -mkdir foobar -gcc -g -O1 foobar///./../hello.c -o hello -gcc -g -O2 -D_FORTIFY_SOURCE=2 foobar///./../hello.c -o hello3 - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/local/bin -cp hello $RPM_BUILD_ROOT/usr/local/bin/ -cp hello3 $RPM_BUILD_ROOT/usr/local/bin/ - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%attr(0751,root,root) /usr/local/bin/hello - -%files two -%defattr(-,root,root) -%attr(0751,root,root) /usr/local/bin/hello3 - -%changelog -* Tue Mar 24 2020 Frank Ch. Eigler -- New variant of hello2, with crazy source file paths - -* Thu Nov 14 2019 Frank Ch. Eigler -- Dropped misc files not relevant to debuginfod testing. - -* Wed May 18 2016 Mark Wielaard -- Add hello2 for dwz testing support. - -* Tue Oct 20 1998 Jeff Johnson -- create. diff --git a/tests/debuginfod-rpms/hello3.specfile b/tests/debuginfod-rpms/hello3.specfile new file mode 100644 index 00000000..ffb95134 --- /dev/null +++ b/tests/debuginfod-rpms/hello3.specfile @@ -0,0 +1,60 @@ +Summary: hello3 -- double hello, world rpm +Name: hello3 +Version: 1.0 +Release: 2 +Group: Utilities +License: GPL +Distribution: RPM ^W Elfutils test suite. +Vendor: Red Hat Software +Packager: Red Hat Software +URL: http://www.redhat.com +BuildRequires: gcc make +Source0: hello-1.0.tar.gz + +%description +Simple rpm demonstration with an eye to consumption by debuginfod. + +%package two +Summary: hello3two +License: GPL + +%description two +Dittoish. + +%prep +%setup -q -n hello-1.0 + +%build +mkdir foobar +gcc -g -O1 foobar///./../hello.c -o hello +gcc -g -O2 -D_FORTIFY_SOURCE=2 foobar///./../hello.c -o hello3 + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/local/bin +cp hello $RPM_BUILD_ROOT/usr/local/bin/ +cp hello3 $RPM_BUILD_ROOT/usr/local/bin/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%attr(0751,root,root) /usr/local/bin/hello + +%files two +%defattr(-,root,root) +%attr(0751,root,root) /usr/local/bin/hello3 + +%changelog +* Tue Mar 24 2020 Frank Ch. Eigler +- New variant of hello2, with crazy source file paths + +* Thu Nov 14 2019 Frank Ch. Eigler +- Dropped misc files not relevant to debuginfod testing. + +* Wed May 18 2016 Mark Wielaard +- Add hello2 for dwz testing support. + +* Tue Oct 20 1998 Jeff Johnson +- create. -- cgit v1.2.3