rpms/xvattr/FC-4 xvattr.spec,1.7,1.8

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/xvattr/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21779/FC-4

Modified Files:
	xvattr.spec 
Log Message:
Fix CFLAGS so that our optflags get used too (Ville, #192611).



Index: xvattr.spec
===================================================================
RCS file: /cvs/extras/rpms/xvattr/FC-4/xvattr.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xvattr.spec	22 May 2005 23:58:28 -0000	1.7
+++ xvattr.spec	23 May 2006 09:27:02 -0000	1.8
@@ -1,17 +1,19 @@
-# $Id$
-# Upstream: Björn Englund <d4bjorn$dtek,chalmers,se>
-
 Summary: Utility for getting and setting Xv attributes
 Name: xvattr
 Version: 1.3
-Release: 7
-
+Release: 10%{?dist}
 License: GPL
 Group: User Interface/X
 URL: http://www.dtek.chalmers.se/groups/dvd/
 Source: http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: XFree86-devel, gtk+-devel
+BuildRequires: gtk+-devel
+# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXt-devel, libXv-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 This program is used for getting and setting Xv attributes such as
@@ -20,6 +22,8 @@
 
 %prep
 %setup
+# Append GTK CFLAGS to CFLAGS instead of overwriting CFLAGS (optflags get used)
+%{__perl} -pi -e 's|^CFLAGS = (.*)|CFLAGS += $1|g' Makefile*
 
 
 %build
@@ -44,6 +48,15 @@
 
 
 %changelog
+* Tue May 23 2006 Matthias Saou <http://freshrpms.net/> 1.3-10
+- Fix CFLAGS so that our optflags get used too (Ville, #192611).
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.3-9
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.3-8
+- Rebuild for new gcc/glibc and modular X.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3-7
 - rebuild on all arches