[1/7] Rename 'hello2.spec.' -> 'hello2.spec' 'hello3.spec.' -> 'hello3.spec'

  These filenames are invalid on win32

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 tests/Makefile.am                                   | 2 +-
 tests/debuginfod-rpms/{hello2.spec. => hello2.spec} | 0
 tests/debuginfod-rpms/{hello3.spec. => hello3.spec} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/debuginfod-rpms/{hello2.spec. => hello2.spec} (100%)
 rename tests/debuginfod-rpms/{hello3.spec. => hello3.spec} (100%)
  

Hi,

On Tue, Sep 20, 2022 at 04:43:01PM +0800, Yonggang Luo via Elfutils-devel wrote:
> These filenames are invalid on win32

This looks ok to me, but I don't really know why these files were
named this way in the first place.

The files themselves are not directly used, they are there to recreate
the hello3*rpm test files.

Frank, would you mind if these are just renamed to normal *.spec?

Thanks,

Mark

> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  tests/Makefile.am                                   | 2 +-
>  tests/debuginfod-rpms/{hello2.spec. => hello2.spec} | 0
>  tests/debuginfod-rpms/{hello3.spec. => hello3.spec} | 0
>  3 files changed, 1 insertion(+), 1 deletion(-)
>  rename tests/debuginfod-rpms/{hello2.spec. => hello2.spec} (100%)
>  rename tests/debuginfod-rpms/{hello3.spec. => hello3.spec} (100%)
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 85514898..fc2235f4 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -563,7 +563,7 @@ 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.spec \
>  	     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
> similarity index 100%
> rename from tests/debuginfod-rpms/hello2.spec.
> rename to tests/debuginfod-rpms/hello2.spec
> diff --git a/tests/debuginfod-rpms/hello3.spec. b/tests/debuginfod-rpms/hello3.spec
> similarity index 100%
> rename from tests/debuginfod-rpms/hello3.spec.
> rename to tests/debuginfod-rpms/hello3.spec
> -- 
> 2.36.1.windows.1
>
  

I really want this to be merged :) ping Frank,
as this would stop me clone elfutils on windows

On Sat, Oct 15, 2022 at 4:35 AM Mark Wielaard <mark@klomp.org> wrote:
>
> Hi,
>
> On Tue, Sep 20, 2022 at 04:43:01PM +0800, Yonggang Luo via Elfutils-devel
wrote:
> > These filenames are invalid on win32
>
> This looks ok to me, but I don't really know why these files were
> named this way in the first place.
>
> The files themselves are not directly used, they are there to recreate
> the hello3*rpm test files.
>
> Frank, would you mind if these are just renamed to normal *.spec?
>
> Thanks,
>
> Mark
>
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> >  tests/Makefile.am                                   | 2 +-
> >  tests/debuginfod-rpms/{hello2.spec. => hello2.spec} | 0
> >  tests/debuginfod-rpms/{hello3.spec. => hello3.spec} | 0
> >  3 files changed, 1 insertion(+), 1 deletion(-)
> >  rename tests/debuginfod-rpms/{hello2.spec. => hello2.spec} (100%)
> >  rename tests/debuginfod-rpms/{hello3.spec. => hello3.spec} (100%)
> >
> > diff --git a/tests/Makefile.am b/tests/Makefile.am
> > index 85514898..fc2235f4 100644
> > --- a/tests/Makefile.am
> > +++ b/tests/Makefile.am
> > @@ -563,7 +563,7 @@ 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.spec \
> >            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
> > similarity index 100%
> > rename from tests/debuginfod-rpms/hello2.spec.
> > rename to tests/debuginfod-rpms/hello2.spec
> > diff --git a/tests/debuginfod-rpms/hello3.spec.
b/tests/debuginfod-rpms/hello3.spec
> > similarity index 100%
> > rename from tests/debuginfod-rpms/hello3.spec.
> > rename to tests/debuginfod-rpms/hello3.spec
> > --
> > 2.36.1.windows.1
> >



--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
  

Hi -

> I really want this to be merged :) ping Frank,
> as this would stop me clone elfutils on windows

If it doesn't break "make rpm" (or at least rpm -ts elfutils*.tar.bz2),
it's fine.  But I don't understand the problem - my windows machines have
no problem with files named "hello2.spec2." with two periods.

- FChE
  

On Thu, Oct 20, 2022 at 3:49 AM Frank Ch. Eigler <fche@redhat.com> wrote:
>
> Hi -
>
> > I really want this to be merged :) ping Frank,
> > as this would stop me clone elfutils on windows
>
> If it doesn't break "make rpm" (or at least rpm -ts elfutils*.tar.bz2),
> it's fine.  But I don't understand the problem - my windows machines have
> no problem with files named "hello2.spec2." with two periods.
>
Hi, Frank, `git clone` can not checkout the file, I didn't know why

> - FChE
>


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
  

> If it doesn't break "make rpm" (or at least rpm -ts elfutils*.tar.bz2),
> it's fine.  But I don't understand the problem - my windows machines have
> no problem with files named "hello2.spec2." with two periods.
>
> - FChE

This is the error log:
```
C:\Users\lygstate>cd /d C:\work\xemu\elfutils

C:\work\xemu\elfutils>git reset --hard
4cc429d2761846967678fb8cf5868d311d1f7862
error: invalid path 'tests/debuginfod-rpms/hello2.spec.'
fatal: Could not reset index file to revision
'4cc429d2761846967678fb8cf5868d311d1f7862'.

C:\work\xemu\elfutils>
```



--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
  

Hi,

On Wed, 2022-10-19 at 15:49 -0400, Frank Ch. Eigler via Elfutils-devel
wrote:
> I really want this to be merged :) ping Frank,
> > as this would stop me clone elfutils on windows
> 
> If it doesn't break "make rpm" (or at least rpm -ts
> elfutils*.tar.bz2),
> it's fine.

make rpm doesn't work because of:

rpmbuild -ts --sign elfutils-0.187.tar.bz2
error: rpmbuild --sign is no longer supported. Use the rpmsign command
instead!
make: *** [Makefile:971: rpm] Error 1

Maybe just remove the --sign?

But then, with the rename, you'll get:

rpmbuild -ts elfutils-0.187.tar.bz2
error: Found more than one spec file in elfutils-0.187.tar.bz2
make: *** [Makefile:971: rpm] Error 1

So maybe we just should rename them to .specfile?
That is what the attached patch does, plus some other cleanups.
- We forgot to include the hello3.specfile
- Remove the --sign from rpmbuild
- escape the % in spec comments

That makes make rpm work out of the box without warnings.
Does it also help the windows git thing?

Cheers,

Mark
  

Hi -

> C:\work\xemu\elfutils>git reset --hard
> 4cc429d2761846967678fb8cf5868d311d1f7862
> error: invalid path 'tests/debuginfod-rpms/hello2.spec.'
> fatal: Could not reset index file to revision
> '4cc429d2761846967678fb8cf5868d311d1f7862'.

Sounds like a git-induced problem.  Maybe try a different git client?

- FChE
  

Hi,

On Thu, 2022-10-20 at 18:07 +0200, Mark Wielaard wrote:
> So maybe we just should rename them to .specfile?
> That is what the attached patch does, plus some other cleanups.
> - We forgot to include the hello3.specfile
> - Remove the --sign from rpmbuild
> - escape the % in spec comments
> 
> That makes make rpm work out of the box without warnings.
> Does it also help the windows git thing?

I pushed this. Please let me know if it works for you.

Thanks,

Mark
  

Thanks, works fine

On Mon, Oct 31, 2022 at 9:29 PM Mark Wielaard <aegon@wildebeest.org> wrote:
>
> Hi,
>
> On Thu, 2022-10-20 at 18:07 +0200, Mark Wielaard wrote:
> > So maybe we just should rename them to .specfile?
> > That is what the attached patch does, plus some other cleanups.
> > - We forgot to include the hello3.specfile
> > - Remove the --sign from rpmbuild
> > - escape the % in spec comments
> >
> > That makes make rpm work out of the box without warnings.
> > Does it also help the windows git thing?
>
> I pushed this. Please let me know if it works for you.
>
> Thanks,
>
> Mark



--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo