Update to git snapshot

This commit is contained in:
Dan Williams 2010-08-31 17:54:20 -05:00
parent f732a55d63
commit c52f751c04
3 changed files with 27 additions and 15 deletions

View File

@ -7,8 +7,8 @@
%define libnl_version 1.1 %define libnl_version 1.1
%define ppp_version 2.4.5 %define ppp_version 2.4.5
%define snapshot .git20100818 %define snapshot .git20100831
%define applet_snapshot .git20100817 %define applet_snapshot .git20100831
%define realversion 0.8.1 %define realversion 0.8.1
%define use_systemd 0 %define use_systemd 0
@ -20,7 +20,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.8.1 Version: 0.8.1
Release: 5%{snapshot}%{?dist} Release: 6%{snapshot}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
@ -188,7 +188,10 @@ make %{?_smp_mflags}
pushd network-manager-applet-%{realversion} pushd network-manager-applet-%{realversion}
autoreconf -i autoreconf -i
intltoolize --force intltoolize --force
%configure --disable-static --enable-more-warnings=yes %configure \
--disable-static \
--with-bluetooth \
--enable-more-warnings=yes
make %{?_smp_mflags} make %{?_smp_mflags}
popd popd
@ -411,6 +414,14 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/* %{_datadir}/gtk-doc/html/libnm-util/*
%changelog %changelog
* Tue Aug 31 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-6
- core: add dispatcher events on DHCPv4 and DHCPv6 lease changes
- core: enforce access permissions when enabling/disabling WiFi and WWAN (rh #626337)
- core: listen for UPower suspend/resume signals
- applet: fix disabled Enable Networking and Enable Wireless menu items (rh #627365)
- applet: updated translations
- applet: obscure Mobile Broadband PIN in secondary unlock dialog
* Wed Aug 18 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-5 * Wed Aug 18 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-5
- core: fix some systemd interaction issues - core: fix some systemd interaction issues

View File

@ -13,15 +13,16 @@ diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix
libglade-2.0 libglade-2.0
gmodule-export-2.0 gmodule-export-2.0
@@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR) @@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
dnl Check for gnome-bluetooth AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH, PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gconf-2.0 gconf-2.0
- gnome-bluetooth-1.0 >= 2.27.6 - gnome-bluetooth-1.0 >= 2.27.6
- libnm-util >= 0.8.1 - libnm-util >= 0.8.1
- libnm-glib >= 0.8.1, - libnm-glib >= 0.8.1,
+ gnome-bluetooth-1.0 >= 2.27.6, + gnome-bluetooth-1.0 >= 2.27.6,
have_gbt=yes, have_gbt=no) have_gbt=yes, have_gbt=no)
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") ;;
esac
diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am
--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400

View File

@ -1,2 +1,2 @@
5faff7a57d405d501063ad94bdae81e1 network-manager-applet-0.8.1.git20100817.tar.bz2 43c0b014895dc78e0ea9c86aa917b427 network-manager-applet-0.8.1.git20100831.tar.bz2
186bf3a9ba47bffe7cea80283156427a NetworkManager-0.8.1.git20100818.tar.bz2 23b3f273d4e24bd6b117617b6fd89861 NetworkManager-0.8.1.git20100831.tar.bz2