diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..213949a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xwxapt-1.2.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0682988..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xwxapt
-# $Id$
-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 $$/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/sources b/sources
index e69de29..f276e93 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c2ffcd25fc79a64266e52c558d96521f  xwxapt-1.2.tar.gz
diff --git a/xwxapt.desktop b/xwxapt.desktop
new file mode 100644
index 0000000..42ce3a2
--- /dev/null
+++ b/xwxapt.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=xwxapt
+GenericName=xwxapt
+Comment=GTK+ graphical application for decoding and saving weather images
+Exec=xwxapt
+Icon=xwxapt.png
+Terminal=false
+Type=Application
+Categories=HamRadio;
+Version=1.0
diff --git a/xwxapt.png b/xwxapt.png
new file mode 100644
index 0000000..68d6cf1
Binary files /dev/null and b/xwxapt.png differ
diff --git a/xwxapt.sh.in b/xwxapt.sh.in
new file mode 100644
index 0000000..6117194
--- /dev/null
+++ b/xwxapt.sh.in
@@ -0,0 +1,15 @@
+#!/bin/sh
+#Wrapper script for xwxapt to ensure that user configuration is present
+xwxaptbin="/usr/libexec/xwxapt-bin"
+#check if user configuration is present
+if [ ! -e ~/xwxapt/xwxaptrc ]
+then
+echo "Creating user configuration file"
+mkdir ~/xwxapt
+mkdir ~/xwxapt/images
+mkdir ~/xwxapt/record
+cp /usr/share/xwxapt/xwxaptrc ~/xwxapt/xwxaptrc
+fi
+#launch xwxapt
+echo "Configuration can be found in the xwxapt/xwxaptrc file in your users home directory"
+$xwxaptbin
diff --git a/xwxapt.spec b/xwxapt.spec
new file mode 100644
index 0000000..0fa5452
--- /dev/null
+++ b/xwxapt.spec
@@ -0,0 +1,95 @@
+Name:           xwxapt
+Version:        1.2
+Release:        1%{?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
+#add .desktop file
+Source1:        %{name}.desktop
+#temporary Icon
+Source2:        %{name}.png
+#Wrapper script for user config
+Source3:        %{name}.sh.in
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  automake, autoconf, gtk2-devel, desktop-file-utils
+#Requires:       
+
+%description
+xwxapt is a GTK+ graphical version of wxapt. It uses the same decoding
+engine as wxapt but it displays APT images at half-size as they are
+received, storing the full-sized files when reception is completed. 
+
+It also displays some status information (audio level, sync level,
+sync status etc) and text messages as it runs.
+
+%prep
+%setup -qn %{name}
+
+
+%build
+./autogen.sh
+%configure
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" 
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+#install default user configuration file
+install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/xwxapt/xwxaptrc $RPM_BUILD_ROOT%{_datadir}/%{name}/xwxaptrc
+
+#move original binary to libexecdir
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/
+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
+desktop-file-install  \
+        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
+# --vendor="fedora" obsolete per new guidelines
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS README
+%doc doc/xwxapt.html
+%{_bindir}/*
+%{_libexecdir}/*
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/*%{name}.desktop
+
+
+
+%changelog
+* 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