Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into 'master'
[Packaging] Update to 7.08. Fixes MER#1995

See merge request mer-core/openconnect!1
  • Loading branch information
pvuorela committed Jan 22, 2019
2 parents 1d24c71 + a121381 commit a9cf3a5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 175 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "upstream"]
path = upstream
url = git://git.infradead.org/users/dwmw2/openconnect.git
Binary file removed openconnect-3.15.tar.gz
Binary file not shown.
88 changes: 0 additions & 88 deletions openconnect.changes

This file was deleted.

40 changes: 0 additions & 40 deletions openconnect.yaml

This file was deleted.

52 changes: 5 additions & 47 deletions openconnect.spec → rpm/openconnect.spec
@@ -1,20 +1,13 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.23
#
# >> macros
# << macros
%define keepstatic 1

Name: openconnect
Summary: Open client for Cisco AnyConnect VPN
Version: 3.15
Version: 7.08
Release: 1
Group: Applications/Internet
License: LGPLv2+
URL: http://www.infradead.org/openconnect.html
Source0: ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}.tar.gz
Source100: openconnect.yaml
Requires: vpnc
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Expand All @@ -23,13 +16,10 @@ BuildRequires: pkgconfig(openssl)
BuildRequires: libproxy-devel
BuildRequires: gettext


%description
This package provides a client for Cisco's "AnyConnect" VPN, which uses
HTTPS and DTLS protocols.



%package devel
Summary: Development package for OpenConnect VPN authentication tools
Group: Applications/Internet
Expand All @@ -41,7 +31,6 @@ This package provides the core HTTP and authentication support from
the OpenConnect VPN client, to be used by GUI authentication dialogs
for NetworkManager etc.


%package docs
Summary: Documentation package for OpenConnect VPN authentication tools
Group: Applications/Internet
Expand All @@ -50,69 +39,38 @@ Requires: %{name} = %{version}-%{release}
%description docs
This package provides documentation for openconnect, such as man pages.



%prep
%setup -q -n %{name}-%{version}

# >> setup
# << setup
%setup -q -n %{name}-%{version}/upstream

%build
# >> build pre
autoreconf -f -i
# << build pre

%configure
./autogen.sh
%configure --with-vpnc-script=/etc/vpnc/vpnc-script
make %{?jobs:-j%jobs}

# >> build post
# << build post
%install
rm -rf %{buildroot}
# >> install pre
# << install pre
%make_install
rm -rf %{buildroot}%{_datadir}/openconnect

# >> install post
# << install post
%find_lang %{name}



%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig








%files -f %{name}.lang
%defattr(-,root,root,-)
# >> files
%{_libdir}/libopenconnect.so.*
%{_sbindir}/openconnect
%doc COPYING.LGPL
# << files


%files devel
%defattr(-,root,root,-)
# >> files devel
%doc TODO openconnect.html
%{_libdir}/libopenconnect.so
%{_libdir}/libopenconnect.a
%{_includedir}/openconnect.h
%{_libdir}/pkgconfig/openconnect.pc
# << files devel

%files docs
%defattr(-,root,root,-)
# >> files docs
%{_mandir}/man8/*
# << files docs

1 change: 1 addition & 0 deletions upstream
Submodule upstream added at 9697be

0 comments on commit a9cf3a5

Please sign in to comment.