rpms/xmms-lirc/devel xmms-lirc.spec,1.7,1.8

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/xmms-lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5930

Modified Files:
	xmms-lirc.spec 
Log Message:
Rebuild for new gcc/glibc, spec file cleanup and use CFLAGS.



Index: xmms-lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmms-lirc.spec	22 May 2005 23:20:21 -0000	1.7
+++ xmms-lirc.spec	13 Feb 2006 14:12:01 -0000	1.8
@@ -1,17 +1,15 @@
-%define xmms_generaldir %(xmms-config --general-plugin-dir)
-%define real_name       lirc-xmms-plugin
+%define xmms_generaldir %(xmms-config --general-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General)
 
 Summary: X MultiMedia System control plugin to use infrared devices
 Name: xmms-lirc
 Version: 1.4
-Release: 6
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.lirc.org/
 Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7, lirc
-BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc-devel
+BuildRequires: xmms-devel, lirc-devel
 
 
 %description
@@ -19,17 +17,17 @@
 
 
 %prep
-%setup -n %{real_name}-%{version}
+%setup -n lirc-xmms-plugin-%{version}
 
 
 %build
-./configure
-%{__make} %{?_smp_mflags}
+%configure --libdir=%{xmms_generaldir}
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%makeinstall libdir=%{buildroot}%{xmms_generaldir}
 
 
 %clean
@@ -39,11 +37,16 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{xmms_generaldir}/liblirc.so
 %exclude %{xmms_generaldir}/liblirc.la
+%{xmms_generaldir}/liblirc.so
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Saou <http://freshrpms.net/> 1.4-7
+- Rebuild for new gcc/glibc.
+- Spec file cleanup.
+- Override CFLAGS to have ours used.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.4-6
 - rebuild on all arches