Hello community, here is the log from the commit of package NetworkManager checked in at Fri Feb 9 17:01:56 CET 2007. -------- --- NetworkManager/NetworkManager.changes 2007-01-30 13:57:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2007-02-09 13:26:27.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 9 13:25:44 CET 2007 - sbrabec@suse.cz + +- Removed remaining references to /opt/gnome (#243824). +- Build with libnotify. +- Spec file cleanup. + +------------------------------------------------------------------- Old: ---- nm-222329.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.p13572/_old 2007-02-09 17:01:14.000000000 +0100 +++ /var/tmp/diff_new_pack.p13572/_new 2007-02-09 17:01:14.000000000 +0100 @@ -11,9 +11,12 @@ # norootforbuild Name: NetworkManager -BuildRequires: dbus-1-devel dbus-1-glib dhcdbd gconf2-devel gnome-icon-theme gnome-keyring-devel gnome-panel-devel gnome-patch-translation hal-devel intltool iproute2 libgcrypt-devel libglade2-devel libgpg-error-devel libnl-devel libtool perl-XML-Parser update-desktop-files wireless-tools wpa_supplicant -%define gnome_datadir %{_datadir} -%define gnome_bindir %{_bindir} +BuildRequires: dhcdbd gconf2-devel gnome-icon-theme gnome-keyring-devel gnome-panel-devel gnome-patch-translation hal-devel intltool iproute2 libgcrypt-devel libglade2-devel libgpg-error-devel libnl-devel libnotify-devel libtool wireless-tools wpa_supplicant +%if %suse_version > 1010 +Requires: dbus-1-glib-devel +%else +Requires: dbus-1-devel dbus-1-glib +%endif %define dbus_version 0.60-22 %define hal_version 0.5.0 %define wireless_version 28pre13-6 @@ -30,7 +33,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.4 -Release: 61 +Release: 63 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -47,9 +50,8 @@ Patch8: nm-fallback.patch Patch9: nm-applet-disconnect-on-exit.patch Patch10: nm-dbus-request-name-flags-fix-thoenig-01.patch -Patch11: nm-222329.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: sysconfig >= %{sysconfig_version} +PreReq: sysconfig >= %{sysconfig_version} /usr/bin/sed Recommends: %{name}-client Requires: wireless-tools >= %{wireless_version} Requires: dbus-1 >= %{dbus_version} @@ -158,37 +160,26 @@ %patch8 -p1 %patch9 -p1 %patch10 -p0 -%patch11 -p0 gnome-patch-translation-update %build sed -i s/" --sm-disable"// nm-applet.desktop intltoolize --force autoreconf -CFLAGS="$RPM_OPT_FLAGS -fPIC" \ -./configure --prefix=/usr \ - --datadir=%{gnome_datadir} \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libdir} \ - --sysconfdir=%{_sysconfdir} \ - --includedir=%{_includedir} \ - --localstatedir=%{_localstatedir} \ - --mandir=%{_mandir} \ - --with-gcrypt=yes \ +%configure\ + --libexecdir=%{_prefix}/lib/NetworkManager\ + --with-gcrypt=yes\ --with-distro=suse -make +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %find_lang %{name} -cp -r ../nm-icons/* $RPM_BUILD_ROOT%{gnome_datadir}/icons/hicolor/ +cp -r ../nm-icons/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ cp test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ cp test/nm-online $RPM_BUILD_ROOT%{_bindir}/ -cp %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/ -cp %{SOURCE3} $RPM_BUILD_ROOT%{gnome_datadir}/NetworkManager/ +install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/ +cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/NetworkManager/ %clean rm -rf $RPM_BUILD_ROOT @@ -196,9 +187,9 @@ %post %run_ldconfig if [ "$1" = 1 ]; then - if grep "network_manager.*always" /etc/YaST2/ProductFeatures &> /dev/null; then - sed -i '/^NETWORKMANAGER=.*no/s/no/yes/' /etc/sysconfig/network/config - sed -i '/^NM_DISPATCHER=.*no/s/no/yes/' /etc/sysconfig/network/config + if grep "network_manager.*always" etc/YaST2/ProductFeatures &> /dev/null; then + sed -i '/^NETWORKMANAGER=.*no/s/no/yes/' etc/sysconfig/network/config + sed -i '/^NM_DISPATCHER=.*no/s/no/yes/' etc/sysconfig/network/config fi fi @@ -206,75 +197,44 @@ %run_ldconfig %files -f %{name}.lang -%defattr(-,root,root,0755) +%defattr(-,root,root) %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO -%attr(0644,root,root) %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf -%dir %{_sysconfdir}/NetworkManager -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/nfs +%{_bindir}/nm-[ot]* +%{_libdir}/libnm-util.so.* +%{_datadir}/NetworkManager %dir %attr(0700,root,root) %{_localstatedir}/run/NetworkManager -%{_mandir}/man1/NetworkManager.1.gz -%{_mandir}/man1/NetworkManagerDispatcher.1.gz -%{_mandir}/man1/nm-tool.1.gz -%attr(0755,root,root) %{_sbindir}/NetworkManager -%attr(0755,root,root) %{_sbindir}/NetworkManagerDispatcher -%attr(0755,root,root) %{_bindir}/nm-tool -%attr(0755,root,root) %{_bindir}/nm-online -%attr(0755,root,root) %{_libdir}/nm-crash-logger -%{_libdir}/libnm-util.so.0 -%{_libdir}/libnm-util.so.0.0.0 -%dir %{gnome_datadir}/NetworkManager -%{gnome_datadir}/NetworkManager/gdb-cmd -%{gnome_datadir}/NetworkManager/nm-disconnect-wireless-on-exit.sh +%doc %{_mandir}/man1/*.* +%{_prefix}/lib/NetworkManager +%{_sbindir}/* +%{_sysconfdir}/dbus-1/system.d/NetworkManager.conf +%{_sysconfdir}/NetworkManager %files gnome -%defattr(-,root,root,0755) -%attr(0755,root,root) %{_bindir}/nm-applet -%attr(0755,root,root) %{_bindir}/nm-vpn-properties -%attr(0644,root,root) %{_sysconfdir}/dbus-1/system.d/nm-applet.conf -%attr(0644,root,root) %{gnome_datadir}/gnome/autostart/nm-applet.desktop -%dir %{gnome_datadir}/nm-applet -%{gnome_datadir}/nm-applet/keyring.png -%{gnome_datadir}/nm-applet/applet.glade -%{gnome_datadir}/icons/hicolor/16x16/apps/*.png -%{gnome_datadir}/icons/hicolor/22x22/apps/*.png -%{gnome_datadir}/icons/hicolor/48x48/apps/*.png -%dir %{gnome_datadir}/gnome-vpn-properties -%{gnome_datadir}/gnome-vpn-properties/nm-vpn-properties.glade -# FIXME: Directory ownership of this directory: -%dir %{gnome_datadir}/gnome/autostart +%defattr(-,root,root) +%{_bindir}/nm-applet +%{_bindir}/nm-vpn-properties +%{_datadir}/gnome/autostart/nm-applet.desktop +%{_datadir}/nm-applet +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/gnome-vpn-properties +%{_sysconfdir}/dbus-1/system.d/nm-applet.conf %files devel -%defattr(-,root,root,0755) -%{_libdir}/pkgconfig/NetworkManager.pc -%{_libdir}/pkgconfig/libnm_glib.pc -%{_libdir}/pkgconfig/libnm-util.pc -%{_libdir}/libnm_glib.so -%{_libdir}/libnm_glib.a -%{_libdir}/libnm_glib.la -%{_libdir}/libnm-util.so -%{_libdir}/libnm-util.a -%{_libdir}/libnm-util.la -%dir %{_includedir}/NetworkManager -%{_includedir}/NetworkManager/NetworkManager.h -%{_includedir}/NetworkManager/libnm_glib.h -%{_includedir}/NetworkManager/nm-vpn-ui-interface.h -%{_includedir}/NetworkManager/NetworkManagerVPN.h -%{_includedir}/NetworkManager/cipher-wep-ascii.h -%{_includedir}/NetworkManager/cipher-wep-hex.h -%{_includedir}/NetworkManager/cipher-wep-passphrase.h -%{_includedir}/NetworkManager/cipher-wpa-psk-hex.h -%{_includedir}/NetworkManager/cipher-wpa-psk-passphrase.h -%{_includedir}/NetworkManager/cipher.h -%{_includedir}/NetworkManager/dbus-helpers.h -%{_includedir}/NetworkManager/dbus-method-dispatcher.h +%defattr(-,root,root) +%{_includedir}/NetworkManager +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc %files glib -%defattr(-,root,root,0755) -%{_libdir}/libnm_glib.so.0 -%{_libdir}/libnm_glib.so.0.0.0 +%defattr(-,root,root) +%{_libdir}/libnm_glib.so.* %changelog -n NetworkManager +* Fri Feb 09 2007 - sbrabec@suse.cz +- Removed remaining references to /opt/gnome (#243824). +- Build with libnotify. +- Spec file cleanup. * Tue Jan 30 2007 - sbrabec@suse.cz - Changed GNOME prefix to /usr. * Mon Nov 20 2006 - tambet@suse.de ++++++ nm-configure-networking-rml.patch ++++++ --- /var/tmp/diff_new_pack.p13572/_old 2007-02-09 17:01:15.000000000 +0100 +++ /var/tmp/diff_new_pack.p13572/_new 2007-02-09 17:01:15.000000000 +0100 @@ -15,7 +15,7 @@ +static gboolean nma_run_yast (GtkWidget *info_dialog) { - GtkWidget *info_dialog; -+ char *argv[] = { "/opt/gnome/bin/gnomesu", "/sbin/yast2", "lan", NULL }; ++ char *argv[] = { "/usr/bin/gnomesu", "/sbin/yast2", "lan", NULL }; + GError *err = NULL; - info_dialog = glade_xml_get_widget (applet->info_dialog_xml, "info_dialog"); @@ -60,8 +60,8 @@ +static void nma_config_dialup_cb (GtkMenu *item, gpointer data) +{ -+ char *modem_argv[] = { "/opt/gnome/bin/gnomesu", "/sbin/yast2", "modem", NULL }; -+ char *isdn_argv[] = { "/opt/gnome/bin/gnomesu", "/sbin/yast2", "isdn", NULL }; ++ char *modem_argv[] = { "/usr/bin/gnomesu", "/sbin/yast2", "modem", NULL }; ++ char *isdn_argv[] = { "/usr/bin/gnomesu", "/sbin/yast2", "isdn", NULL }; + char **argv; + gboolean modem = (gboolean) data; + GError *err = NULL; ++++++ nm-disconnect-wireless-on-exit.sh ++++++ --- NetworkManager/nm-disconnect-wireless-on-exit.sh 2006-11-12 22:24:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager/nm-disconnect-wireless-on-exit.sh 2007-02-09 12:02:03.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -GCONF_TOOL=/opt/gnome/bin/gconftool-2 +GCONF_TOOL=/usr/bin/gconftool-2 GCONF_PATH=/apps/NetworkManagerApplet/disconnect_wireless_on_exit if test "x$1" == "x"; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org