diff options
author | Thomas Haller <thaller@redhat.com> | 2014-07-02 19:17:42 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2014-07-04 12:25:51 +0200 |
commit | 3cfd8b8eecce960ebb98488cfe51f62125ea8426 (patch) | |
tree | c2c1949a3896b86519a07df5bf9dde3d29ff2fb8 /contrib | |
parent | 8c113e4fc878325f02762f7737dc66d6ab905608 (diff) | |
download | NetworkManager-3cfd8b8eecce960ebb98488cfe51f62125ea8426.tar.gz |
contrib/rpm: add new package NetworkManager-config-connectivity-fedora
Provides config file 20-connectivity-fedora.conf
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/fedora/rpm/20-connectivity-fedora.conf | 4 | ||||
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 16 | ||||
-rwxr-xr-x | contrib/fedora/rpm/build.sh | 9 |
3 files changed, 26 insertions, 3 deletions
diff --git a/contrib/fedora/rpm/20-connectivity-fedora.conf b/contrib/fedora/rpm/20-connectivity-fedora.conf new file mode 100644 index 0000000000..7a31a4dc2b --- /dev/null +++ b/contrib/fedora/rpm/20-connectivity-fedora.conf @@ -0,0 +1,4 @@ +[connectivity] +uri=http://fedoraproject.org/static/hotspot.txt +response=OK + diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index f4b22e8c92..b1046064c2 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -81,6 +81,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: __SOURCE1__ Source1: NetworkManager.conf Source2: 00-server.conf +Source3: 20-connectivity-fedora.conf #Patch1: 0001-some.patch @@ -287,6 +288,15 @@ Requires: dbus-glib-devel >= %{dbus_glib_version} This package contains the header and pkg-config files for development applications using NetworkManager functionality from applications that use glib. +%package config-connectivity-fedora +Summary: NetworkManager config file for connectivity checking via Fedora servers +Group: System Environment/Base +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description config-connectivity-fedora +This adds a NetworkManager configuration file to enable connectivity checking +via Fedora infrastructure. + %package config-server Summary: NetworkManager config file for "server-like" defaults Group: System Environment/Base @@ -390,6 +400,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d +%{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d # create a VPN directory %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN @@ -574,6 +585,11 @@ fi %dir %{_datadir}/gtk-doc/html/libnm-util %{_datadir}/gtk-doc/html/libnm-util/* +%files config-connectivity-fedora +%defattr(-,root,root,0755) +%dir %{_sysconfdir}/%{name}/conf.d +%config %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf + %files config-server %defattr(-,root,root,0755) %dir %{_sysconfdir}/%{name}/conf.d diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh index 8a2c132e48..6b648f3db4 100755 --- a/contrib/fedora/rpm/build.sh +++ b/contrib/fedora/rpm/build.sh @@ -72,7 +72,8 @@ _SOURCE="$SOURCE" SOURCE="$(abs_path "$SOURCE" "$(ls -1 "$GITDIR/NetworkManager-$VERSION"*.tar* 2>/dev/null | head -n1)")" [[ -f "$SOURCE" ]] || die "could not find source ${_SOURCE:-$GITDIR/NetworkManager-$VERSION*.tar*} . Did you execute \`make dist\`? Otherwise set \$SOURCE variable" SOURCE_NETWORKMANAGER_CONF="$(abs_path "$SOURCE_NETWORKMANAGER_CONF" "$SCRIPTDIR/NetworkManager.conf")" -SOURCE_SERVER_CONF="$(abs_path "$SOURCE_SERVER_CONF" "$SCRIPTDIR/00-server.conf")" +SOURCE_CONFIG_SERVER="$(abs_path "$SOURCE_CONFIG_SERVER" "$SCRIPTDIR/00-server.conf")" +SOURCE_CONFIG_CONNECTIVITY_FEDORA="$(abs_path "$SOURCE_CONFIG_CONNECTIVITY_FEDORA" "$SCRIPTDIR/20-connectivity-fedora.conf")" TEMP="$(mktemp -d "$SCRIPTDIR/NetworkManager.$DATE.XXXXXX")" TEMPBASE="$(basename "$TEMP")" @@ -85,7 +86,8 @@ LOG "USERNAME=$USERNAME" LOG "SPECFILE=$SPECFILE" LOG "SOURCE=$SOURCE" LOG "SOURCE_NETWORKMANAGER_CONF=$SOURCE_NETWORKMANAGER_CONF" -LOG "SOURCE_SERVER_CONF=$SOURCE_SERVER_CONF" +LOG "SOURCE_CONFIG_SERVER=$SOURCE_CONFIG_SERVER" +LOG "SOURCE_CONFIG_CONNECTIVITY_FEDORA=$SOURCE_CONFIG_CONNECTIVITY_FEDORA" LOG "BASEDIR=$TEMP" ln -snf "$TEMPBASE" ./latest0 @@ -97,7 +99,8 @@ mkdir -p "$TEMP/SOURCES/" "$TEMP/SPECS/" || die "error creating SPECS directoy" cp "$SOURCE" "$TEMP/SOURCES/" || die "Could not copy source $SOURCE to $TEMP/SOURCES" cp "$SOURCE_NETWORKMANAGER_CONF" "$TEMP/SOURCES/NetworkManager.conf" || die "Could not copy source $SOURCE_NETWORKMANAGER_CONF to $TEMP/SOURCES" -cp "$SOURCE_SERVER_CONF" "$TEMP/SOURCES/00-server.conf" || die "Could not copy source $SOURCE_SERVER_CONF to $TEMP/SOURCES" +cp "$SOURCE_CONFIG_SERVER" "$TEMP/SOURCES/00-server.conf" || die "Could not copy source $SOURCE_CONFIG_SERVER to $TEMP/SOURCES" +cp "$SOURCE_CONFIG_CONNECTIVITY_FEDORA" "$TEMP/SOURCES/20-connectivity-fedora.conf" || die "Could not copy source $SOURCE_CONFIG_CONNECTIVITY_FEDORA to $TEMP/SOURCES" write_changelog |