avatar
Sergey A. Sokolov has added c3367065bb
fix build
view file @ c3367065bb
... ... --- a/apache-commons-daemon-jsvc-eap6.spec
... ... +++ b/apache-commons-daemon-jsvc-eap6.spec
... ... @@ -34,11 +34,7 @@
34 34
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
35 35
36 36
%bcond_without native
37
%if "%{?rhel}" == "6"
38
%bcond_without zip
39
%else
40 37
%bcond_with zip
41
%endif
42 38
43 39
%define base_name   daemon
44 40
%define short_name  commons-%{base_name}
... ... @@ -53,10 +49,6 @@ Group: Applications/System
49 49
URL:            http://commons.apache.org/daemon/
50 50
Source0:        http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
51 51
Patch0:          %{name}-crosslink.patch
52
#Not needed for EAP build
53
#Patch2:          %{name}-ia64-configure.patch
54
#Patch3:          %{name}-s390x-configure.patch
55
#Patch4:          %{name}-ppc64-configure.patch
56 52
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
57 53
58 54
%if %with native
... ... @@ -93,10 +85,6 @@ Container for the source distribution of %{name}.
85 85
%prep
86 86
%setup -q -n %{short_name}-%{version}-src
87 87
%patch0 -p0
88
#Not needed for EAP build
89
#%patch2 -p0
90
#%patch3 -p0 -b .s390x
91
#%patch4 -p0 -b .ppc
92 88
chmod 644 src/samples/*
93 89
%if %with native
94 90
# use the one from docbook instead of getting it from the net
... ... @@ -104,20 +92,12 @@ catalogfile=`xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN"|
92 92
sed -i -e s:"http\://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd":$catalogfile: src/native/unix/man/jsvc.1.xml
93 93
94 94
pushd src/native/unix
95
%if "%{?rhel}" == "6"
96 95
#work with docbook-xsl (from docbook-maven on rhel 6)
97
unzip -q %{_javadir}/docbook-xsl-resources.zip
98 96
export XSL_DIR=$XSL_DIR:`pwd`/docbook/html:`pwd`/docbook/manpages:`pwd`/docbook/common
99
xmlto -x docbook/manpages/docbook.xsl man man/jsvc.1.xml
100
%else
101
xmlto man man/jsvc.1.xml
102
%endif
103 97
popd
104 98
%endif
105 99
sed -i -e '2425s/powerpc/powerpc*/' src/native/unix/configure
106 100
107
zip -q -r ../%{name}-%{version}-src.zip *
108
109 101
%build
110 102
%if %with native
111 103
cd src/native/unix
... ... @@ -129,7 +109,6 @@ make %{?_smp_mflags}
109 109
%install
110 110
rm -rf $RPM_BUILD_ROOT
111 111
%if %with native
112
install -Dpm 0644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.eap6.1
113 112
install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc-eap6/jsvc
114 113
%endif
115 114
... ... @@ -148,7 +127,6 @@ rm -rf $RPM_BUILD_ROOT
127 127
%doc LICENSE*
128 128
%dir %{_bindir}/jsvc-eap6
129 129
%{_bindir}/jsvc-eap6/jsvc
130
%{_mandir}/man1/jsvc.eap6.1*
131 130
%endif
132 131
133 132
%if %with zip

Comments