[PATCH] renaming of toplevel RHEL6 directory, removing unnecessary src directory * updated specfile and Makefile accordingly (fingers crossed)

Kevin Spargur kspargur at redhat.com
Tue Jul 10 22:08:39 UTC 2012


Hey Jeff,

Sounds like you want git mv

-Kevin





On Jul 10, 2012, at 5:36 PM, Jeffrey Blank <blank at eclipse.ncsc.mil> wrote:

> A fair point: it is rather difficult to test this.
> 
> It still worked for me (copying all of the files placed into RHEL6/dist
> into /usr/local/scap-security-guide).
> 
> Check your inbox for the megapatch (bzip2'ed, mercifully down to 1MB) if
> you'd like to test.
> 
> If there were some clever way to tell git to actually handle a file move
> as a file move (and not as a bunch of removes and adds), that would be
> great to know.  But I am not aware of how to pull this off in git.
> 
> 
> 
> 
> 
> On 07/10/2012 04:33 PM, Spencer R. Shimko wrote:
>> Hi Jeff,
>> 
>> Can you confirm that the RPM still rolls and installs cleanly on RHEL6
>> with this applied?
>> 
>> Thanks,
>> --Spencer
>> 
>> On 7/10/12 4:15 PM, "Jeffrey Blank" <blank at eclipse.ncsc.mil> wrote:
>> 
>>> The actual patch is MUCH MORE than the below.
>>> 
>>> Signed-off-by: Jeffrey Blank <blank at eclipse.ncsc.mil>
>>> diff --git a/scap-security-guide.spec b/scap-security-guide.spec
>>> index c9b23ed..55e22a5 100644
>>> --- a/scap-security-guide.spec
>>> +++ b/scap-security-guide.spec
>>> @@ -26,7 +26,7 @@ requirements and specific implementation guidance.
>>> 
>>> 
>>> %build
>>> -cd rhel6/src && make dist
>>> +cd RHEL6 && make dist
>>> 
>>> 
>>> %install
>>> @@ -34,7 +34,7 @@ rm -rf $RPM_BUILD_ROOT
>>> #make install DESTDIR=$RPM_BUILD_ROOT
>>> mkdir -p $RPM_BUILD_ROOT/usr/local/%{name}/
>>> 
>>> -cp -r rhel6/src/dist/* $RPM_BUILD_ROOT/usr/local/%{name}/
>>> +cp -r RHEL6/dist/* $RPM_BUILD_ROOT/usr/local/%{name}/
>>> 
>>> 
>>> %clean
>>> -- 
>>> 1.7.1
>>> 
>>> _______________________________________________
>>> scap-security-guide mailing list
>>> scap-security-guide at lists.fedorahosted.org
>>> https://fedorahosted.org/mailman/listinfo/scap-security-guide
>> 
>> _______________________________________________
>> scap-security-guide mailing list
>> scap-security-guide at lists.fedorahosted.org
>> https://fedorahosted.org/mailman/listinfo/scap-security-guide
> _______________________________________________
> scap-security-guide mailing list
> scap-security-guide at lists.fedorahosted.org
> https://fedorahosted.org/mailman/listinfo/scap-security-guide



More information about the scap-security-guide mailing list