[screenie-composer] added patch to undefine g++ macros major/master

[Martin Gieseking]

commit bf77d7d135acc3d624377a7255950444ff324cdd
Author: Martin Gieseking <martin.gieseking at uos.de>
Date:   Wed Aug 17 08:15:37 2011 +0200

    added patch to undefine g++ macros major/master

 screenie-composer-1.0.0-gnu.patch |   15 +++++++++++++++
 screenie-composer.spec            |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/screenie-composer-1.0.0-gnu.patch b/screenie-composer-1.0.0-gnu.patch
new file mode 100644
index 0000000..435b3f1
--- /dev/null
+++ b/screenie-composer-1.0.0-gnu.patch
@@ -0,0 +1,15 @@
+diff -r 38a9bdb91128 src/Utils/src/.Version.h.swp
+Binary file src/Utils/src/.Version.h.swp has changed
+diff -r 38a9bdb91128 src/Utils/src/Version.h
+--- a/src/Utils/src/Version.h	Wed Aug 17 08:03:20 2011 +0200
++++ b/src/Utils/src/Version.h	Wed Aug 17 08:04:03 2011 +0200
+@@ -26,6 +26,9 @@
+ 
+ #include "UtilsLib.h"
+ 
++#undef major
++#undef minor
++
+ class VersionPrivate;
+ 
+ /*!
diff --git a/screenie-composer.spec b/screenie-composer.spec
index dd9038d..54d8c8a 100644
--- a/screenie-composer.spec
+++ b/screenie-composer.spec
@@ -2,7 +2,7 @@
 
 Name:           screenie-composer
 Version:        1.0.0
-Release:        0.1.20110805git%{snapshot}%{?dist}
+Release:        0.2.20110805git%{snapshot}%{?dist}
 Summary:        Fancy screenshot composer
 Group:          Applications/Multimedia
 
@@ -20,6 +20,8 @@ Patch0:         %{name}-%{version}-static.patch
 Patch1:         %{name}-%{version}-mime.patch
 # remove rpath definition
 Patch2:         %{name}-%{version}-rpath.patch
+# undefine g++ macros major/minor expanded to gnu_dev_major/minor
+Patch3:         %{name}-%{version}-gnu.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
@@ -34,6 +36,7 @@ and stylish screenshots from a given set of images.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 find -type f -exec chmod 644 {} \;
 
@@ -59,6 +62,9 @@ desktop-file-install \
 
 
 %changelog
+* Wed Aug 17 2011 Martin Gieseking <martin.gieseking at uos.de> 1.0.0-0.2.20110805git49c2630
+- added patch to undefine g++ macros major/minor
+
 * Fri Aug 05 2011 Martin Gieseking <martin.gieseking at uos.de> 1.0.0-0.1.20110805git49c2630
 - initial package