rpms/gperiodic/F-11 gperiodic-2.0.10-optflags.patch, NONE, 1.1 gperiodic.spec, 1.12, 1.13

[Eric Tanguy]

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2324

Modified Files:
	gperiodic.spec 
Added Files:
	gperiodic-2.0.10-optflags.patch 
Log Message:


gperiodic-2.0.10-optflags.patch:

--- NEW FILE gperiodic-2.0.10-optflags.patch ---
--- gperiodic-2.0.10/Makefile~	2007-07-11 15:58:05.000000000 +0300
+++ gperiodic-2.0.10/Makefile	2009-05-07 20:23:16.000000000 +0300
@@ -1,5 +1,5 @@
 CC := gcc
-CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
+CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED $(RPM_OPT_FLAGS)
 LIBS :=`pkg-config --libs gtk+-2.0`
 bindir ?= /usr/bin
 datadir ?= /usr/share



Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/F-11/gperiodic.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gperiodic.spec	25 Feb 2009 00:31:10 -0000	1.12
+++ gperiodic.spec	7 May 2009 20:52:54 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
 Patch1: gtk.patch
+Patch2: %{name}-2.0.10-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
@@ -20,9 +21,10 @@ element.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -56,6 +58,9 @@ rm -rf %{buildroot}
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu May  7 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.0.10-6
+- Patch to build with $RPM_OPT_FLAGS.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild