rpms/dvbcut/F-10 dvbcut-snapshot.sh,1.1,1.2 dvbcut.spec,1.1,1.2

[David Timms]

Author: dtimms

Update of /cvs/free/rpms/dvbcut/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3203/F-10

Modified Files:
	dvbcut-snapshot.sh dvbcut.spec 
Log Message:
add patch for compilation with gcc44


Index: dvbcut-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-10/dvbcut-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dvbcut-snapshot.sh	4 Jan 2009 13:30:59 -0000	1.1
+++ dvbcut-snapshot.sh	1 Apr 2009 21:49:43 -0000	1.2
@@ -1,6 +1,8 @@
 #!/bin/bash
 # based on:
 # http://cvs.rpmfusion.org/viewvc/rpms/ffmpeg/F-10/ffmpeg-snapshot.sh?revision=1.2&root=free
+# 2009-03-29 DT add request a specific revision, and use the revision number.
+echo "  dvbcut-snapshot. A specific svn revision can be passed."
 
 set -e
 
@@ -14,20 +16,32 @@
 
 unset CDPATH
 pwd=$(pwd)
-svn=$(date +%Y%m%d)
+
+if [ -n "$1" ]
+then
+  svnrev=$1
+else
+# determine current head/trunk svn revision number
+  echo "      determining the head revision number..."
+  svnrev=$(svn info https://dvbcut.svn.sourceforge.net/svnroot/dvbcut/trunk |grep Revision|cut -c11-)
+fi 
+echo "  retrieving revision $svnrev ..."
 
 cd "$tmp"
-svn checkout -r {$svn} https://dvbcut.svn.sourceforge.net/svnroot/dvbcut/trunk dvbcut-$svn
-cd dvbcut-$svn
+svn checkout -r $svnrev https://dvbcut.svn.sourceforge.net/svnroot/dvbcut/trunk dvbcut-svn$svnrev
+cd dvbcut-svn$svnrev
 
+echo "  stripping ffmpeg and creating bzip2 archive ..."
 # remove included ffmpeg sources
 find . -type d -name "ffmpeg*" -print0 | xargs -0r rm -rf
 
 # remove subversion control files
 find . -type d -name .svn -print0 | xargs -0r rm -rf
 
+# remove debian packaging files
+find . -type d -name "debian*" -print0 | xargs -0r rm -rf
+
 cd ..
-tar jcf "$pwd"/dvbcut-$svn.tar.bz2 dvbcut-$svn
+tar jcf "$pwd"/dvbcut-svn$svnrev.tar.bz2 dvbcut-svn$svnrev
 cd - >/dev/null
 
-


Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-10/dvbcut.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dvbcut.spec	4 Jan 2009 13:30:59 -0000	1.1
+++ dvbcut.spec	1 Apr 2009 21:49:43 -0000	1.2
@@ -1,18 +1,17 @@
-# svn revision 138
-%define svndate 20090101
+%define svnrev 157
 
 Name:    dvbcut
-Version: 0.5.4
-Release: 6.%{svndate}svn138%{?dist}
+Version: 0.6.0
+Release: 3.svn%{svnrev}%{?dist}
 Summary: Clip and convert DVB transport streams to MPEG2 program streams
 
 Group:   Applications/Multimedia
 License: GPLv2+ and LGPLv2
 URL:     http://dvbcut.sourceforge.net/
-# No release has been made since 2007-mid, so using svn checkout for latest fixes:
+#  fixes were committed to svn since release, so using svn checkout for latest fixes:
 #Source0: http://downloads.sourceforge.net/dvbcut/dvbcut_%{version}.tar.bz2
 #     use sh dvbcut-snapshot.sh to create the archive
-Source0: %{name}-%{svndate}.tar.bz2
+Source0: %{name}-svn%{svnrev}.tar.bz2
 # Since no icons have been developed by the project, created icons using the
 #     weblogo on the home page. Scaled and text pixel edited using gimp.
 Source1: %{name}.logo.16x16.png
@@ -21,6 +20,7 @@
 # This desktop file was created by hand.
 Source4: %{name}.desktop
 Source5: %{name}-snapshot.sh
+Patch0:  %{name}-0.6.0.gcc44-add-include.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf
@@ -45,7 +45,9 @@
 
 
 %prep
-%setup -q -n %{name}-%{svndate}
+%setup -q -n %{name}-svn%{svnrev}
+%patch0 -b .gcc44-add-include
+
 
 # Fix QTDIR libs in configure
 sed -i 's,-L$QTDIR/$mr_libdirname,-L$QTDIR/lib,' configure.in
@@ -53,6 +55,10 @@
 # Avoid stripping binaries
 sed -i 's,$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT),,' src/Makefile.in
 
+# don't try to make Debian and ffmpeg files that have been stripped
+sed -i '/debian/d' DISTFILES
+sed -i '/ffmpeg.src/d' DISTFILES
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -113,6 +119,19 @@
 
 
 %changelog
+* Sun Mar 29 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-3.svn157
+- add gcc4 patch for rawhide
+
+* Sun Mar 29 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-2.svn157
+- update to latest post release svn checkout for minor fixes
+- improve dvbcut-snapshot script to not use the checkout date
+- del the debian packaging files from the snapshot archive
+- mod spec to use svnver rather svndate, to make it easier to confirm sources
+- del lines from DISTFILES that reference removed files
+
+* Sat Feb  7 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-1.20090207svn156
+- update to 0.6.0 release, still using post release svn checkout
+
 * Thu Jan  1 2009 David Timms <iinet.net.au at dtimms> - 0.5.4-6.20090101svn138
 - add required alphatag to post release package name
 - mod License to be GPLv2+ and LGPLv2