- Update to pre-0.6.5 snapshot
This commit is contained in:
Daniel Williams
parent
dbe9cce746
commit
55a16fd966
|
|
@ -3,3 +3,5 @@ NetworkManager-0.7.0.cvs20060521.tar.gz
|
|||
NetworkManager-0.7.0.cvs20060529.tar.gz
|
||||
NetworkManager-0.6.4.cvs20060829.tar.gz
|
||||
NetworkManager-0.6.5.cvs20061025.tar.gz
|
||||
NetworkManager-0.6.5.svn2474.tar.gz
|
||||
nm-applet-0.6.5.svn63.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
--- NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am.buildfix 2007-02-02 10:53:26.000000000 -0500
|
||||
+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am 2007-02-09 14:13:47.000000000 -0500
|
||||
@@ -2,6 +2,9 @@
|
||||
|
||||
bin_PROGRAMS = nm-applet
|
||||
|
||||
+INCLUDES = -I${top_srcdir}/../include \
|
||||
+ -I${top_srcdir}/../libnm-util
|
||||
+
|
||||
nm_applet_CPPFLAGS = \
|
||||
$(DBUS_CFLAGS) \
|
||||
$(GTHREAD_CFLAGS) \
|
||||
@@ -12,7 +15,6 @@
|
||||
$(GCONF_CFLAGS) \
|
||||
$(LIBGNOMEUI_CFLAGS) \
|
||||
$(GNOME_KEYRING_CFLAGS) \
|
||||
- $(NM_CFLAGS) \
|
||||
-DICONDIR=\""$(datadir)/icons"\" \
|
||||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DBINDIR=\""$(bindir)"\" \
|
||||
@@ -112,7 +114,7 @@
|
||||
$(GCONF_LIBS) \
|
||||
$(LIBGNOMEUI_LIBS) \
|
||||
$(GNOME_KEYRING_LIBS) \
|
||||
- $(NM_LIBS) \
|
||||
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
||||
$(NULL)
|
||||
|
||||
if WITH_NOTIFY
|
||||
--- NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac.buildfix 2007-02-02 16:47:00.000000000 -0500
|
||||
+++ NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac 2007-02-09 14:06:09.000000000 -0500
|
||||
@@ -112,10 +112,6 @@
|
||||
AC_SUBST(GOBJECT_CFLAGS)
|
||||
AC_SUBST(GOBJECT_LIBS)
|
||||
|
||||
-PKG_CHECK_MODULES(NM, NetworkManager)
|
||||
-AC_SUBST(NM_CFLAGS)
|
||||
-AC_SUBST(NM_LIBS)
|
||||
-
|
||||
AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto)
|
||||
|
||||
PKG_CHECK_MODULES(GTK, gtk+-2.0)
|
||||
|
|
@ -1,24 +1,7 @@
|
|||
ExcludeArch: s390 s390x
|
||||
|
||||
%define hal_version 0.5.0
|
||||
|
||||
%if "%fedora" == "5"
|
||||
%define fc6_or_later 0
|
||||
%endif
|
||||
%if "%fedora" >= "6"
|
||||
%define fc6_or_later 1
|
||||
%endif
|
||||
%if "%rhel" >= "5"
|
||||
%define fc6_or_later 1
|
||||
%endif
|
||||
|
||||
%if %{fc6_or_later}
|
||||
%define dbus_version 0.90
|
||||
%define dbus_glib_version 0.70
|
||||
%else
|
||||
%define dbus_version 0.61
|
||||
%define dbus_glib_version 0.61
|
||||
%endif
|
||||
|
||||
%define gtk2_version 2.6.0
|
||||
%define wireless_tools_version 1:28-0pre9
|
||||
|
|
@ -27,13 +10,14 @@ Name: NetworkManager
|
|||
Summary: Network connection manager and user applications
|
||||
Epoch: 1
|
||||
Version: 0.6.5
|
||||
Release: 0.3.cvs20061025%{?dist}
|
||||
Release: 0.4.svn2474%{?dist}
|
||||
Group: System Environment/Base
|
||||
License: GPL
|
||||
URL: http://www.gnome.org/projects/NetworkManager/
|
||||
Source: %{name}-%{version}.cvs20061025.tar.gz
|
||||
Patch0: dbus1.patch
|
||||
Patch1: NetworkManager-0.6.4-DbusLimitExceeded.patch
|
||||
Source: %{name}-%{version}.svn2474.tar.gz
|
||||
Source1: nm-applet-0.6.5.svn63.tar.gz
|
||||
Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
|
||||
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
PreReq: chkconfig
|
||||
|
|
@ -47,13 +31,8 @@ Requires: dhclient >= 3.0.2-12
|
|||
Requires: wpa_supplicant
|
||||
|
||||
BuildRequires: dbus-devel >= %{dbus_version}
|
||||
%if %{fc6_or_later}
|
||||
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
||||
BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
|
||||
%else
|
||||
BuildRequires: wireless-tools >= %{wireless_tools_version}
|
||||
BuildRequires: dbus-glib >= %{dbus_glib_version}
|
||||
%endif
|
||||
BuildRequires: hal-devel >= %{hal_version}
|
||||
BuildRequires: glib2-devel gtk2-devel
|
||||
BuildRequires: libglade2-devel
|
||||
|
|
@ -69,6 +48,7 @@ BuildRequires: wpa_supplicant
|
|||
BuildRequires: libnl-devel
|
||||
BuildRequires: libnotify-devel >= 0.3
|
||||
BuildRequires: perl-XML-Parser
|
||||
BuildRequires: automake autoconf
|
||||
|
||||
%description
|
||||
NetworkManager attempts to keep an active network connection available at all
|
||||
|
|
@ -134,26 +114,50 @@ NetworkManager functionality from applications that use glib.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-0.6.4
|
||||
%patch0 -p1 -b .dbus1
|
||||
%patch1 -p1 -b .DbusLimitExceeded
|
||||
%setup -q
|
||||
%patch0 -p1 -b .startup-dhcdbd
|
||||
|
||||
# unpack the applet
|
||||
tar -xzf %{SOURCE1}
|
||||
%patch1 -p1 -b .buildfix
|
||||
|
||||
%build
|
||||
# Even though we don't require named, we still build with it
|
||||
# so that if the user installs it, NM will use it automatically
|
||||
%configure \
|
||||
--disable-static \
|
||||
--enable-notify=yes \
|
||||
--with-named=/usr/sbin/named \
|
||||
--with-named-dir=/var/named/data \
|
||||
--with-named-user=named
|
||||
make
|
||||
|
||||
|
||||
# build the applet
|
||||
pushd nm-applet-0.6.5
|
||||
automake
|
||||
autoconf
|
||||
%configure \
|
||||
--disable-static \
|
||||
--with-notify \
|
||||
--with-named=/usr/sbin/named \
|
||||
--with-named-dir=/var/named/data \
|
||||
--with-named-user=named
|
||||
make
|
||||
popd
|
||||
|
||||
%install
|
||||
%{__rm} -rf $RPM_BUILD_ROOT
|
||||
|
||||
# install NM
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
# install the applet
|
||||
pushd nm-applet-0.6.5
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
popd
|
||||
|
||||
%find_lang %{name}
|
||||
%find_lang nm-applet
|
||||
cat nm-applet.lang >> %{name}.lang
|
||||
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
%{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
|
||||
|
||||
|
|
@ -194,22 +198,20 @@ fi
|
|||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,0755)
|
||||
%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
|
||||
%dir %{_sysconfdir}/NetworkManager/
|
||||
%dir %{_sysconfdir}/NetworkManager/dispatcher.d/
|
||||
%config %{_sysconfdir}/dbus-1/system.d/%{name}.conf
|
||||
%config %{_sysconfdir}/rc.d/init.d/%{name}
|
||||
%config %{_sysconfdir}/rc.d/init.d/%{name}Dispatcher
|
||||
%config %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
|
||||
%config %{_sysconfdir}/rc.d/init.d/NetworkManager
|
||||
%config %{_sysconfdir}/rc.d/init.d/NetworkManagerDispatcher
|
||||
%{_sbindir}/%{name}
|
||||
%{_sbindir}/NetworkManagerDispatcher
|
||||
%dir %{_sysconfdir}/NetworkManager/
|
||||
%{_bindir}/nm-tool
|
||||
%{_libdir}/libnm-util.so.*
|
||||
%{_libdir}/libnm-util.so*
|
||||
%{_mandir}/man1/NetworkManager.1.gz
|
||||
%{_mandir}/man1/NetworkManagerDispatcher.1.gz
|
||||
%{_mandir}/man1/nm-tool.1.gz
|
||||
%dir %{_localstatedir}/run/%{name}
|
||||
%dir %{_localstatedir}/run/NetworkManager
|
||||
%{_prefix}/libexec/nm-crash-logger
|
||||
%dir %{_datadir}/%{name}
|
||||
%{_datadir}/%{name}/gdb-cmd
|
||||
%{_datadir}/NetworkManager/gdb-cmd
|
||||
|
||||
%files gnome
|
||||
%defattr(-,root,root,0755)
|
||||
|
|
@ -224,7 +226,6 @@ fi
|
|||
|
||||
%files devel
|
||||
%defattr(-,root,root,0755)
|
||||
%dir %{_includedir}/%{name}
|
||||
%{_includedir}/%{name}/*.h
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
%{_libdir}/pkgconfig/libnm-util.pc
|
||||
|
|
@ -241,6 +242,9 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 15 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.4.svn2474
|
||||
- Update to pre-0.6.5 snapshot
|
||||
|
||||
* Thu Feb 8 2007 Christopher Aillon <caillon@redhat.com> - 1:0.6.5-0.3.cvs20061025
|
||||
- Guard against D-Bus LimitExceeded messages
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue