Add missing unpackaged files/directories to RPM
Add to doc: README.md, DISCLAIMER, AUTHORS
Add to httpd/conf.d: auth_openidc.conf
Add to /var/cache: /var/cache/httpd/mod_auth_openidc/cache
                   /var/cache/httpd/mod_auth_openidc/metadata
			
			
This commit is contained in:
		
							parent
							
								
									ccf303503b
								
							
						
					
					
						commit
						116723e93f
					
				| @ -1,12 +1,15 @@ | |||||||
| %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} | %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} | ||||||
| %{!?_httpd_moddir:    %{expand: %%global _httpd_moddir    %%{_libdir}/httpd/modules}} | %{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} | ||||||
|  | %{!?_httpd_confdir: %{expand: %%global _httpd_confdir %{_sysconfdir}/httpd/conf.d}} | ||||||
| 
 | 
 | ||||||
| # /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 | # /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 | ||||||
| %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} | %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} | ||||||
| 
 | 
 | ||||||
|  | %global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc | ||||||
|  | 
 | ||||||
| Name:		mod_auth_openidc | Name:		mod_auth_openidc | ||||||
| Version:	1.8.8 | Version:	1.8.8 | ||||||
| Release:	1%{?dist} | Release:	2%{?dist} | ||||||
| Summary:	OpenID Connect auth module for Apache HTTP Server | Summary:	OpenID Connect auth module for Apache HTTP Server | ||||||
| 
 | 
 | ||||||
| Group:		System Environment/Daemons | Group:		System Environment/Daemons | ||||||
| @ -47,6 +50,15 @@ install -m 755 -d $RPM_BUILD_ROOT%{_httpd_modconfdir} | |||||||
| echo 'LoadModule auth_openidc_module modules/mod_auth_openidc.so' > \ | echo 'LoadModule auth_openidc_module modules/mod_auth_openidc.so' > \ | ||||||
| 	$RPM_BUILD_ROOT%{_httpd_modconfdir}/10-auth_openidc.conf | 	$RPM_BUILD_ROOT%{_httpd_modconfdir}/10-auth_openidc.conf | ||||||
| 
 | 
 | ||||||
|  | install -m 755 -d $RPM_BUILD_ROOT%{_httpd_confdir} | ||||||
|  | install -m 644 auth_openidc.conf $RPM_BUILD_ROOT%{_httpd_confdir} | ||||||
|  | # Adjust httpd cache location in install config file | ||||||
|  | sed -i 's!/var/cache/apache2/!/var/cache/httpd/!' $RPM_BUILD_ROOT%{_httpd_confdir}/auth_openidc.conf | ||||||
|  | install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir} | ||||||
|  | install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/metadata | ||||||
|  | install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| %files | %files | ||||||
| %if 0%{?rhel} && 0%{?rhel} < 7 | %if 0%{?rhel} && 0%{?rhel} < 7 | ||||||
| %doc LICENSE.txt | %doc LICENSE.txt | ||||||
| @ -54,8 +66,15 @@ echo 'LoadModule auth_openidc_module modules/mod_auth_openidc.so' > \ | |||||||
| %license LICENSE.txt | %license LICENSE.txt | ||||||
| %endif | %endif | ||||||
| %doc ChangeLog | %doc ChangeLog | ||||||
|  | %doc AUTHORS | ||||||
|  | %doc DISCLAIMER | ||||||
|  | %doc README.md | ||||||
| %{_httpd_moddir}/mod_auth_openidc.so | %{_httpd_moddir}/mod_auth_openidc.so | ||||||
| %config(noreplace) %{_httpd_modconfdir}/10-auth_openidc.conf | %config(noreplace) %{_httpd_modconfdir}/10-auth_openidc.conf | ||||||
|  | %config(noreplace) %{_httpd_confdir}/auth_openidc.conf | ||||||
|  | %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir} | ||||||
|  | %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/metadata | ||||||
|  | %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
| * Thu Mar 10 2016 Jan Pazdziora <jpazdziora@redhat.com> 1.8.8-1 | * Thu Mar 10 2016 Jan Pazdziora <jpazdziora@redhat.com> 1.8.8-1 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user