From 05253e83ced2193a04fc559514528654beb02880 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date: Dec 25 2012 22:05:11 +0000
Subject: Merge branch 'f17' into el6


---

diff --git a/.gitignore b/.gitignore
index 178b110..b5508cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
-clog
-airinv-*.tar.*
-airinv_*.patch
-.build-*.log
-airinv-*.src.rpm
-airinv-*.*.*
-x86_64
-i386
-
+/airinv-*.tar.*
+/airinv-*.src.rpm
+/airinv-*.*.*/
+/clog
+.build-*.*.log
+/noarch/
+/x86_64/
+/i?86/
diff --git a/airinv.spec b/airinv.spec
index b77a82a..328cc0a 100644
--- a/airinv.spec
+++ b/airinv.spec
@@ -2,7 +2,7 @@
 %global mydocs __tmp_docdir
 #
 Name:           airinv
-Version:        0.1.2
+Version:        1.00.0
 Release:        1%{?dist}
 
 Summary:        C++ Simulated Airline Inventory Management System library
@@ -115,6 +115,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 25 2012 Denis Arnaud <denis.arnaud_fedora@m4x.org> 1.00.0-1
+- Upstream update
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-3
+- Rebuilt for c++ ABI breakage
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Sun Dec 04 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.1.2-1
 - Upstream update. Took into account review request (#750099)
 
diff --git a/sources b/sources
index 7bbe788..c332fcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f11b342f593c7a3e653142dd78e4a6a3  airinv-0.1.2.tar.bz2
+3971d7c5f4f193efdd9fa36f1265ab9e  airinv-1.00.0.tar.bz2