Author: dtimms Update of /cvs/free/rpms/dvbcut/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18417/devel Modified Files: dvbcut.spec Log Message: mod QTDIR configure.in patch to match newer configure.in revision Index: dvbcut.spec =================================================================== RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dvbcut.spec 3 Apr 2009 12:56:11 -0000 1.6 +++ dvbcut.spec 5 Apr 2009 15:12:30 -0000 1.7 @@ -1,8 +1,13 @@ %define svnrev 157 +%if 0%{?fedora} > 6 + %define qt3 qt3 +%else + %define qt3 qt +%endif Name: dvbcut Version: 0.6.0 -Release: 5.svn%{svnrev}%{?dist} +Release: 7.svn%{svnrev}%{?dist} Summary: Clip and convert DVB transport streams to MPEG2 program streams Group: Applications/Multimedia @@ -24,7 +29,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf -BuildRequires: qt-devel >= 3 qt-devel < 1:4 +BuildRequires: %{qt3}-devel BuildRequires: libao-devel BuildRequires: a52dec-devel BuildRequires: libmad-devel @@ -50,7 +55,8 @@ # Fix QTDIR libs in configure -sed -i 's,-L$QTDIR/$mr_libdirname,-L$QTDIR/lib,' configure.in +sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in + # Avoid stripping binaries sed -i 's,$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT),,' src/Makefile.in @@ -119,6 +125,12 @@ %changelog +* Mon Apr 6 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-7.svn157 +- mod QTDIR configure.in patch to match newer configure.in revision + +* Sat Apr 4 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-6.svn157 +- use distro conditional to determine name of BR qt3-devel + * Fri Apr 3 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-5.svn157 - use another BR qt3 variant to work on both fedora and epel