Fixes packaging issues mentioned in rhbz#226439

This commit is contained in:
Avesh Agarwal 2014-09-26 15:27:55 -04:00
parent f6a8a9321c
commit 44158a3b84

View File

@ -1,7 +1,7 @@
Summary: An SSL-encrypting socket wrapper Summary: An SSL-encrypting socket wrapper
Name: stunnel Name: stunnel
Version: 5.04 Version: 5.04
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/Internet Group: Applications/Internet
URL: http://www.stunnel.org/ URL: http://www.stunnel.org/
@ -16,7 +16,6 @@ Source6: stunnel-pop3s-client.conf
Patch0: stunnel-5-authpriv.patch Patch0: stunnel-5-authpriv.patch
Patch1: stunnel-5-sample.patch Patch1: stunnel-5-sample.patch
Patch2: stunnel-systemd-service.patch Patch2: stunnel-systemd-service.patch
Buildroot: %{_tmppath}/stunnel-root
# util-linux is needed for rename # util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
# for /usr/bin/pod2man # for /usr/bin/pod2man
@ -41,9 +40,6 @@ in conjunction with imapd to create an SSL secure IMAP server.
%patch1 -p1 -b .sample %patch1 -p1 -b .sample
%patch2 -p1 %patch2 -p1
#iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
#mv doc/stunnel.fr.8_ doc/stunnel.fr.8
%build %build
CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
if pkg-config openssl ; then if pkg-config openssl ; then
@ -71,9 +67,6 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
%endif %endif
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS BUGS ChangeLog COPY* CREDITS PORTS README TODO %doc AUTHORS BUGS ChangeLog COPY* CREDITS PORTS README TODO
@ -113,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Fri Sep 26 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.04-2
- Fixes packaging issues mentioned in rhbz#226439
* Mon Sep 22 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.04-1 * Mon Sep 22 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.04-1
- New upstream realease 5.04 - New upstream realease 5.04
- Updates local patches so that they apply cleanly to - Updates local patches so that they apply cleanly to