[PATCH 1/2] [Fedora] New rpm versioning scheme - set proper name of the build directory

Shawn Wells shawn at redhat.com
Thu Oct 3 01:26:20 UTC 2013


On 10/2/13 1:57 PM, Shawn Wells wrote:
> On 10/2/13 10:45 AM, Jan Lieskovsky wrote:
>> Upstream commit c5229573e4b4aaf090d7bf8cfd25a40793ce0c12
>> introduced a change in the way how Fedora tarball is created
>> (before it was created according to the scheme pkg_name-pkg_version.tar.gz,
>> now it's created in pkg_name-pkg_version-fedora_ssg_release.tar.gz
>> form).
>>
>> Without the attached patch it was not possible to properly
>> generate Fedora RPM package (since %setup macro without
>> build directory name [option -n] assumes the build directory
>> to have a form of pkg_name-pkg_version:
>>    http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html
>>
>> Thus fix the deficiency by setting proper name of the build directory.
>>
>> Thank you && Regards, Jan.
>> --
>> Jan iankko Lieskovsky / Red Hat Security Technologies Team
>>
>> 0001-Fedora-New-rpm-versioning-scheme-set-proper-name-of-.patch
>>
>>
>>  From 826079734a136502cce5378a89f026049d337a7d Mon Sep 17 00:00:00 2001
>> From: Jan Lieskovsky<jlieskov at redhat.com>
>> Date: Wed, 2 Oct 2013 14:43:11 +0200
>> Subject: [PATCH 1/2] [Fedora] New rpm versioning scheme - set proper name of
>>   the build directory
>>
>>
>> Signed-off-by: Jan Lieskovsky<jlieskov at redhat.com>
>> ---
>>   Fedora/scap-security-guide.spec | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/Fedora/scap-security-guide.spec b/Fedora/scap-security-guide.spec
>> index e91d955..a323749 100644
>> --- a/Fedora/scap-security-guide.spec
>> +++ b/Fedora/scap-security-guide.spec
>> @@ -5,7 +5,7 @@
>>   # file one level up - in the main scap-security-guide directory (instead of
>>   # this one).
>>   
>> -%global	fedorassgrelease	1
>> +%global	fedorassgrelease	2.rc1
>>   
>>   Name:		scap-security-guide
>>   Version:	0.1
>> @@ -27,7 +27,7 @@ catalog of practical hardening advice and links it to government requirements
>>   where applicable. The project bridges the gap between generalized policy
>>   requirements and specific implementation guidance.
>>   %prep
>> -%setup -q
>> +%setup -q -n %{name}-%{version}-%{fedorassgrelease}
>>   
>>   
>>   %build
>> @@ -51,5 +51,8 @@ rm -rf $RPM_BUILD_ROOT
>>   /usr/share/xml/scap/ssg/fedora/19/*
>>   
>>   %changelog
>> +* Wed Oct 02 2013 Jan iankko Lieskovsky<jlieskov at redhat.com>  0.1-2.rc1
>> +- Set proper name of the build directory in the spec's %setup macro.
>> +
>>   * Tue Sep 17 2013 Jan iankko Lieskovsky<jlieskov at redhat.com>  0.1-1
>>   - Initial Fedora SSG RPM.
>> -- 1.7.11.7
>
> Ack

As I'm playing with mock builds, I went ahead and pushed this:

$ git commit Fedora/scap-security-guide.spec
[master af11d6a] [Fedora] New rpm versioning scheme - set proper name of 
the build directory 
https://lists.fedorahosted.org/pipermail/scap-security-guide/2013-October/004205.html
  1 files changed, 5 insertions(+), 2 deletions(-)

$ git push
Counting objects: 7, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 567 bytes, done.
Total 4 (delta 3), reused 0 (delta 0)
To ssh://shawndwells@git.fedorahosted.org/git/scap-security-guide.git
    42ec0c8..af11d6a  master -> master

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.fedorahosted.org/pipermail/scap-security-guide/attachments/20131002/ed42980d/attachment-0001.html>


More information about the scap-security-guide mailing list