[PATCH] CONTRIB: make_srpm.sh can prepare SRPM with patches

[Lukas Slebodnik]

ehlo,

Creating SRPM with patches is useful for some static analysers, which can do
two builds. The first time without patches and the second with patches.

Bash function add_patches is inspired by file rpm/add_patches.sh from project\
389-ds-base.
   commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
   Author: Mark Reynolds
Thanks.

The seond patch is fix, which was reported on sssd-users[1] and fix problem
git-archive on RHEL6

[1]https://lists.fedorahosted.org/pipermail/sssd-users/2013-November/001164.htm...

LS

[Jakub Hrozek]

On Wed, Jul 09, 2014 at 03:05:07PM +0200, Lukas Slebodnik wrote:
> ehlo,
>
> Creating SRPM with patches is useful for some static analysers, which can do
> two builds. The first time without patches and the second with patches.
>
> Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> 389-ds-base.
>    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
>    Author: Mark Reynolds
> Thanks.
>
> The seond patch is fix, which was reported on sssd-users[1] and fix problem
> git-archive on RHEL6
>
> [1]https://lists.fedorahosted.org/pipermail/sssd-users/2013-November/001164.htm...
>
> LS
> From 25a196a521613ad35419627c327ed9d83b73c62a Mon Sep 17 00:00:00 2001
> From: Lukas Slebodnik 
> Date: Wed, 9 Jul 2014 14:29:45 +0200
> Subject: [PATCH 1/2] CONTRIB: make_srpm.sh can prepare SRPM with patches
>
> Creating SRPM with patches is useful for some static analysers, which can do
> two builds. The first time without patches and the second with patches.
>
> Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> 389-ds-base.
>    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
>    Author: Mark Reynolds
> Thanks.
>
> Resolves:
> https://fedorahosted.org/sssd/ticket/2149

Could we suppress stderr from cp? Currently there is an error message
from cp if you call make_srpm without any extra arguments:

$ bash contrib/fedora/make_srpm.sh
cp: cannot stat ‘/home/remote/jhrozek/devel/sssd/contrib/*.patch’: No
such file or directory
Creating SRPM without extra patches.
Wrote: /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.fc20.src.rpm
> From ab9916ffb24bba56e078d6b8c48c111b8ba96dee Mon Sep 17 00:00:00 2001
> From: Lukas Slebodnik 
> Date: Wed, 9 Jul 2014 14:57:17 +0200
> Subject: [PATCH 2/2] CONTRIB: Fix creation of tar.gz with old version of git

ACK

[Jakub Hrozek]

On Wed, Jul 09, 2014 at 06:06:48PM +0200, Jakub Hrozek wrote:
> On Wed, Jul 09, 2014 at 03:05:07PM +0200, Lukas Slebodnik wrote:
> > ehlo,
> >
> > Creating SRPM with patches is useful for some static analysers, which can do
> > two builds. The first time without patches and the second with patches.
> >
> > Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> > 389-ds-base.
> >    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
> >    Author: Mark Reynolds
> > Thanks.
> >
> > The seond patch is fix, which was reported on sssd-users[1] and fix problem
> > git-archive on RHEL6
> >
> > [1]https://lists.fedorahosted.org/pipermail/sssd-users/2013-November/001164.htm...
> >
> > LS
> > From 25a196a521613ad35419627c327ed9d83b73c62a Mon Sep 17 00:00:00 2001
> > From: Lukas Slebodnik 
> > Date: Wed, 9 Jul 2014 14:29:45 +0200
> > Subject: [PATCH 1/2] CONTRIB: make_srpm.sh can prepare SRPM with patches
> >
> > Creating SRPM with patches is useful for some static analysers, which can do
> > two builds. The first time without patches and the second with patches.
> >
> > Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> > 389-ds-base.
> >    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
> >    Author: Mark Reynolds
> > Thanks.
> >
> > Resolves:
> > https://fedorahosted.org/sssd/ticket/2149
>
> Could we suppress stderr from cp? Currently there is an error message
> from cp if you call make_srpm without any extra arguments:
>
> $ bash contrib/fedora/make_srpm.sh
> cp: cannot stat ‘/home/remote/jhrozek/devel/sssd/contrib/*.patch’: No
> such file or directory
> Creating SRPM without extra patches.
> Wrote: /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.fc20.src.rpm

Also, that's not a hard nack but what do you think about using $(cmd)
expansion instead of backticks like `cmd` ? I'm not sure about
portability honestly, but $(cmd) is more readable and can be nested.

[Lukas Slebodnik]

On (09/07/14 18:11), Jakub Hrozek wrote:
> On Wed, Jul 09, 2014 at 06:06:48PM +0200, Jakub Hrozek wrote:
> > On Wed, Jul 09, 2014 at 03:05:07PM +0200, Lukas Slebodnik wrote:
> > > ehlo,
> > >
> > > Creating SRPM with patches is useful for some static analysers, which can do
> > > two builds. The first time without patches and the second with patches.
> > >
> > > Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> > > 389-ds-base.
> > >    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
> > >    Author: Mark Reynolds
> > > Thanks.
> > >
> > > The seond patch is fix, which was reported on sssd-users[1] and fix problem
> > > git-archive on RHEL6
> > >
> > > [1]https://lists.fedorahosted.org/pipermail/sssd-users/2013-November/001164.htm...
> > >
> > > LS
> > > From 25a196a521613ad35419627c327ed9d83b73c62a Mon Sep 17 00:00:00 2001
> > > From: Lukas Slebodnik 
> > > Date: Wed, 9 Jul 2014 14:29:45 +0200
> > > Subject: [PATCH 1/2] CONTRIB: make_srpm.sh can prepare SRPM with patches
> > >
> > > Creating SRPM with patches is useful for some static analysers, which can do
> > > two builds. The first time without patches and the second with patches.
> > >
> > > Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> > > 389-ds-base.
> > >    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
> > >    Author: Mark Reynolds
> > > Thanks.
> > >
> > > Resolves:
> > > https://fedorahosted.org/sssd/ticket/2149
> >
> > Could we suppress stderr from cp? Currently there is an error message
> > from cp if you call make_srpm without any extra arguments:
> >
> > $ bash contrib/fedora/make_srpm.sh
> > cp: cannot stat ‘/home/remote/jhrozek/devel/sssd/contrib/*.patch’: No
> > such file or directory

Fixed.
It was also in previous version ;-)
> > Creating SRPM without extra patches.
> > Wrote: /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.fc20.src.rpm
>
> Also, that's not a hard nack but what do you think about using $(cmd)
> expansion instead of backticks like `cmd` ? I'm not sure about
> portability honestly, but $(cmd) is more readable and can be nested.

Changed. This part was copied from Mark Reynolds

LS

[Jakub Hrozek]

On Wed, Jul 09, 2014 at 06:52:26PM +0200, Lukas Slebodnik wrote:
> On (09/07/14 18:11), Jakub Hrozek wrote:
> > On Wed, Jul 09, 2014 at 06:06:48PM +0200, Jakub Hrozek wrote:
> > > On Wed, Jul 09, 2014 at 03:05:07PM +0200, Lukas Slebodnik wrote:
> > > > ehlo,
> > > >
> > > > Creating SRPM with patches is useful for some static analysers, which can do
> > > > two builds. The first time without patches and the second with patches.
> > > >
> > > > Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> > > > 389-ds-base.
> > > >    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
> > > >    Author: Mark Reynolds
> > > > Thanks.
> > > >
> > > > The seond patch is fix, which was reported on sssd-users[1] and fix problem
> > > > git-archive on RHEL6
> > > >
> > > > [1]https://lists.fedorahosted.org/pipermail/sssd-users/2013-November/001164.htm...
> > > >
> > > > LS
> > > > From 25a196a521613ad35419627c327ed9d83b73c62a Mon Sep 17 00:00:00 2001
> > > > From: Lukas Slebodnik 
> > > > Date: Wed, 9 Jul 2014 14:29:45 +0200
> > > > Subject: [PATCH 1/2] CONTRIB: make_srpm.sh can prepare SRPM with patches
> > > >
> > > > Creating SRPM with patches is useful for some static analysers, which can do
> > > > two builds. The first time without patches and the second with patches.
> > > >
> > > > Bash function add_patches is inspired by file rpm/add_patches.sh from project\
> > > > 389-ds-base.
> > > >    commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87
> > > >    Author: Mark Reynolds
> > > > Thanks.
> > > >
> > > > Resolves:
> > > > https://fedorahosted.org/sssd/ticket/2149
> > >
> > > Could we suppress stderr from cp? Currently there is an error message
> > > from cp if you call make_srpm without any extra arguments:
> > >
> > > $ bash contrib/fedora/make_srpm.sh
> > > cp: cannot stat ‘/home/remote/jhrozek/devel/sssd/contrib/*.patch’: No
> > > such file or directory
>
> Fixed.
> It was also in previous version ;-)
> > > Creating SRPM without extra patches.
> > > Wrote: /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.fc20.src.rpm
> >
> > Also, that's not a hard nack but what do you think about using $(cmd)
> > expansion instead of backticks like `cmd` ? I'm not sure about
> > portability honestly, but $(cmd) is more readable and can be nested.
>
> Changed. This part was copied from Mark Reynolds
>
> LS

This version looks fine and works fine:

$ bash contrib/fedora/make_srpm.sh -p -P 0001-DYNDNS-Add-a-new-option-dyndns_server.patch 
Adding patch to spec file - 0001-DYNDNS-Add-a-new-option-dyndns_server.patch
Wrote: /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.20140709.1902.gitba62e82.fc20.src.rpm
$ rpm -qplv /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.20140709.1902.gitba62e82.fc20.src.rpm
-rw-rw-r--    1 jhrozek jhrozek                  9187 Jul  9 19:02 0001-DYNDNS-Add-a-new-option-dyndns_server.patch
-rw-rw-r--    1 jhrozek jhrozek               2876076 Jul  9 19:02 sssd-1.11.92.tar.gz
-rw-rw-r--    1 jhrozek jhrozek                 25130 Jul  9 19:02 sssd.spec

ACK

[Jakub Hrozek]

On Wed, Jul 09, 2014 at 07:04:43PM +0200, Jakub Hrozek wrote:
> > > > > Resolves:
> > > > > https://fedorahosted.org/sssd/ticket/2149
> > > >
> > > > Could we suppress stderr from cp? Currently there is an error message
> > > > from cp if you call make_srpm without any extra arguments:
> > > >
> > > > $ bash contrib/fedora/make_srpm.sh
> > > > cp: cannot stat ‘/home/remote/jhrozek/devel/sssd/contrib/*.patch’: No
> > > > such file or directory
> >
> > Fixed.
> > It was also in previous version ;-)
> > > > Creating SRPM without extra patches.
> > > > Wrote: /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.fc20.src.rpm
> > >
> > > Also, that's not a hard nack but what do you think about using $(cmd)
> > > expansion instead of backticks like `cmd` ? I'm not sure about
> > > portability honestly, but $(cmd) is more readable and can be nested.
> >
> > Changed. This part was copied from Mark Reynolds
> >
> > LS
>
> This version looks fine and works fine:
>
> $ bash contrib/fedora/make_srpm.sh -p -P 0001-DYNDNS-Add-a-new-option-dyndns_server.patch 
> Adding patch to spec file - 0001-DYNDNS-Add-a-new-option-dyndns_server.patch
> Wrote: /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.20140709.1902.gitba62e82.fc20.src.rpm
> $ rpm -qplv /home/remote/jhrozek/devel/sssd/rpmbuild/SRPMS/sssd-1.11.92-0.20140709.1902.gitba62e82.fc20.src.rpm
> -rw-rw-r--    1 jhrozek jhrozek                  9187 Jul  9 19:02 0001-DYNDNS-Add-a-new-option-dyndns_server.patch
> -rw-rw-r--    1 jhrozek jhrozek               2876076 Jul  9 19:02 sssd-1.11.92.tar.gz
> -rw-rw-r--    1 jhrozek jhrozek                 25130 Jul  9 19:02 sssd.spec
>
> ACK

Pushed to master:
    f31b698549231d68451dbb8fd1184ad375eb5e64
    772f80ea8bc2eefa2bff3873187ea9433b14562a