Fix build on non-x86. Minor spec cleanups.

This commit is contained in:
Jason Tibbitts 2017-01-31 12:46:22 -06:00
commit 3ee6626eb3

View file

@ -28,6 +28,9 @@ Patch2: amanda-3.1.1-tcpport.patch
Patch3: amanda-3.2.0-config-dir.patch
#Bugfix - solved problem with permission error message (#1257686)
Patch4: amanda-3.3.9-hash-permission.patch
# Fails to build on non-x86 due to sse-related things. Reported upstream to
# amanda-hackers on 2017-01-31.
Patch5: amanda-3.4.2-fix-sse.patch
License: BSD and GPLv3+ and GPLv2+ and GPLv2
Group: Applications/System
@ -145,8 +148,6 @@ make %{?_smp_mflags}
%install
rm -rf ${RPM_BUILD_ROOT}
make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc/amanda
@ -183,9 +184,6 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm
%check
make check
%clean
rm -rf ${RPM_BUILD_ROOT}
%pre
/usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
-c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
@ -217,7 +215,8 @@ rm -rf ${RPM_BUILD_ROOT}
%postun server -p /sbin/ldconfig
%files
%doc COPYRIGHT* NEWS README
%license COPYRIGHT
%doc NEWS README
%{_unitdir}/amanda@.service
%{_unitdir}/amanda.socket
%{_unitdir}/amanda-udp.service
@ -444,7 +443,10 @@ rm -rf ${RPM_BUILD_ROOT}
* Tue Jan 31 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.4.2-1
- Update to 3.4.2.
- Remove upstreamed patches.
- Add patch to allow builds on non-x86 arches.
- Move autogen call from %%prep to %%build.
- Remove some specfile cruft.
- Use %%license.
* Tue Jan 31 2017 Josef Ridky <jridky@redhat.com> - 3.4.1-4
- Fix warning with checking return value from setreuid in krb5-security.c (#1417828)