Accepting request 97889 from network:vpn

- remove call to suse_update_config (very old work around) (forwarded request 97737 from coolo)

OBS-URL: https://build.opensuse.org/request/show/97889
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/strongswan?expand=0&rev=39

strongswan.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 21 10:31:49 UTC 2011 - coolo@suse.com
+
+- remove call to suse_update_config (very old work around)
+
 -------------------------------------------------------------------
 Mon Sep 12 09:26:51 UTC 2011 - coolo@suse.com
 

strongswan.spec

@@ -15,12 +15,9 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:           strongswan
 Version:        4.5.3
-Release:        3
+Release:        0
 %define         upstream_version   %{version}
 %define         strongswan_docdir  %{_docdir}/%{name}
 %define         strongswan_libdir  %{_libdir}/ipsec
@@ -30,14 +27,13 @@ Release:        3
 %define		with_gcrypt	0%{suse_version} >= 1110
 %define		with_nm		0%{suse_version} >= 1110
 %define		with_tests	0
+Summary:        OpenSource IPsec-based VPN Solution
 License:        GPL-2.0+
 Group:          Productivity/Networking/Security
-Summary:        OpenSource IPsec-based VPN Solution
 Url:            http://www.strongswan.org/
 Requires:       strongswan-ikev1 = %{version}
 Requires:       strongswan-ikev2 = %{version}
 Requires:       strongswan-ipsec = %{version}
-AutoReqProv:    on
 Source0:        http://download.strongswan.org/strongswan-%{upstream_version}.tar.bz2
 Source1:        http://download.strongswan.org/strongswan-%{upstream_version}.tar.bz2.sig
 Source2:        %{name}.init.in
@@ -46,11 +42,16 @@ Source4:        README.SUSE
 Patch1:         %{name}_modprobe_syslog.patch
 Patch2:         %{name}-%{version}-fmt-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  bison flex gmp-devel gperf pkg-config
+BuildRequires:  bison
+BuildRequires:  curl-devel
+BuildRequires:  flex
+BuildRequires:  gmp-devel
+BuildRequires:  gperf
 BuildRequires:  libcap-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  openldap2-devel
-BuildRequires:  curl-devel pam-devel
+BuildRequires:  pam-devel
+BuildRequires:  pkg-config
 %if %with_mysql
 BuildRequires:  libmysqlclient-devel
 %endif
@@ -63,7 +64,8 @@ BuildRequires:  libgcrypt-devel
 %if %with_nm
 BuildRequires:  NetworkManager-devel
 %endif
-BuildRequires:  iptables libnl >= 1.1
+BuildRequires:  iptables
+BuildRequires:  libnl >= 1.1
 
 %description
 StrongSwan is an OpenSource IPsec-based VPN Solution for Linux
@@ -103,9 +105,7 @@ Authors:
     and others
 
 %package doc
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 
 %description doc
 StrongSwan is an OpenSource IPsec-based VPN Solution for Linux
@@ -120,9 +120,7 @@ Authors:
     and others
 
 %package libs0
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 Conflicts:      strongswan < %{version}
 
 %description libs0
@@ -131,9 +129,7 @@ StrongSwan is an OpenSource IPsec-based VPN Solution for Linux
 This package provides the strongswan library and plugins.
 
 %package ikev1
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 Requires:       iproute2
 Requires:       strongswan-libs0 = %{version}
 Requires:       strongswan-ipsec = %{version}
@@ -147,9 +143,7 @@ StrongSwan is an OpenSource IPsec-based VPN Solution for Linux
 This package provides the pluto IKEv1 daemon.
 
 %package ikev2
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 Requires:       iproute2
 Requires:       strongswan-libs0 = %{version}
 Requires:       strongswan-daemon-starter = %{version}
@@ -162,9 +156,7 @@ StrongSwan is an OpenSource IPsec-based VPN Solution for Linux
 This package provides the charon IKEv2 daemon.
 
 %package ipsec
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 PreReq:         grep %insserv_prereq %fillup_prereq
 Requires:       strongswan-libs0 = %{version}
 Requires:       strongswan-daemon = %{version}
@@ -183,9 +175,7 @@ to maintain both, IKEv1 and IKEv2 daemons, using /etc/ipsec.conf and
 %if %with_mysql
 
 %package mysql
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 Requires:       strongswan-libs0 = %{version}
 
 %description mysql
@@ -198,9 +188,7 @@ This package provides the strongswan mysql plugin.
 %if %with_sqlite
 
 %package sqlite
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 Requires:       strongswan-libs0 = %{version}
 
 %description sqlite
@@ -213,9 +201,7 @@ This package provides the strongswan sqlite plugin.
 %if %with_nm
 
 %package nm
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 Requires:       strongswan-libs0 = %{version}
 Requires:       strongswan-ikev2 = %{version}
 Provides:       strongswan-daemon-starter = %{version}
@@ -233,10 +219,7 @@ NetworkManager-strongswan graphical user interface.
 
 %package tests
 
-
-License:        GPL-2.0+
 Summary:        OpenSource IPsec-based VPN Solution
-Group:          Productivity/Networking/Security
 Requires:       strongswan-libs0 = %{version}
 
 %description tests
@@ -259,7 +242,6 @@ sed -e 's|@libexecdir@|%_libexecdir|g'    \
 CFLAGS="$RPM_OPT_FLAGS -W -Wall -Wno-pointer-sign -Wno-strict-aliasing"
 export RPM_OPT_FLAGS CFLAGS
 #libtoolize --force
-%{?suse_update_config:%{suse_update_config -f}}
 #autoreconf
 %configure \
 	--enable-integrity-test \