<html>
  <head>
    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    <div class="moz-cite-prefix">On 10/2/13 1:57 PM, Shawn Wells wrote:<br>
    </div>
    <blockquote cite="mid:524C5EA0.7000602@redhat.com" type="cite">
      <div class="moz-text-html" lang="x-unicode">
        <meta content="text/html; charset=UTF-8"
          http-equiv="Content-Type">
        <div class="moz-cite-prefix">On 10/2/13 10:45 AM, Jan Lieskovsky
          wrote:<br>
        </div>
        <blockquote
          cite="mid:2125838213.363216.1380725102663.JavaMail.root@redhat.com"
          type="cite">
          <div class="moz-text-plain" wrap="true" graphical-quote="true"
            style="font-family: -moz-fixed; font-size: 12px;"
            lang="x-unicode">
            <pre wrap="">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:
  <a moz-do-not-send="true" class="moz-txt-link-freetext" href="http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html">http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html</a>

Thus fix the deficiency by setting proper name of the build directory.

Thank you &amp;&amp; Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team
</pre>
          </div>
          <br>
          <fieldset class="mimeAttachmentHeader"><legend
              class="mimeAttachmentHeaderName">0001-Fedora-New-rpm-versioning-scheme-set-proper-name-of-.patch</legend></fieldset>
          <br>
          <div class="moz-text-plain" wrap="true" graphical-quote="true"
            style="font-family: -moz-fixed; font-size: 12px;"
            lang="x-western">
            <pre wrap="">From 826079734a136502cce5378a89f026049d337a7d Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky <a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="mailto:jlieskov@redhat.com">&lt;jlieskov@redhat.com&gt;</a>
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 <a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="mailto:jlieskov@redhat.com">&lt;jlieskov@redhat.com&gt;</a>
---
 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 <a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="mailto:jlieskov@redhat.com">&lt;jlieskov@redhat.com&gt;</a> 0.1-2.rc1
+- Set proper name of the build directory in the spec's %setup macro.
+
 * Tue Sep 17 2013 Jan iankko Lieskovsky <a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="mailto:jlieskov@redhat.com">&lt;jlieskov@redhat.com&gt;</a> 0.1-1
 - Initial Fedora SSG RPM.
<div class="moz-txt-sig">-- 
1.7.11.7

</div></pre>
          </div>
        </blockquote>
        <br>
        Ack<br>
      </div>
    </blockquote>
    <br>
    As I'm playing with mock builds, I went ahead and pushed this:<br>
    <br>
    $ git commit Fedora/scap-security-guide.spec <br>
    [master af11d6a] [Fedora] New rpm versioning scheme - set proper
    name of the build directory
<a class="moz-txt-link-freetext" href="https://lists.fedorahosted.org/pipermail/scap-security-guide/2013-October/004205.html">https://lists.fedorahosted.org/pipermail/scap-security-guide/2013-October/004205.html</a><br>
     1 files changed, 5 insertions(+), 2 deletions(-)<br>
    <br>
    $ git push<br>
    Counting objects: 7, done.<br>
    Delta compression using up to 2 threads.<br>
    Compressing objects: 100% (4/4), done.<br>
    Writing objects: 100% (4/4), 567 bytes, done.<br>
    Total 4 (delta 3), reused 0 (delta 0)<br>
    To
    <a class="moz-txt-link-freetext" href="ssh://shawndwells@git.fedorahosted.org/git/scap-security-guide.git">ssh://shawndwells@git.fedorahosted.org/git/scap-security-guide.git</a><br>
       42ec0c8..af11d6a  master -&gt; master<br>
    <br>
  </body>
</html>