new upstream release

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

M/ModemManager/ModemManager-vl.spec

@@ -1,10 +1,11 @@
-%define snapshot .git20100502
+#%define snapshot .git20100720
+%define snapshot %{nil}
 %define ppp_version 2.4.4
 
 Summary: Mobile broadband modem management service
 Summary(ja): Mobile broadband modem management service
 Name: ModemManager
-Version: 0.3
+Version: 0.4
 Release: 1%{?snapshot}%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Base
@@ -18,12 +19,15 @@ 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
+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
 Requires: glib2
-BuildRequires: glib2-devel >= 2.18
+BuildRequires: glib2-devel >= 2.26.1
-BuildRequires: dbus-glib-devel >= 0.82
+BuildRequires: dbus-glib-devel >= 0.92
 BuildRequires: libgudev-devel >= 143
 BuildRequires: ppp = %{ppp_version}
 BuildRequires: ppp-devel = %{ppp_version}
@@ -39,9 +43,12 @@ modems, including mobile broadband (3G) devices.
 %prep
 %setup -q
 %patch1 -p1 -b .jp-modems
+%patch20 -p1 -b .git20100720
+%patch21 -p1 -b .glib2
+%patch22 -p1 -b .dbus-glib
 
 %build
-
+autoreconf -i
 pppddir=`ls -1d %{_libdir}/pppd/2*`
 %configure \
 	--enable-more-warnings=yes \
@@ -91,6 +98,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/icons/hicolor/22x22/apps/modem-manager.png
 
 %changelog
+* 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)
+- add Patch21 (ModemManager-0.4-glib2-2.25.12.patch)
+- add Patch22 (ModemManager-0.4-dbus-glib-property-access-bug.patch)
+
 * Fri May 07 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3-1.git20100502
 - initial build for Vine Linux
 

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

@@ -1,14 +1,14 @@
-%define nm_version          0.8
+%define nm_version          0.8.2
-%define dbus_version        1.1
+%define dbus_version        1.4.1
-%define gtk2_version        2.10.0
+%define gtk2_version        2.22.1
-%define openconnect_version 0.99
+%define openconnect_version 1.10
 
 %define svn_snapshot        %{nil}
 
 Summary:   NetworkManager VPN integration for openconnect
 Summary(ja): NetworkManager の openconnect 用 VPN 統合
 Name:      NetworkManager-openconnect
-Version:   0.8
+Version:   0.8.2
 Release:   1%{svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -26,7 +26,7 @@ BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: gnome-keyring-devel
+BuildRequires: libgnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
 BuildRequires: gnome-common
@@ -105,6 +105,10 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* 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
+
 * Tue May 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8-1
 - new upstream release
 

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

@@ -1,6 +1,6 @@
-%define nm_version          0.8-1
+%define nm_version          0.8.2-1
-%define dbus_version        1.1
+%define dbus_version        1.4
-%define gtk2_version        2.14.0
+%define gtk2_version        2.22.1
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
@@ -9,7 +9,7 @@
 Summary: NetworkManager VPN plugin for OpenVPN
 Summary(ja): OpenVPN を使った NetworkManager 用 VPN プラグイン
 Name: NetworkManager-openvpn
-Version: 0.8
+Version: 0.8.2
 Release: 1%{?svn_snapshot}%{?_dist_release}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -117,6 +117,9 @@ fi
 
 
 %changelog
+* Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
+- new upstream release
+
 * Tue May 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8-1
 - new upstream release
 

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

@@ -1,6 +1,6 @@
-%define nm_version          0.8
+%define nm_version          0.8.2
-%define dbus_version        1.1
+%define dbus_version        1.4
-%define gtk2_version        2.10.0
+%define gtk2_version        2.22.1
 %define ppp_version         2.4.4
 %define shared_mime_version 0.16
 
@@ -8,7 +8,7 @@
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
-Version:   0.8
+Version:   0.8.2
 Release:   1%{?svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -24,7 +24,7 @@ BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: gnome-keyring-devel
+BuildRequires: libgnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
 BuildRequires: ppp-devel >= %{ppp_version}
@@ -36,7 +36,7 @@ Requires: ppp              >= %{ppp_version}
 Requires: shared-mime-info >= %{shared_mime_version}
 Requires: pptp
 Requires: GConf2
-Requires: gnome-keyring
+Requires: libgnome-keyring
 Requires(post):   /sbin/ldconfig desktop-file-utils
 Requires(postun): /sbin/ldconfig desktop-file-utils
 
@@ -53,7 +53,10 @@ the NetworkManager and the GNOME desktop.
 %patch10 -p1
 
 %build
-%configure --disable-static --enable-more-warnings=yes
+%configure \
+	--disable-static \
+	--enable-more-warnings=yes \
+	--with-pppd-plugin-dir="%{_libdir}/pppd/%{ppp_version}"
 make %{?_smp_mflags}
 
 %install
@@ -63,8 +66,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
 
-rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.la
+rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.la
-rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.a
+rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.a
 
 %find_lang %{name}
 
@@ -100,13 +103,19 @@ fi
 %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
 %{_libexecdir}/nm-pptp-service
-%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.so
+%{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
 %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
 #%{_datadir}/applications/nm-pptp.desktop
 #%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* 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
+- change Requires: libgnome-keyring instead of gnome-keyring
+- add configure option: --with-pppd-plugin-dir="%%{_libdir}/pppd/%%{ppp_version}"
+
 * Mon May 10 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8-1
 - new upstream release
 

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

@@ -1,6 +1,6 @@
-%define nm_version          0.8
+%define nm_version          0.8.2
-%define dbus_version        1.1
+%define dbus_version        1.4
-%define gtk2_version        2.10.0
+%define gtk2_version        2.22.1
 %define vpnc_version        0.4
 %define shared_mime_version 0.16-3
 
@@ -9,7 +9,7 @@
 Summary:   NetworkManager VPN plugin for vpnc
 Summary(ja): NetworkManager の vpnc 用 VPN プラグイン
 Name:      NetworkManager-vpnc
-Version:   0.8
+Version:   0.8.2
 Release:   1%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -22,14 +22,14 @@ BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: gnome-keyring-devel
+BuildRequires: libgnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
 
 Requires: NetworkManager  
 Requires: vpnc            
 Requires: shared-mime-info
-Requires: gnome-keyring
+Requires: libgnome-keyring
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -94,10 +94,15 @@ fi
 %{_libexecdir}/nm-vpnc-service-vpnc-helper
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
 #%{_datadir}/applications/nm-vpnc.desktop
-#%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* 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
+- change Requires: libgnome-keyring instead of gnome-keyring
+
 * Tue May 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8-1
 - new upstream release
 

N/NetworkManager/NetworkManager-vl.spec

@@ -1,9 +1,9 @@
 %define udev_scriptdir /lib/udev
 	
-%define dbus_version 1.2
+%define dbus_version 1.4.1
-%define dbus_glib_version 0.80
+%define dbus_glib_version 0.92
 
-%define gtk2_version	2.16.0
+%define gtk2_version	2.22.1
 %define wireless_tools_version 29
 %define libnl_version 1.1
 %define ppp_version 2.4.4
@@ -14,8 +14,8 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 0.8
+Version: 0.8.2
-Release: 2%{?snapshot}%{?_dist_release}
+Release: 1%{?snapshot}%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,6 +28,9 @@ Patch1: nm-applet-internal-buildfixes.patch
 Patch2:  explain-dns1-dns2.patch
 #Patch10: NetworkManager-0.7.1-jp-modem-probe.patch
 #Patch11: NetworkManager-0.7.1-emobile.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
 
@@ -72,6 +75,8 @@ BuildRequires: nss-devel >= 3.11.7
 BuildRequires: dhclient
 BuildRequires: polkit-devel
 BuildRequires: gnome-bluetooth-devel
+BuildRequires: libgudev1-devel
+BuildRequires: iptables-devel
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -152,6 +157,11 @@ tar -xzf %{SOURCE1}
 %patch2 -p1 -b .explain-dns1-dns2
 #%patch10 -p1 -b .phs-modem
 #%patch11 -p1 -b .emobile
+%patch20 -p1
+%patch21 -p1
+pushd network-manager-applet-%{version}
+%patch22 -p1
+popd
 
 # update ja.po
 cp -f %{SOURCE3} network-manager-applet-%{version}/po/ja.po
@@ -211,6 +221,9 @@ cat nm-applet.lang >> %{name}.lang
 
 install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 
+# remove gnome-bluetooth plugins
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/libnma.so
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -231,11 +244,31 @@ fi
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
 
+%pre gnome
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -259,12 +292,14 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
 %{_bindir}/nm-tool
 %{_bindir}/nm-online
+%{_bindir}/nmcli
 %{_libexecdir}/nm-dhcp-client.action
 %{_libexecdir}/nm-avahi-autoipd.action
 %{_libexecdir}/nm-dispatcher.action
 %dir %{_libdir}/NetworkManager
 %{_libdir}/NetworkManager/*.so*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %{_mandir}/man8/*
 %dir %{_localstatedir}/run/NetworkManager
 %dir %{_localstatedir}/lib/NetworkManager
@@ -287,6 +322,7 @@ fi
 %files gnome
 %defattr(-,root,root,0755)
 %{_sysconfdir}/dbus-1/system.d/nm-applet.conf
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
 %{_bindir}/nm-applet
 %{_bindir}/nm-connection-editor
 %{_datadir}/applications/*.desktop
@@ -298,6 +334,7 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
+##%{_libdir}/gnome-bluetooth/plugins/libnma.so
 
 %files glib
 %defattr(-,root,root,0755)
@@ -321,6 +358,14 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
+- update to 0.8.2
+- add Patch20 (NetworkManager-0.8.2-git20101110.patch)
+- add Patch21 (NetworkManager-0.8.2-git20101118-git20101219.patch)
+- add Patch22 (network-manager-applet-git20101116.patch)
+- update Patch1,2 from FC package
+- add BuildRequires: libgudev1-devel, iptables-devel
+
 * Thu Sep 30 2010 Shu KONNO <owa@bg.wakwak.com> 0.8-2
 - rebuilt with rpm-4.8.1 for pkg-config