rpms/network-manager-netbook/F-12 .cvsignore, 1.2, 1.3 network-manager-netbook.spec, 1.3, 1.4 sources, 1.2, 1.3

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5847

Modified Files:
	.cvsignore network-manager-netbook.spec sources 
Log Message:
- Git snapshot of the NM-0.8 port.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Aug 2009 22:37:46 -0000	1.2
+++ .cvsignore	1 Oct 2009 18:32:16 -0000	1.3
@@ -1 +1 @@
-network-manager-netbook-1.2.tar.bz2
+network-manager-netbook-1.3.1.tar.bz2


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/F-12/network-manager-netbook.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- network-manager-netbook.spec	31 Aug 2009 14:14:01 -0000	1.3
+++ network-manager-netbook.spec	1 Oct 2009 18:32:16 -0000	1.4
@@ -1,22 +1,20 @@
 # Tarfile created using git
 # git clone git://git.gnome.org/network-manager-netbook
+# git checkout -b MplPanelClient origin/MplPanelClient
 # git archive --format=tar --prefix=network-manager-netbook-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
-%define git_version 926dfeb
+%define git_version a0ae2ea
 %define tarfile %{name}-%{version}.tar.bz2
 
 Name:           network-manager-netbook
-Version:        1.2
-Release:        6%{?dist}
+Version:        1.3.1
+Release:        0.1%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
-#License has been confirmed by maintainer. Will fix upstream.
 License:        GPLv2
 URL:            http://projects.gnome.org/NetworkManager/
 Source0:        %{tarfile}
-Source1:        COPYING
-Patch0:         network-manager-netbook-full-desktop.patch
-Patch1:         nmn-fixNMdetect.patch
+#Patch0:         network-manager-netbook-full-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -25,8 +23,10 @@ BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libnotify-devel
 BuildRequires: mobile-broadband-provider-info-devel
+BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
 BuildRequires: NetworkManager-glib-devel
+BuildRequires: wireless-tools-devel
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
 
@@ -43,12 +43,7 @@ NetworkManager to connect to wired, wire
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixdesktop
-%patch1 -p1 -b .fixNMdetect
-
-#Copy license files until upstream fixes them in git
-rm -f $RPM_BUILD_DIR/%{name}-%{version}/COPYING
-cp %{SOURCE1} $RPM_BUILD_DIR/%{name}-%{version}
+#%patch0 -p1 -b .fixdesktop
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -64,6 +59,8 @@ make install DESTDIR=%{buildroot} INSTAL
 # Issues with this due to MOBLIN autostart value not recognised by Fedora's d-f-u
 #desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -79,7 +76,7 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_sysconfdir}/xdg/autostart/network-manager-netbook.desktop
@@ -90,6 +87,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Thu Oct  1 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.1
+- Git snapshot of the NM-0.8 port.
+
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.3-1
+- Update to 1.3 upstream release. Cleanup spec from upstreamed fixes
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-6
 - Add patch for detection of new NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Aug 2009 22:37:46 -0000	1.2
+++ sources	1 Oct 2009 18:32:16 -0000	1.3
@@ -1 +1 @@
-e45589dde04728029f0afa616af6fed3  network-manager-netbook-1.2.tar.bz2
+59a98ba7dcdd24bb1306d1cd97cba389  network-manager-netbook-1.3.1.tar.bz2