cpet/hiawatha
1
0
Fork 0
forked from pool/hiawatha
Code Pull Requests Activity

Accepting request 248391 from home:jengelh:branches:server:http

Browse Source 
- Avoid generating libpolarssl.so.7, which led to "have choice
  for libpolarssl.so.7: libpolarssl7 hiawatha" and make other
  polarssl-using applications not run in practice because the
  library is in a non-standard directory, yet discovered by rpm
  as a provider.

OBS-URL: https://build.opensuse.org/request/show/248391
OBS-URL: https://build.opensuse.org/package/show/server:http/hiawatha?expand=0&rev=67
This commit is contained in:
Mariusz Fik 2014-09-10 16:39:29 +00:00 committed by Git OBS Bridge
parent a34fafb9f8
commit 56770713c2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hiawatha.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 10 16:04:57 UTC 2014 - jengelh@inai.de
- Avoid generating libpolarssl.so.7, which led to "have choice
for libpolarssl.so.7: libpolarssl7 hiawatha" and make other
polarssl-using applications not run in practice because the
library is in a non-standard directory, yet discovered by rpm
as a provider.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 7 23:29:36 UTC 2014 - fisiu@opensuse.org Sun Sep 7 23:29:36 UTC 2014 - fisiu@opensuse.org

8
hiawatha.spec
View File

@ -34,6 +34,7 @@ Source101: %{name}-ssl.firewall
BuildRequires: cmake >= 2.8.4 BuildRequires: cmake >= 2.8.4
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: polarssl-devel
BuildRequires: systemd BuildRequires: systemd
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: logrotate Requires: logrotate
@ -76,13 +77,14 @@ cmake .. \
-DENABLE_TOMAHAWK=On \ -DENABLE_TOMAHAWK=On \
-DENABLE_TOOLKIT=On \ -DENABLE_TOOLKIT=On \
-DENABLE_XSLT=On \ -DENABLE_XSLT=On \
-DENABLE_ZLIB_SUPPORT=On -DENABLE_ZLIB_SUPPORT=On \
-DUSE_SYSTEM_POLARSSL=on
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
cd build cd build
%makeinstall %make_install
install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
@ -118,8 +120,6 @@ rm -vf %{buildroot}%{_libdir}/%{name}/libpolarssl.so
%{_sbindir}/wigwam %{_sbindir}/wigwam
%attr(0755,root,root) %verify(not mode) %{_sbindir}/cgi-wrapper %attr(0755,root,root) %verify(not mode) %{_sbindir}/cgi-wrapper
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libpolarssl.so*
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/cgi-wrapper.conf %config(noreplace) %{_sysconfdir}/%{name}/cgi-wrapper.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf