NetworkManager: update to 0.8.4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3791 ec354946-7b23-47d6-9f5a-488ba84defc7

M/ModemManager/ModemManager-vl.spec

@@ -1,12 +1,12 @@
 #%define snapshot .git20100720
 %define snapshot %{nil}
-%define ppp_version 2.4.4
+%define ppp_version 2.4.5
 
 Summary: Mobile broadband modem management service
 Summary(ja): Mobile broadband modem management service
 Name: ModemManager
 Version: 0.4
-Release: 1%{?snapshot}%{?_dist_release}
+Release: 2%{?snapshot}%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -19,9 +19,7 @@ URL: http://www.gnome.org/projects/NetworkManager/
 #
 Source: %{name}-%{version}%{?snapshot}.tar.bz2
 Patch1: %{name}-0.3-jp-modems.patch
-Patch20: %{name}-0.4-git20100720.patch
+Patch20: %{name}-0.4-git20110428.patch
-Patch21: %{name}-0.4-glib2-2.25.12.patch
-Patch22: %{name}-0.4-dbus-glib-property-access-bug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: dbus-glib
@@ -43,9 +41,7 @@ modems, including mobile broadband (3G) devices.
 %prep
 %setup -q
 %patch1 -p1 -b .jp-modems
-%patch20 -p1 -b .git20100720
+%patch20 -p1 -b .git20110428
-%patch21 -p1 -b .glib2
-%patch22 -p1 -b .dbus-glib
 
 %build
 autoreconf -i
@@ -70,6 +66,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.so
+rm -f $RPM_BUILD_ROOT%{_includedir}/mm/mm-modem.h
 
 %post
 /sbin/ldconfig
@@ -89,6 +86,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %defattr(0644, root, root, 0755)
 %doc COPYING README
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager.conf
+%{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager.service
 %attr(0755,root,root) %{_sbindir}/modem-manager
 %dir %{_libdir}/%{name}
@@ -98,6 +96,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/icons/hicolor/22x22/apps/modem-manager.png
 
 %changelog
+* Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4-2
+- update Patch20 (ModemManager-0.4-git20110428.patch)
+- delete Patch21,22
+
 * Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4-1
 - update to 0.4
 - add Patch20 (ModemManager-0.4-git20100720.patch)

N/NetworkManager-openconnect/NetworkManager-openconnect-vl.spec

@@ -1,14 +1,14 @@
-%define nm_version          0.8.2
+%define nm_version          0.8.4.0
 %define dbus_version        1.4.1
 %define gtk2_version        2.22.1
-%define openconnect_version 1.10
+%define openconnect_version 3.02
 
 %define svn_snapshot        %{nil}
 
 Summary:   NetworkManager VPN integration for openconnect
 Summary(ja): NetworkManager の openconnect 用 VPN 統合
 Name:      NetworkManager-openconnect
-Version:   0.8.2
+Version:   0.8.4
 Release:   1%{svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -19,8 +19,10 @@ URL:       http://www.gnome.org/projects/NetworkManager/
 # git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ b94964eb \
 #                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn14.tar.gz
 Source:    %{name}-%{version}%{svn_snapshot}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+BuildRequires: autoconf
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
@@ -31,6 +33,7 @@ BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
 BuildRequires: gnome-common
 BuildRequires: autoconf automake libtool
+BuildRequires: openconnect-devel      >= %{openconnect_version}
 
 Requires: NetworkManager   >= %{nm_version}
 Requires: openconnect      >= %{openconnect_version}
@@ -53,6 +56,7 @@ with NetworkManager and the GNOME desktop
 %setup -q
 
 %build
+autoreconf -if
 %configure --enable-more-warnings=yes
 make %{?_smp_mflags}
 
@@ -99,12 +103,17 @@ fi
 %{_libdir}/NetworkManager/lib*.so*
 %{_sysconfdir}/dbus-1/system.d/nm-openconnect-service.conf
 %{_sysconfdir}/NetworkManager/VPN/nm-openconnect-service.name
+%{_libexecdir}/nm-openconnect-auth-dialog
 %{_libexecdir}/nm-openconnect-service
 %{_libexecdir}/nm-openconnect-service-openconnect-helper
 %dir %{_datadir}/gnome-vpn-properties/openconnect
-%{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
+%{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
 
 %changelog
+* Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
+- new upstream release
+- add BuildRequires: openconnect-devel
+
 * Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
 - new upstream release
 - change BuildRequires: libgnome-keyring-devel instead of gnome-keyring-devel

N/NetworkManager-openvpn/NetworkManager-openvpn-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.8.2-1
+%define nm_version          0.8.4.0-1
 %define dbus_version        1.4
 %define gtk2_version        2.22.1
 %define openvpn_version     2.1
@@ -9,7 +9,7 @@
 Summary: NetworkManager VPN plugin for OpenVPN
 Summary(ja): OpenVPN を使った NetworkManager 用 VPN プラグイン
 Name: NetworkManager-openvpn
-Version: 0.8.2
+Version: 0.8.4
 Release: 1%{?svn_snapshot}%{?_dist_release}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -110,13 +110,14 @@ fi
 %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 %{_libexecdir}/nm-openvpn-service
 %{_libexecdir}/nm-openvpn-service-openvpn-helper
-%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
+%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui
-#%{_datadir}/applications/nm-openvpn.desktop
-#%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 
 %changelog
+* Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
+- new upstream release
+
 * Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
 - new upstream release
 

N/NetworkManager-pptp/NetworkManager-pptp-vl.spec

@@ -1,14 +1,14 @@
-%define nm_version          0.8.2
+%define nm_version          0.8.4.0
 %define dbus_version        1.4
 %define gtk2_version        2.22.1
-%define ppp_version         2.4.4
+%define ppp_version         2.4.5
 %define shared_mime_version 0.16
 
 #define svn_snapshot %{nil}
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
-Version:   0.8.2
+Version:   0.8.4
 Release:   1%{?svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -104,12 +104,15 @@ fi
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
 %{_libexecdir}/nm-pptp-service
 %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
-%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
+%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui
 #%{_datadir}/applications/nm-pptp.desktop
 #%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
+- new upstream release
+
 * Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
 - new upstream release
 - change BuildRequires: libgnome-keyring-devel instead of gnome-keyring-devel

N/NetworkManager-vpnc/NetworkManager-vpnc-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.8.2
+%define nm_version          0.8.4.0
 %define dbus_version        1.4
 %define gtk2_version        2.22.1
 %define vpnc_version        0.4
@@ -9,7 +9,7 @@
 Summary:   NetworkManager VPN plugin for vpnc
 Summary(ja): NetworkManager の vpnc 用 VPN プラグイン
 Name:      NetworkManager-vpnc
-Version:   0.8.2
+Version:   0.8.4
 Release:   1%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -92,12 +92,15 @@ fi
 %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 %{_libexecdir}/nm-vpnc-service
 %{_libexecdir}/nm-vpnc-service-vpnc-helper
-%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
+%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
 #%{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
+- new upstream release
+
 * Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
 - new upstream release
 - change BuildRequires: libgnome-keyring-devel instead of gnome-keyring-devel

N/NetworkManager/NetworkManager-vl.spec

@@ -8,28 +8,27 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.4
 
+%define applet_version 0.8.4
+
 #define snapshot .git20090414
 #define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 0.8.2
+Version: 0.8.4.0
-Release: 2%{?snapshot}%{?_dist_release}
+Release: 1%{?snapshot}%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
 Source: %{name}-%{version}%{?snapshot}.tar.bz2
-Source1: network-manager-applet-%{version}%{?applet_snapshot}.tar.bz2
+Source1: network-manager-applet-%{applet_version}%{?applet_snapshot}.tar.bz2
 Source2: nm-system-settings.conf
-Patch1: nm-applet-internal-buildfixes.patch
+Patch1:  nm-applet-internal-buildfixes-nm084.patch
 Patch2:  explain-dns1-dns2.patch
-#Patch10: NetworkManager-0.7.1-jp-modem-probe.patch
+Patch20: NetworkManager-0.8.4.0-git20110501.patch
-#Patch11: NetworkManager-0.7.1-emobile.patch
+Patch30: network-manager-applet-0.8.4-git20110503.patch
-Patch20: NetworkManager-0.8.2-git20101110.patch
-Patch21: NetworkManager-0.8.2-git20101118-git20101219.patch
-Patch22: network-manager-applet-git20101116.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -154,12 +153,9 @@ NetworkManager functionality from applications that use glib.
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .nm-applet-internal
 %patch2 -p1 -b .explain-dns1-dns2
-#%patch10 -p1 -b .phs-modem
+%patch20 -p1 -b .NM-git20110501
-#%patch11 -p1 -b .emobile
+pushd network-manager-applet-%{applet_version}
-%patch20 -p1
+%patch30 -p1 -b .nma-git20110501
-%patch21 -p1
-pushd network-manager-applet-%{version}
-%patch22 -p1
 popd
 
 
@@ -177,7 +173,7 @@ autoreconf -i
 make
 
 # build the applet
-pushd network-manager-applet-%{version}
+pushd network-manager-applet-%{applet_version}
   autoreconf -i
   intltoolize --force
   %configure --disable-static
@@ -193,7 +189,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 # install the applet
-pushd network-manager-applet-%{version}
+pushd network-manager-applet-%{applet_version}
   make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
@@ -355,6 +351,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue May 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4.0-1
+- update to 0.8.4.0
+- update Patch1 (nm-applet-internal-buildfixes-nm084.patch)
+- update Patch20 (NetworkManger-0.8.4.0-git20110501.patch)
+- update Patch30 (network-manager-applet-0.8.4-git20110503.patch)
+- delete Patch21,22
+
 * Mon May  2 2011 IWAI, Masaharu <iwai@alib.jp> 0.8.2-2
 - drop nm-applet ja.po (Source3)
 

lib/libn/libnet/libnet-vl.spec

@@ -1,7 +1,7 @@
 Summary:        C library for portable packet creation and injection
 Name:           libnet
 Version:        1.1.2.1
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://www.packetfactory.net/libnet/
@@ -40,7 +40,7 @@ rm -rf sample/win32
 rm -f sample/.\#* sample/.*.swp
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -63,14 +63,20 @@ rm -rf %{buildroot}
 %doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
 %doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
 %doc doc/TODO doc/html/ sample/
+%{_libdir}/*.so.*
 
+%files devel
+%defattr(-,root,root,-)
 %{_bindir}/libnet-config
 %{_includedir}/libnet/
 %{_includedir}/libnet.h
-%{_libdir}/libnet.a
+%{_libdir}/*.so
 %{_mandir}/man3/libnet*
 
 %changelog
+* Tue May 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.2.1-3
+- add configure option (--disable-static)
+
 * Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1.2.1-2
 - rebuilt with current VineSeed
 

o/openconnect/openconnect-vl.spec

@@ -1,5 +1,5 @@
 Name:		openconnect
-Version:	2.26
+Version:	3.02
 Release:        1%{?_dist_release}
 Summary:	Open client for Cisco AnyConnect VPN
 Summary(ja):	Cisco AnyConnect VPM 用のオープンクライアント
@@ -18,16 +18,33 @@ Requires:	vpnc
 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
+Provides: openconnect-devel-static = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: libproxy-devel
+Requires: zlib-devel
+Requires: openssl-devel
+Requires: libxml2-devel
+
+%description devel
+This package provides the core HTTP and authentication support from
+the OpenConnect VPN client, to be used by GUI authentication dialogs
+for NetworkManager etc.
+
 %prep
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} openconnect
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+make install-lib LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m0644 openconnect.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 
@@ -38,14 +55,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/openconnect
-%{_libexecdir}/nm-openconnect-auth-dialog
 %{_mandir}/man8/*
-%doc TODO COPYING.LGPL
+%doc TODO COPYING.LGPL openconnect.html
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libopenconnect.a
+/usr/include/openconnect.h
+%{_libdir}/pkgconfig/openconnect.pc
 
 
 %changelog
-* Sun May 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26-1
+* Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.02-1
+- new upstream release
+
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26-1
 - new upstream release
 
 * Tue May 26 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 	1.10-1