diff --git a/.cvsignore b/.cvsignore
index e69de29..c875b0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+armadillo-0.6.12.tar.gz
diff --git a/armadillo.spec b/armadillo.spec
new file mode 100644
index 0000000..c06b941
--- /dev/null
+++ b/armadillo.spec
@@ -0,0 +1,164 @@
+Name:           armadillo
+Version:        0.6.12
+Release:        2%{?dist}
+Summary:        Fast C++ matrix library with interfaces to LAPACK and ATLAS
+
+Group:          Development/Libraries
+License:        LGPLv3+
+URL:            http://arma.sourceforge.net/
+Source:         http://download.sourceforge.net/arma/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  cmake, boost-devel, lapack-devel, atlas-devel
+
+%description
+Armadillo is a C++ linear algebra library (matrix maths)
+aiming towards a good balance between speed and ease of use.
+Integer, floating point and complex numbers are supported,
+as well as a subset of trigonometric and statistics functions.
+Various matrix decompositions are provided through optional
+integration with LAPACK and ATLAS libraries.
+A delayed evaluation approach is employed (during compile time)
+to combine several operations into one and reduce (or eliminate) 
+the need for temporaries. This is accomplished through recursive
+templates and template meta-programming.
+This library is useful if C++ has been decided as the language
+of choice (due to speed and/or integration capabilities), rather
+than another language like Matlab or Octave.
+
+
+%package devel
+Summary:        Development headers and documentation for the Armadillo C++ library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       boost-devel, atlas-devel
+
+# The header files of Armadillo include some Boost and ATLAS header files,
+# delivered within the boost-devel and atlas-devel sub-packages, respectively.
+# However, since there is no explicit dependency on Boost or ATLAS libraries
+# (most of Boost is delivered as header files only), the RPM building process 
+# does not detect these dependencies.  These dependencies must therefore be 
+# added manually.
+
+%description devel
+This package contains files necessary for development using the
+Armadillo C++ library. It contains header files, example programs,
+user documentation (reference guide), and the technical documentation.
+
+
+%prep
+%setup -q
+
+# convert DOS end-of-line to UNIX end-of-line
+
+for file in README.txt; do
+  sed 's/\r//' $file >$file.new && \
+  touch -r $file $file.new && \
+  mv $file.new $file
+done
+
+%build
+%{cmake}
+%{__make} VERBOSE=1 %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+rm -rf   $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
+rm -f examples/Makefile.cmake
+cp -r LICENSE.txt licenses README.txt index.html examples docs_user docs_tech $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+%dir %{_docdir}/%{name}-%{version}/
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%doc %{_docdir}/%{name}-%{version}/licenses/
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/*.so
+%{_includedir}/armadillo
+%{_includedir}/armadillo_bits/
+%{_includedir}/armadillo_itpp
+%doc %{_docdir}/%{name}-%{version}/README.txt
+%doc %{_docdir}/%{name}-%{version}/index.html
+%doc %{_docdir}/%{name}-%{version}/examples/
+%doc %{_docdir}/%{name}-%{version}/docs_user/
+%doc %{_docdir}/%{name}-%{version}/docs_tech/
+
+%changelog
+* Wed Jul 06 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.12-2
+- added conversion of DOS end-of-line to UNIX end-of-line for README.txt
+
+* Wed Jun 22 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.12-1
+- spec updated for Armadillo 0.6.12
+
+* Wed Jun 15 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.11-8
+- cleanup of dependencies
+- explanation as to why boost-devel and atlas-devel are required by armadillo-devel
+
+* Wed Jun 09 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.11-7
+- explicit declaration of doc directory in the main package
+- explicitly marked doc files in both packages
+
+* Wed Jun 09 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.11-6
+- removed symlinks
+- placed all documentation and license files into one directory that is shared by both packages
+
+* Wed Jun 09 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.11-5
+- added symlinks to LICENSE.txt and licenses in the devel package
+
+* Wed Jun 08 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.11-4
+- added LICENSE.txt to the main package
+
+* Wed May 22 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.11-3
+- using cmake macro instead of directly calling cmake
+
+* Wed May 21 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.11-2
+- moved all text files to devel package to retain consistency with the layout in the original .tar.gz
+
+* Wed May 08 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.10-2
+- Removed several explicit build dependencies that are provided by default in Fedora
+- Simplified handling of doc files
+
+* Wed May 02 2009  Conrad Sanderson  <conradsand ! ieee ! org> - 0.6.10-1
+- Updated spec file for Armadillo 0.6.10
+
+* Wed Apr 02 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Updated list of files in 0.6.7 release
+
+* Wed Apr 02 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Updated description
+
+* Wed Mar 24 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Added explicit dependence on libstdc++-devel
+
+* Wed Mar 17 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Simplified specification of directories
+- Removed library packages specified by "Requires", as library dependencies are detected automatically
+
+* Wed Mar 12 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Modified to generate separate devel package (subsumes previous doc package)
+- Removed redundant packages specified by "BuildRequires"
+- Added CMake installation prefixes to allow for x86_64
+
+* Wed Feb  4 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Modified to generate separate doc package
+
+* Thu Jan 28 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Added argument to cmake: -DCMAKE_INSTALL_PREFIX=/usr 
+
+* Thu Jan 22 2009  Conrad Sanderson  <conradsand ! ieee ! org>
+- Initial spec file prepared
+
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..cd4f788
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+armadillo-0_6_12-2_fc10:HEAD:armadillo-0.6.12-2.fc10.src.rpm:1247198478
diff --git a/sources b/sources
index e69de29..7f37d10 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+810a4f6cc540d2f3c0aebaea6e896816  armadillo-0.6.12.tar.gz