rpms/qmmp-plugins-freeworld/EL-6 qmmp-plugins-freeworld.spec, 1.18, 1.19
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17609
Modified Files:
qmmp-plugins-freeworld.spec
Log Message:
oops, wrong version of spec commited, increase release
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/EL-6/qmmp-plugins-freeworld.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qmmp-plugins-freeworld.spec 30 Aug 2011 16:28:06 -0000 1.18
+++ qmmp-plugins-freeworld.spec 30 Aug 2011 16:30:25 -0000 1.19
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
Version: 0.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -124,10 +124,12 @@
%changelog
-* Tue Aug 30 2011 Karel Volný <kvolny(a)redhat.com> 0.5.1-1
-- version bump
+* Tue Aug 30 2011 Karel Volný <kvolny(a)redhat.com> 0.5.1-2
- patch to compile with latest ffmpeg available in EL-6
+* Fri Jun 24 2011 Karel Volný <kvolny(a)redhat.com> 0.5.1-1
+- version bump
+
* Wed Dec 15 2010 Karel Volný <kvolny(a)redhat.com> 0.4.3-1
- version bump
12 years, 7 months
rpms/qmmp-plugins-freeworld/EL-6 qmmp-ffmpeg-0.4.9-0.52.20080908.patch, NONE, 1.1 qmmp-plugins-freeworld.spec, 1.17, 1.18
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17458
Modified Files:
qmmp-plugins-freeworld.spec
Added Files:
qmmp-ffmpeg-0.4.9-0.52.20080908.patch
Log Message:
* Tue Aug 30 2011 Karel Volný <kvolny(a)redhat.com> 0.5.1-1
- version bump
- patch to compile with latest ffmpeg available in EL-6
qmmp-ffmpeg-0.4.9-0.52.20080908.patch:
CMakeLists.txt | 2 +-
decoderffmpegfactory.cpp | 41 +++++++----------------------------------
2 files changed, 8 insertions(+), 35 deletions(-)
--- NEW FILE qmmp-ffmpeg-0.4.9-0.52.20080908.patch ---
--- src/plugins/Input/ffmpeg/CMakeLists.txt~ 2011-04-25 08:09:08.000000000 +0200
+++ src/plugins/Input/ffmpeg/CMakeLists.txt 2011-08-30 17:50:09.848727339 +0200
@@ -28,7 +28,7 @@
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
# libffmpeg
-pkg_check_modules(FFMPEG libavcodec>=52.20.0 libavformat>=52.31.0 libavutil>=49.15.0)
+pkg_check_modules(FFMPEG libavcodec>=51.71.0 libavformat>=52.22.1 libavutil>=49.10.0)
include_directories(${FFMPEG_INCLUDE_DIRS})
link_directories(${FFMPEG_LIBRARY_DIRS})
--- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp 2011-05-16 10:12:34.000000000 +0200
+++ src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp~ 2010-05-11 20:20:28.000000000 +0200
@@ -130,40 +162,13 @@
if (useMetaData)
{
- AVMetadataTag *album = av_metadata_get(in->metadata,"album",0,0);
- if(!album)
- album = av_metadata_get(in->metadata,"WM/AlbumTitle",0,0);
- AVMetadataTag *artist = av_metadata_get(in->metadata,"artist",0,0);
- if(!artist)
- artist = av_metadata_get(in->metadata,"author",0,0);
- AVMetadataTag *comment = av_metadata_get(in->metadata,"comment",0,0);
- AVMetadataTag *genre = av_metadata_get(in->metadata,"genre",0,0);
- AVMetadataTag *title = av_metadata_get(in->metadata,"title",0,0);
- AVMetadataTag *year = av_metadata_get(in->metadata,"WM/Year",0,0);
- if(!year)
- year = av_metadata_get(in->metadata,"year",0,0);
- if(!year)
- year = av_metadata_get(in->metadata,"date",0,0);
- AVMetadataTag *track = av_metadata_get(in->metadata,"track",0,0);
- if(!track)
- track = av_metadata_get(in->metadata,"WM/Track",0,0);
- if(!track)
- track = av_metadata_get(in->metadata,"WM/TrackNumber",0,0);
-
- if(album)
- info->setMetaData(Qmmp::ALBUM, QString::fromUtf8(album->value).trimmed());
- if(artist)
- info->setMetaData(Qmmp::ARTIST, QString::fromUtf8(artist->value).trimmed());
- if(comment)
- info->setMetaData(Qmmp::COMMENT, QString::fromUtf8(comment->value).trimmed());
- if(genre)
- info->setMetaData(Qmmp::GENRE, QString::fromUtf8(genre->value).trimmed());
- if(title)
- info->setMetaData(Qmmp::TITLE, QString::fromUtf8(title->value).trimmed());
- if(year)
- info->setMetaData(Qmmp::YEAR, year->value);
- if(track)
- info->setMetaData(Qmmp::TRACK, track->value);
+ info->setMetaData(Qmmp::ALBUM, QString::fromUtf8(in->album).trimmed());
+ info->setMetaData(Qmmp::ARTIST, QString::fromUtf8(in->author).trimmed());
+ info->setMetaData(Qmmp::COMMENT, QString::fromUtf8(in->comment).trimmed());
+ info->setMetaData(Qmmp::GENRE, QString::fromUtf8(in->genre).trimmed());
+ info->setMetaData(Qmmp::TITLE, QString::fromUtf8(in->title).trimmed());
+ info->setMetaData(Qmmp::YEAR, in->year);
+ info->setMetaData(Qmmp::TRACK, in->track);
}
info->setLength(in->duration/AV_TIME_BASE);
av_close_input_file(in);
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/EL-6/qmmp-plugins-freeworld.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qmmp-plugins-freeworld.spec 24 Jun 2011 16:15:56 -0000 1.17
+++ qmmp-plugins-freeworld.spec 30 Aug 2011 16:28:06 -0000 1.18
@@ -10,6 +10,7 @@
Source2: qmmp-filter-provides.sh
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-filter-provides.sh
+Patch0: qmmp-ffmpeg-0.4.9-0.52.20080908.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -19,7 +20,7 @@
BuildRequires: libmad-devel qt-devel >= 4.3
BuildRequires: libmms-devel
BuildRequires: taglib-devel libcurl-devel
-BuildRequires: qmmp%{?_isa} = %{version}
+#BuildRequires: qmmp%{?_isa} = %{version}
Requires: qmmp%{?_isa} = %{version}
%description
@@ -32,14 +33,7 @@
%setup -q -n qmmp-%{version}
cp %{SOURCE2} .
chmod +x qmmp-filter-provides.sh
-# adjust includes for the header move in latest ffmpeg
-sed -i \
- -e 's|<avcodec.h|<libavcodec/avcodec.h|g' \
- -e 's|g/avcodec.h|g/libavcodec/avcodec.h|g' \
- -e 's|<avformat.h|<libavformat/avformat.h|g' \
- -e 's|g/avformat.h|g/libavformat/avformat.h|g' \
- src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+%patch0
%build
@@ -130,8 +124,9 @@
%changelog
-* Fri Jun 24 2011 Karel Volný <kvolny(a)redhat.com> 0.5.1-1
+* Tue Aug 30 2011 Karel Volný <kvolny(a)redhat.com> 0.5.1-1
- version bump
+- patch to compile with latest ffmpeg available in EL-6
* Wed Dec 15 2010 Karel Volný <kvolny(a)redhat.com> 0.4.3-1
- version bump
12 years, 7 months
rpms/get_iplayer/F-15 get_iplayer.spec,1.8,1.9
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7636
Modified Files:
get_iplayer.spec
Log Message:
fix requires
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-15/get_iplayer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- get_iplayer.spec 29 Aug 2011 21:47:00 -0000 1.8
+++ get_iplayer.spec 29 Aug 2011 22:23:27 -0000 1.9
@@ -1,6 +1,6 @@
Name: get_iplayer
Version: 2.80
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
@@ -19,9 +19,11 @@
BuildRequires: perl(HTML::Entities) perl(HTTP::Cookies)
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
+%{?filter_setup:
# https://bugzilla.redhat.com/show_bug.cgi?id=734244
%filter_from_requires /perl(Programme.*)/d; /perl(Streamer)/d;
%filter_setup
+}
BuildArch: noarch
@@ -55,6 +57,12 @@
%doc README.txt
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-4
+- conditionalise %%filter_setup properly.
+
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-3
+- Make the requires filtering work in rpmfusion build system
+
* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-2
- Remove superfluous perl requires
12 years, 7 months
rpms/get_iplayer/devel get_iplayer.spec,1.9,1.10
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7004
Modified Files:
get_iplayer.spec
Log Message:
conditionalise filter_setup properly
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/get_iplayer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- get_iplayer.spec 29 Aug 2011 22:11:18 -0000 1.9
+++ get_iplayer.spec 29 Aug 2011 22:16:47 -0000 1.10
@@ -1,6 +1,6 @@
Name: get_iplayer
Version: 2.80
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
@@ -19,11 +19,11 @@
BuildRequires: perl(HTML::Entities) perl(HTTP::Cookies)
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
-%if 0%{?fedora}
+%{?filter_setup:
# https://bugzilla.redhat.com/show_bug.cgi?id=734244
%filter_from_requires /perl(Programme.*)/d; /perl(Streamer)/d;
%filter_setup
-%endif
+}
BuildArch: noarch
@@ -57,6 +57,9 @@
%doc README.txt
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-4
+- conditionalise %%filter_setup properly.
+
* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-3
- Make the requires filtering work in rpmfusion build system
12 years, 7 months
rpms/get_iplayer/devel get_iplayer.spec,1.8,1.9
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6351
Modified Files:
get_iplayer.spec
Log Message:
make it build in rpmfusion
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/get_iplayer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- get_iplayer.spec 29 Aug 2011 21:46:30 -0000 1.8
+++ get_iplayer.spec 29 Aug 2011 22:11:18 -0000 1.9
@@ -1,6 +1,6 @@
Name: get_iplayer
Version: 2.80
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
@@ -19,9 +19,11 @@
BuildRequires: perl(HTML::Entities) perl(HTTP::Cookies)
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
+%if 0%{?fedora}
# https://bugzilla.redhat.com/show_bug.cgi?id=734244
%filter_from_requires /perl(Programme.*)/d; /perl(Streamer)/d;
%filter_setup
+%endif
BuildArch: noarch
@@ -55,6 +57,9 @@
%doc README.txt
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-3
+- Make the requires filtering work in rpmfusion build system
+
* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-2
- Remove superfluous perl requires
12 years, 7 months
rpms/get_iplayer/F-15 get_iplayer.spec,1.7,1.8
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3635
Modified Files:
get_iplayer.spec
Log Message:
remove extra perl requires
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-15/get_iplayer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- get_iplayer.spec 29 Aug 2011 20:00:33 -0000 1.7
+++ get_iplayer.spec 29 Aug 2011 21:47:00 -0000 1.8
@@ -1,6 +1,6 @@
Name: get_iplayer
Version: 2.80
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
@@ -19,6 +19,10 @@
BuildRequires: perl(HTML::Entities) perl(HTTP::Cookies)
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
+# https://bugzilla.redhat.com/show_bug.cgi?id=734244
+%filter_from_requires /perl(Programme.*)/d; /perl(Streamer)/d;
+%filter_setup
+
BuildArch: noarch
%description
@@ -51,6 +55,9 @@
%doc README.txt
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-2
+- Remove superfluous perl requires
+
* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-1
- Update to 2.80
- Add 'packagemanager yum' to options file (#1270)
12 years, 7 months
rpms/get_iplayer/devel get_iplayer.spec,1.7,1.8
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3519
Modified Files:
get_iplayer.spec
Log Message:
remove extra perl requires
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/get_iplayer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- get_iplayer.spec 29 Aug 2011 19:59:25 -0000 1.7
+++ get_iplayer.spec 29 Aug 2011 21:46:30 -0000 1.8
@@ -1,6 +1,6 @@
Name: get_iplayer
Version: 2.80
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
@@ -19,6 +19,10 @@
BuildRequires: perl(HTML::Entities) perl(HTTP::Cookies)
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
+# https://bugzilla.redhat.com/show_bug.cgi?id=734244
+%filter_from_requires /perl(Programme.*)/d; /perl(Streamer)/d;
+%filter_setup
+
BuildArch: noarch
%description
@@ -51,6 +55,9 @@
%doc README.txt
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-2
+- Remove superfluous perl requires
+
* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-1
- Update to 2.80
- Add 'packagemanager yum' to options file (#1270)
12 years, 7 months
rpms/get_iplayer/F-15 .cvsignore, 1.5, 1.6 get_iplayer.spec, 1.6, 1.7 options, 1.2, 1.3 sources, 1.5, 1.6
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24121
Modified Files:
.cvsignore get_iplayer.spec options sources
Log Message:
2.80
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 9 Jan 2011 16:24:10 -0000 1.5
+++ .cvsignore 29 Aug 2011 20:00:33 -0000 1.6
@@ -1 +1 @@
-get_iplayer-2.79.tar.gz
+get_iplayer-2.80.tar.gz
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-15/get_iplayer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- get_iplayer.spec 9 Jan 2011 16:24:10 -0000 1.6
+++ get_iplayer.spec 29 Aug 2011 20:00:33 -0000 1.7
@@ -1,5 +1,5 @@
Name: get_iplayer
-Version: 2.79
+Version: 2.80
Release: 1%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
@@ -51,6 +51,10 @@
%doc README.txt
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-1
+- Update to 2.80
+- Add 'packagemanager yum' to options file (#1270)
+
* Sun Jan 09 2011 David Woodhouse <dwmw2(a)infradead.org> 2.79-1
- Update to 2.79
Index: options
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-15/options,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- options 28 May 2010 14:45:27 -0000 1.2
+++ options 29 Aug 2011 20:00:33 -0000 1.3
@@ -1 +1 @@
-# No options set by default now that rtmpdump/swfVfy is handled automatically
+packagemanager yum
Index: sources
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 Jan 2011 16:24:10 -0000 1.5
+++ sources 29 Aug 2011 20:00:33 -0000 1.6
@@ -1 +1 @@
-80daf5a222dc99b2893e4daeebf355ac get_iplayer-2.79.tar.gz
+8cfaa67895a8ca429b436272cc298b56 get_iplayer-2.80.tar.gz
12 years, 7 months
rpms/get_iplayer/devel .cvsignore, 1.5, 1.6 get_iplayer.spec, 1.6, 1.7 options, 1.2, 1.3 sources, 1.5, 1.6
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23402
Modified Files:
.cvsignore get_iplayer.spec options sources
Log Message:
2.80
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/get_iplayer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- get_iplayer.spec 9 Jan 2011 16:24:10 -0000 1.6
+++ get_iplayer.spec 29 Aug 2011 19:59:25 -0000 1.7
@@ -1,5 +1,5 @@
Name: get_iplayer
-Version: 2.79
+Version: 2.80
Release: 1%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
@@ -51,6 +51,10 @@
%doc README.txt
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.80-1
+- Update to 2.80
+- Add 'packagemanager yum' to options file (#1270)
+
* Sun Jan 09 2011 David Woodhouse <dwmw2(a)infradead.org> 2.79-1
- Update to 2.79
Index: options
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/options,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- options 28 May 2010 14:45:27 -0000 1.2
+++ options 29 Aug 2011 19:59:25 -0000 1.3
@@ -1 +1 @@
-# No options set by default now that rtmpdump/swfVfy is handled automatically
+packagemanager yum
Index: sources
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 Jan 2011 16:24:10 -0000 1.5
+++ sources 29 Aug 2011 19:59:25 -0000 1.6
@@ -1 +1 @@
-80daf5a222dc99b2893e4daeebf355ac get_iplayer-2.79.tar.gz
+8cfaa67895a8ca429b436272cc298b56 get_iplayer-2.80.tar.gz
12 years, 7 months
rpms/rtmpdump/F-15 .cvsignore, 1.4, 1.5 rtmpdump.spec, 1.5, 1.6 sources, 1.4, 1.5
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/rtmpdump/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22243
Modified Files:
.cvsignore rtmpdump.spec sources
Log Message:
Update to almost-2.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/F-15/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 4 Jul 2010 20:29:51 -0000 1.4
+++ .cvsignore 29 Aug 2011 19:52:21 -0000 1.5
@@ -1 +1 @@
-rtmpdump-2.3.tgz
+rtmpdump-20110811-gc58cfb3e.tar.gz
Index: rtmpdump.spec
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/F-15/rtmpdump.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rtmpdump.spec 5 Jul 2010 06:21:28 -0000 1.5
+++ rtmpdump.spec 29 Aug 2011 19:52:21 -0000 1.6
@@ -1,6 +1,9 @@
+%define snapshot c58cfb3e
+%define snapshot_date 20110811
+
Name: rtmpdump
-Version: 2.3
-Release: 2%{?dist}
+Version: 2.4
+Release: 0.1.%{snapshot_date}git%{snapshot}%{?dist}
Summary: Toolkit for RTMP streams
Group: Applications/Internet
@@ -9,7 +12,7 @@
# (for which you'd probably want to make it a dynamic library) you should
# label its licence correctly. But the _tools_ are GPLv2.
URL: http://rtmpdump.mplayerhq.hu/
-Source0: http://rtmpdump.mplayerhq.hu/download/rtmpdump-%{version}.tgz
+Source0: http://rtmpdump.mplayerhq.hu/download/rtmpdump-%{snapshot_date}-g%{snapsh...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnutls-devel zlib-devel
@@ -38,12 +41,11 @@
contains include files needed to develop applications using librtmp.
%prep
-%setup -q
+%setup -q -n rtmpdump-%{snapshot_date}-g%{snapshot}
%build
# The fact that we have to add -ldl for gnutls is Fedora bug #611318
-make CRYPTO=GNUTLS SHARED=yes OPT="$RPM_OPT_FLAGS" LIB_GNUTLS="-lgnutls -lgcrypt -ldl" LIBRTMP=librtmp/librtmp.so LIBS=
-
+make CRYPTO=GNUTLS SHARED=yes OPT="$RPM_OPT_FLAGS" LIB_GNUTLS="-lgnutls -lgcrypt -ldl"
%install
rm -rf $RPM_BUILD_ROOT
@@ -81,6 +83,9 @@
%doc ChangeLog
%changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2(a)infradead.org> 2.4-0.1.20110811gitc58cfb3e
+- Update to almost-2.4 snapshot
+
* Sun Jul 04 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.3-2
- call ldconfig in post(un) scripts for the shared library
- add strict dependency on the library to -devel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/F-15/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 4 Jul 2010 20:29:51 -0000 1.4
+++ sources 29 Aug 2011 19:52:21 -0000 1.5
@@ -1 +1 @@
-eb961f31cd55f0acf5aad1a7b900ef59 rtmpdump-2.3.tgz
+07ed0f980eeb51f2431dedfbb525efcc rtmpdump-20110811-gc58cfb3e.tar.gz
12 years, 7 months