Move content to different directory
This ensures consistency across RHEL[67] and Fedora.
This commit is contained in:
		
							parent
							
								
									6b23eba82f
								
							
						
					
					
						commit
						e196ca65f9
					
				| @ -44,19 +44,18 @@ further information. | ||||
| 
 | ||||
| %install | ||||
| # Create required directory structure | ||||
| mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/fedora | ||||
| mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/rhel{6,7} | ||||
| mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/content/ | ||||
| mkdir -p %{buildroot}%{_mandir}/en/man8/ | ||||
| 
 | ||||
| # Add in core Fedora content (SCAP XCCDF and OVAL) | ||||
| cp -a Fedora/dist/content/* %{buildroot}%{_datadir}/xml/scap/ssg/fedora | ||||
| cp -a Fedora/dist/content/* %{buildroot}%{_datadir}/xml/scap/ssg/content/ | ||||
| # Add in Fedora manpage | ||||
| cp -a Fedora/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man8/scap-security-guide.8 | ||||
| 
 | ||||
| # Add in datastream form of RHEL-6 benchmark | ||||
| cp -a RHEL/6/dist/content/ssg-rhel6-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/rhel6 | ||||
| cp -a RHEL/6/dist/content/ssg-rhel6-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ | ||||
| # Add in datastream form of RHEL-7 benchmark | ||||
| cp -a RHEL/7/dist/content/ssg-rhel7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/rhel7 | ||||
| cp -a RHEL/7/dist/content/ssg-rhel7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ | ||||
| 
 | ||||
| %files | ||||
| %{_datadir}/xml/scap | ||||
| @ -68,6 +67,7 @@ cp -a RHEL/7/dist/content/ssg-rhel7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/ | ||||
| %changelog | ||||
| * Wed Mar 04 2015 Šimon Lukašík <slukasik@redhat.com> - 0.1.21-1 | ||||
| - update to the latest upstream release | ||||
| - move content to /usr/share/scap/ssg/content | ||||
| 
 | ||||
| * Thu Oct 02 2014 Šimon Lukašík <slukasik@redhat.com> - 0.1.19-1 | ||||
| - update to the latest upstream release | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user