[NetworkManager] update to snapshot from new development release 0.9.9.1

thaller thaller at fedoraproject.org
Fri Feb 28 13:53:00 UTC 2014 

commit b749848e40239fea58d40bfb5c0bc0e9e65a1a51
Author: Thomas Haller <thaller at redhat.com>
Date:   Fri Feb 28 14:37:44 2014 +0100

    update to snapshot from new development release 0.9.9.1

 .gitignore                                         |    1 +
 ...zero-secrets-to-prevent-crash-getting-sec.patch |   31 -
 0003-platform-caching-and-diverse.patch            | 1822 --------------------
 NetworkManager.spec                                |   17 +-
 makerepo.gitignore                                 |   69 +
 makerepo.sh                                        |    5 +-
 sources                                            |    2 +-
 7 files changed, 81 insertions(+), 1866 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index edd0873..1b270c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -299,3 +299,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-0.9.9.0.git20140114.4dd6ab8.tar.bz2
 /NetworkManager-0.9.9.0.git20140117.94c2993.tar.bz2
 /NetworkManager-0.9.9.0.git20140131.5d6a5f8.tar.bz2
+/NetworkManager-0.9.9.1.git20140228.16bbc90.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 9b93803..aa62580 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,9 +6,9 @@
 %define libnl3_version 3.2.7
 %define ppp_version 2.4.5
 
-%define snapshot .git20140131
-%define git_sha .5d6a5f8
-%define realversion 0.9.9.0
+%define snapshot .git20140228
+%define git_sha .16bbc90
+%define realversion 0.9.9.1
 
 %global with_nmtui 1
 
@@ -39,8 +39,8 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.9.9.0
-Release: 28%{snapshot}%{?dist}
+Version: 0.9.9.1
+Release: 0%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -50,8 +50,6 @@ Source1: NetworkManager.conf
 Source2: 00-server.conf
 
 Patch1: 0001-explain-dns1-dns2.patch
-Patch2: 0002-libnm-glib-zero-secrets-to-prevent-crash-getting-sec.patch
-Patch3: 0003-platform-caching-and-diverse.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -218,8 +216,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %setup -q -n NetworkManager-%{realversion}
 
 %patch1 -p1 -b .0001.explain-dns1-dns2.orig
-%patch2 -p1 -b .0002.secrets.orig
-%patch3 -p1 -b .0003-platform-caching-and-diverse.orig
 
 %build
 
@@ -442,6 +438,9 @@ fi
 %{_bindir}/nmtui-hostname
 
 %changelog
+* Fri Feb 28 2014 Thomas Haller <thaller at redhat.com> - 0.9.9.1-0.git20140228
+- new upstream snapshot with development version 0.9.9.1
+
 * Sat Feb 22 2014 Thomas Haller <thaller at redhat.com> - 0.9.9.0-28.git20140131
 - add nmtui package
 - bugfix caching of libnl objects (caused error with new libnl3 version when activating bridges) (rh #1063290)
diff --git a/makerepo.gitignore b/makerepo.gitignore
index f7720aa..45f99c7 100644
--- a/makerepo.gitignore
+++ b/makerepo.gitignore
@@ -100,6 +100,7 @@ docs/libnm-glib/html/index.sgml
 docs/libnm-glib/html/libnm-glib.devhelp2
 docs/libnm-glib/html/libnm-glib-nm-types.html
 docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
 docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
 docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
 docs/libnm-glib/html/NMAccessPoint.html
@@ -152,8 +153,74 @@ docs/libnm-glib/sgml.stamp
 docs/libnm-glib/tmpl-build.stamp
 docs/libnm-glib/tmpl/libnm-glib-unused.sgml
 docs/libnm-glib/tmpl/libnm-glib-unused.sgml.bak
+docs/libnm-glib/tmpl/nm-access-point.sgml
+docs/libnm-glib/tmpl/nm-access-point.sgml.bak
+docs/libnm-glib/tmpl/nm-active-connection.sgml
+docs/libnm-glib/tmpl/nm-active-connection.sgml.bak
+docs/libnm-glib/tmpl/nm-client.sgml
+docs/libnm-glib/tmpl/nm-client.sgml.bak
+docs/libnm-glib/tmpl/nm-device-adsl.sgml
+docs/libnm-glib/tmpl/nm-device-adsl.sgml.bak
+docs/libnm-glib/tmpl/nm-device-bond.sgml
+docs/libnm-glib/tmpl/nm-device-bond.sgml.bak
+docs/libnm-glib/tmpl/nm-device-bridge.sgml
+docs/libnm-glib/tmpl/nm-device-bridge.sgml.bak
+docs/libnm-glib/tmpl/nm-device-bt.sgml
+docs/libnm-glib/tmpl/nm-device-bt.sgml.bak
+docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+docs/libnm-glib/tmpl/nm-device-ethernet.sgml.bak
+docs/libnm-glib/tmpl/nm-device-generic.sgml
+docs/libnm-glib/tmpl/nm-device-generic.sgml.bak
 docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml
 docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml.bak
+docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+docs/libnm-glib/tmpl/nm-device-infiniband.sgml.bak
+docs/libnm-glib/tmpl/nm-device-modem.sgml
+docs/libnm-glib/tmpl/nm-device-modem.sgml.bak
+docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml.bak
+docs/libnm-glib/tmpl/nm-device.sgml
+docs/libnm-glib/tmpl/nm-device.sgml.bak
+docs/libnm-glib/tmpl/nm-device-team.sgml
+docs/libnm-glib/tmpl/nm-device-team.sgml.bak
+docs/libnm-glib/tmpl/nm-device-vlan.sgml
+docs/libnm-glib/tmpl/nm-device-vlan.sgml.bak
+docs/libnm-glib/tmpl/nm-device-wifi.sgml
+docs/libnm-glib/tmpl/nm-device-wifi.sgml.bak
+docs/libnm-glib/tmpl/nm-device-wimax.sgml
+docs/libnm-glib/tmpl/nm-device-wimax.sgml.bak
+docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+docs/libnm-glib/tmpl/nm-dhcp4-config.sgml.bak
+docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+docs/libnm-glib/tmpl/nm-dhcp6-config.sgml.bak
+docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
+docs/libnm-glib/tmpl/nm-glib-enum-types.sgml.bak
+docs/libnm-glib/tmpl/nm-ip4-config.sgml
+docs/libnm-glib/tmpl/nm-ip4-config.sgml.bak
+docs/libnm-glib/tmpl/nm-ip6-config.sgml
+docs/libnm-glib/tmpl/nm-ip6-config.sgml.bak
+docs/libnm-glib/tmpl/nm-object.sgml
+docs/libnm-glib/tmpl/nm-object.sgml.bak
+docs/libnm-glib/tmpl/nm-remote-connection.sgml
+docs/libnm-glib/tmpl/nm-remote-connection.sgml.bak
+docs/libnm-glib/tmpl/nm-remote-settings.sgml
+docs/libnm-glib/tmpl/nm-remote-settings.sgml.bak
+docs/libnm-glib/tmpl/nm-secret-agent.sgml
+docs/libnm-glib/tmpl/nm-secret-agent.sgml.bak
+docs/libnm-glib/tmpl/nm-types.sgml
+docs/libnm-glib/tmpl/nm-types.sgml.bak
+docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+docs/libnm-glib/tmpl/nm-vpn-connection.sgml.bak
+docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
+docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml.bak
+docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+docs/libnm-glib/tmpl/nm-vpn-plugin.sgml.bak
+docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml.bak
+docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml.bak
+docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+docs/libnm-glib/tmpl/nm-wimax-nsp.sgml.bak
 docs/libnm-glib/tmpl.stamp
 docs/libnm-glib/xml/
 docs/libnm-glib/xml/annotation-glossary.xml
@@ -316,6 +383,8 @@ docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
 docs/libnm-util/tmpl/nm-setting-wireless-security.sgml.bak
 docs/libnm-util/tmpl/nm-setting-wireless.sgml
 docs/libnm-util/tmpl/nm-setting-wireless.sgml.bak
+docs/libnm-util/tmpl/nm-utils-enum-types.sgml
+docs/libnm-util/tmpl/nm-utils-enum-types.sgml.bak
 docs/libnm-util/tmpl/nm-utils.sgml
 docs/libnm-util/tmpl/nm-utils.sgml.bak
 docs/libnm-util/tmpl.stamp
diff --git a/makerepo.sh b/makerepo.sh
index 593f62f..b7581f9 100755
--- a/makerepo.sh
+++ b/makerepo.sh
@@ -7,9 +7,6 @@ die() {
 	exit 1
 }
 
-DIRNAME=NetworkManager-0.9.9.0
-
-
 if grep -q '^NAME="Red Hat Enterprise Linux' /etc/os-release ; then
     FEDPKG=rhpkg
 else
@@ -96,6 +93,8 @@ srcdir="$(dirname "$(readlink -f "$0")")"
 # generate the clean dir
 $FEDPKG prep || die "error while \`$FEDPKG prep\`"
 
+DIRNAME="$(basename "$(ls -1d NetworkManager-[0-9].*/ || die "could not find directory")")"
+
 pushd "$DIRNAME"
     git init .
     # if you have a local clone of NetworkManager, symlink
diff --git a/sources b/sources
index 8260f39..8eb94d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ab0cbb90e3dc585dcd8f7bd4c3f548d  NetworkManager-0.9.9.0.git20140131.5d6a5f8.tar.bz2
+6de82ce402c6d5a36bd9dc828369cb9f  NetworkManager-0.9.9.1.git20140228.16bbc90.tar.bz2

More information about the scm-commits mailing list