diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 120c099..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xwxapt
-# $Id: Makefile,v 1.1 2009/01/15 20:43:32 kevin Exp $
-NAME := xwxapt
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index aab4b88..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-xwxapt-1_2-1_fc10:HEAD:xwxapt-1.2-1.fc10.src.rpm:1232073671
diff --git a/sources b/sources
index f276e93..c4d6f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2ffcd25fc79a64266e52c558d96521f  xwxapt-1.2.tar.gz
+778a5da3af70d95312f2dc8ab02799a7  xwxapt-2.0-beta.tar.bz2
diff --git a/xwxapt.desktop b/xwxapt.desktop
index 42ce3a2..01b487b 100644
--- a/xwxapt.desktop
+++ b/xwxapt.desktop
@@ -1,3 +1,4 @@
+
 [Desktop Entry]
 Encoding=UTF-8
 Name=xwxapt
@@ -7,5 +8,6 @@ Exec=xwxapt
 Icon=xwxapt.png
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=Network;HamRadio;
 Version=1.0
+X-Desktop-File-Install-Version=0.15
diff --git a/xwxapt.spec b/xwxapt.spec
index 9395d6f..75c60ee 100644
--- a/xwxapt.spec
+++ b/xwxapt.spec
@@ -1,12 +1,12 @@
 Name:           xwxapt
-Version:        1.2
-Release:        3%{?dist}
+Version:        2.0
+#Beta
+Release:        1.beta%{?dist}
 Summary:        GTK+ graphical application for decoding and saving weather images
-
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://5b4az.chronos.org.uk/pages/apt.html
-Source0:        http://5b4az.chronos.org.uk/pkg/apt/xwxapt/%{name}-%{version}.tar.gz
+Source0:        http://5b4az.chronos.org.uk/pkg/apt/xwxapt/%{name}-%{version}-beta.tar.bz2
 #add .desktop file
 Source1:        %{name}.desktop
 #temporary Icon
@@ -15,8 +15,13 @@ Source2:        %{name}.png
 Source3:        %{name}.sh.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake, autoconf, gtk2-devel, desktop-file-utils
-#Requires:       
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  gtk2-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:	alsa-lib-devel
+
+Requires:	alsa-lib
 
 %description
 xwxapt is a GTK+ graphical version of wxapt. It uses the same decoding
@@ -29,12 +34,10 @@ sync status etc) and text messages as it runs.
 %prep
 %setup -qn %{name}
 
-
 %build
 ./autogen.sh
-%configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" 
-
+%configure LDFLAGS="-lm"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PACKAGE_LIBS="$PACKAGE_LIBS -lm"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -50,7 +53,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin
 #install wrapper script 
 install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xwxapt
 
-
 # no upstream .desktop or icon yet so we'll use a temporary one
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
 cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
@@ -61,41 +63,37 @@ desktop-file-install  \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README
 %doc doc/xwxapt.html
 %{_bindir}/*
 %{_libexecdir}/*
-%{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
 
-
-
 %changelog
+* Fri Apr 30 2010 Randall J. Berry 'Dp67' <dp67@fedoraproject.org> 2.0-1
+- Upstream upgrade 2.0.Beta
+- Fix .desktop file incude Network;
+- BZ 525292 Audio setup error.
+* Thu Apr 22 2010 Jon Ciesla <limb@jcomserv.net> - 1.2-4
+- Fix for libm DSO Linking FTBFS, BZ 564864.
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67@fedoraproject.org> 1.2-1
 - Upstream upgrade to 1.2
 - Mock build f9/f10/devel
 - check rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.
 - submit for review
-
-
 * Mon Jan 12 2009 Randall J. Berry 'Dp67' <dp67@fedoraproject.org> 1.1-2
 - Mock build f9/f10/devel
 - check rpmlint
-
-
 * Sun Sep 21 2008 Randall J. Berry 'Dp67' <dp67@fedoraproject.org> 1.1-1
 - Upstream upgrade to 1.1
 - Build test for f9
-
 * Sun Mar 02 2008 Sindre Pedersen Bjordal <sindrepb@fedoraproject.org> - 0.9-1
 - Initial build