rpms/network-manager-netbook/devel network-manager-netbook-full-desktop.patch, 1.1, 1.2 network-manager-netbook.spec, 1.10, 1.11 nmn-desktop.patch, 1.2, NONE
Peter Robinson
pbrobinson at fedoraproject.org
Fri Dec 4 05:29:12 UTC 2009
Author: pbrobinson
Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10189
Modified Files:
network-manager-netbook-full-desktop.patch
network-manager-netbook.spec
Removed Files:
nmn-desktop.patch
Log Message:
- Update n-m-n desktop file patch
network-manager-netbook-full-desktop.patch:
Makefile.am | 7 +++++--
configure.in | 1 +
network-manager-netbook.desktop | 8 --------
network-manager-netbook.desktop.in.in | 8 ++++++++
4 files changed, 14 insertions(+), 10 deletions(-)
Index: network-manager-netbook-full-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook-full-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- network-manager-netbook-full-desktop.patch 26 Aug 2009 22:37:46 -0000 1.1
+++ network-manager-netbook-full-desktop.patch 4 Dec 2009 05:29:11 -0000 1.2
@@ -1,7 +1,6 @@
-diff -Nru network-manager-netbook.git/configure.in network-manager-netbook/configure.in
---- network-manager-netbook.git/configure.in 2009-08-07 14:08:31.266337000 -0400
-+++ network-manager-netbook/configure.in 2009-08-11 20:58:54.215576000 -0400
-@@ -31,6 +31,7 @@
+--- network-manager-netbook-1.3.1/configure.in.orig 2009-11-17 12:56:44.000000000 +0000
++++ network-manager-netbook-1.3.1/configure.in 2009-12-04 02:18:06.000000000 +0000
+@@ -36,6 +36,7 @@
icons/32/Makefile
icons/48/Makefile
po/Makefile.in
@@ -9,9 +8,8 @@ diff -Nru network-manager-netbook.git/co
src/marshallers/Makefile
src/gconf-helpers/Makefile
src/wireless-security/Makefile
-diff -Nru network-manager-netbook.git/Makefile.am network-manager-netbook/Makefile.am
---- network-manager-netbook.git/Makefile.am 2009-08-07 14:08:31.256338000 -0400
-+++ network-manager-netbook/Makefile.am 2009-08-11 21:20:16.753452000 -0400
+--- network-manager-netbook-1.3.1/Makefile.am.orig 2009-11-17 12:56:44.000000000 +0000
++++ network-manager-netbook-1.3.1/Makefile.am 2009-12-04 02:20:25.000000000 +0000
@@ -1,7 +1,9 @@
SUBDIRS = icons src po
@@ -21,18 +19,28 @@ diff -Nru network-manager-netbook.git/Ma
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
- EXTRA_DIST = \
- $(autostart_DATA) \
-@@ -9,5 +11,5 @@
- intltool-merge.in \
- intltool-update.in
-
--DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-+DISTCLEANFILES = intltool-extract intltool-merge intltool-update network-manager-netbook.desktop
-
-diff -Nru network-manager-netbook.git/network-manager-netbook.desktop network-manager-netbook/network-manager-netbook.desktop
---- network-manager-netbook.git/network-manager-netbook.desktop 2009-08-07 14:08:31.435337000 -0400
-+++ network-manager-netbook/network-manager-netbook.desktop 1969-12-31 19:00:00.000000000 -0500
+ servicedir = $(datadir)/dbus-1/services
+ service_in_files = org.moblin.UX.Shell.Panels.network.service.in
+@@ -31,4 +33,5 @@
+ intltool-extract \
+ intltool-merge \
+ intltool-update \
+- network-manager-netbook.css
++ network-manager-netbook.css \
++ network-manager-netbook.desktop
+--- /dev/null 2009-12-03 02:30:01.379397882 +0000
++++ network-manager-netbook-1.3.1/network-manager-netbook.desktop.in.in 2009-12-04 02:18:06.000000000 +0000
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++_Name=network-manager-netbook
++_Comment=Control your network connections
++Icon=nm-device-wireless
++Exec=/usr/libexec/network-manager-netbook
++Terminal=false
++Type=Application
++OnlyShowIn=MOBLIN;
+--- network-manager-netbook-1.3.1/network-manager-netbook.desktop 2009-11-17 12:56:44.000000000 +0000
++++ network-manager-netbook-1.3.1/network-manager-netbook.desktop 2009-12-04 02:20:25.000000000 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-_Name=network-manager-netbook
@@ -42,24 +50,3 @@ diff -Nru network-manager-netbook.git/ne
-Terminal=false
-Type=Application
-X-GNOME-Autostart-enabled=true
-diff -Nru network-manager-netbook.git/network-manager-netbook.desktop.in.in network-manager-netbook/network-manager-netbook.desktop.in.in
---- network-manager-netbook.git/network-manager-netbook.desktop.in.in 1969-12-31 19:00:00.000000000 -0500
-+++ network-manager-netbook/network-manager-netbook.desktop.in.in 2009-08-07 14:08:31.435337000 -0400
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+_Name=network-manager-netbook
-+_Comment=Control your network connections
-+Icon=nm-device-wireless
-+Exec=network-manager-netbook
-+Terminal=false
-+Type=Application
-+OnlyShowIn=MOBLIN;
-+X-GNOME-Autostart-enabled=true
-diff -Nru network-manager-netbook.git/po/POTFILES.in network-manager-netbook/po/POTFILES.in
---- network-manager-netbook.git/po/POTFILES.in 2009-08-07 14:08:31.444337000 -0400
-+++ network-manager-netbook/po/POTFILES.in 2009-08-11 21:19:53.634046000 -0400
-@@ -1,3 +1,4 @@
-+network-manager-netbook.desktop.in
- src/nbtk-gtk-light-switch.c
- src/nmn-item.c
- src/network-manager-netbook.ui
Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- network-manager-netbook.spec 30 Nov 2009 00:37:53 -0000 1.10
+++ network-manager-netbook.spec 4 Dec 2009 05:29:12 -0000 1.11
@@ -7,15 +7,14 @@
Name: network-manager-netbook
Version: 1.3.1
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
Summary: Moblin Netbook GUI for NetworkManger
Group: Applications/Internet
License: GPLv2
URL: http://projects.gnome.org/NetworkManager/
Source0: %{tarfile}
-#Patch0: network-manager-netbook-full-desktop.patch
-Patch1: nmn-desktop.patch
+Patch0: network-manager-netbook-full-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
@@ -44,8 +43,7 @@ NetworkManager to connect to wired, wire
%prep
%setup -q
-#%patch0 -p1 -b .fixdesktop
-%patch1 -p1 -b .desktop
+%patch0 -p1 -b .fixdesktop
# Don't run configure from autogen.sh
NOCONFIGURE=true ./autogen.sh
@@ -90,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/icons/hicolor/48x48/apps/nm-*
%changelog
+* Fri Dec 4 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.6
+- Update n-m-n desktop file patch
+
* Sun Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.5
- Add patch to fix starting on other DE.
--- nmn-desktop.patch DELETED ---
More information about the fedora-extras-commits
mailing list