From 743708aa6835f3833a78ed5c90d4e4cb5b6bfcef Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Apr 19 2009 06:30:44 +0000
Subject: - Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and

    respect the environment's settings.

---

diff --git a/osmo-0.2.4-configure.patch b/osmo-0.2.4-configure.patch
new file mode 100644
index 0000000..c1fddae
--- /dev/null
+++ b/osmo-0.2.4-configure.patch
@@ -0,0 +1,16 @@
+diff -urNp osmo-0.2.4.orig/configure osmo-0.2.4/configure
+--- osmo-0.2.4.orig/configure	2009-04-19 11:18:17.000000000 +0530
++++ osmo-0.2.4/configure	2009-04-19 11:21:26.000000000 +0530
+@@ -5961,9 +5961,9 @@ else
+ fi
+ 
+ 
+-CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"
+-CXXFLAGS="$CFLAGS"
+-CPPFLAGS=""
++CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS"
++CXXFLAGS="$CFLAGS $CXXFLAGS"
++CPPFLAGS="-D_GNU_SOURCE"
+ LIBS="$gringotts_LIBS"
+ 
+ ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile"
diff --git a/osmo.spec b/osmo.spec
index 32c3fa3..7dc01a3 100644
--- a/osmo.spec
+++ b/osmo.spec
@@ -2,13 +2,14 @@ Summary:	Personal organizer
 Summary(pl):	Osobisty organizer
 Name:		osmo
 Version:	0.2.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 URL:		http://clay.ll.pl/osmo/
 Source0:	http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-crash.patch
+Patch0:		%{name}-%{version}-configure.patch
+Patch1:		%{name}-%{version}-crash.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -42,6 +43,7 @@ które użytkownik może zmienić, by program bardziej mu odpowiadał.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-gringrotts --with-libical --with-libsyncml
@@ -99,21 +101,26 @@ fi
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi@fedoraproject.org> - 0.2.4-6
+- Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and respect
+  the environment's settings.
+
 * Thu Apr 02 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 0.2.4-5
-- Reenable syncml (undo Alex's changes from 0.2.4-3), libsyncml got reverted
+- Reenabled syncml support because libsyncml has been reverted. (Red Hat
+  Bugzilla #479954)
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Feb 26 2009 Release Engineering <rel-eng@fedoraproject.org> - 0.2.4-4
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.2.4-3
-- Disable libsyncml until version with support for new syncml 0.5.0 is
-  released (#479954)
+- Temporarily disabled syncml support until Osmo works with libsyncml-0.5.0.
+  (Red Hat Bugzilla #479954)
 
 * Sun Dec 14 2008 Debarshi Ray <rishi@fedoraproject.org> - 0.2.4-2
 - Fixed crash due to SIGABRT using patch written by Tomasz Maka.
 
 * Mon Nov 24 2008 Debarshi Ray <rishi@fedoraproject.org> - 0.2.4-1
-- Version bump to 0.2.4. Closes Red Hat Bugzilla bug #464484.
+- Version bump to 0.2.4. (Red Hat Bugzilla #464484)
 - Timezone information fix accepted by upstream.
 
 * Sun Jul 27 2008 Debarshi Ray <rishi@fedoraproject.org> - 0.2.2-2