pool/apache-rpm-macros
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 343855 from home:pgajdos

Browse Source 
- require apache-rpm-macros-control [bsc#893659]

- do not append macros.apache-module-test to macros.apache, provide
  separate macros file instead

OBS-URL: https://build.opensuse.org/request/show/343855
OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=23
This commit is contained in:
Petr Gajdos 2015-11-11 14:07:44 +00:00 committed by Git OBS Bridge
parent 348ddeb892
commit 957bf872a2
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache-rpm-macros.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 10 15:34:04 UTC 2015 - pgajdos@suse.com
- require apache-rpm-macros-control [bsc#893659]
-------------------------------------------------------------------
Thu Nov 5 11:54:12 UTC 2015 - pgajdos@suse.com
- do not append macros.apache-module-test to macros.apache, provide
separate macros file instead
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 30 17:14:29 UTC 2015 - pgajdos@suse.com Wed Sep 30 17:14:29 UTC 2015 - pgajdos@suse.com

5
apache-rpm-macros.spec
View File

@ -69,6 +69,7 @@ BuildRequires: apache%{ap_major}-devel
%else %else
BuildRequires: httpd-devel BuildRequires: httpd-devel
%endif %endif
Requires: apache-rpm-macros-control
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -96,15 +97,15 @@ cat << eom > %{macros_file}
%%apache_access_syntax_version %{ap_access_syntax_version} %%apache_access_syntax_version %{ap_access_syntax_version}
eom eom
echo >> %{macros_file} echo >> %{macros_file}
cat %{SOURCE1} >> %{macros_file}
%install %install
mkdir -p %{buildroot}%{macros_dir} mkdir -p %{buildroot}%{macros_dir}
install -m 644 %{macros_file} %{buildroot}%{macros_dir} install -m 644 %{macros_file} %{buildroot}%{macros_dir}
install -m 644 %{SOURCE1} %{buildroot}%{macros_dir}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir %{macros_dir} %dir %{macros_dir}
%{macros_dir}/%{macros_file} %{macros_dir}/macros.apache*
%changelog %changelog