rpms/iscsitarget-kmod/F-10 iscsitarget-kmod.spec,1.32,1.33
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/iscsitarget-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17232
Modified Files:
iscsitarget-kmod.spec
Log Message:
* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.18
- rebuild for new kernels
Index: iscsitarget-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/iscsitarget-kmod/F-10/iscsitarget-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iscsitarget-kmod.spec 23 Aug 2009 18:35:01 -0000 1.32
+++ iscsitarget-kmod.spec 2 Oct 2009 21:14:59 -0000 1.33
@@ -7,7 +7,7 @@
Name: iscsitarget-kmod
Version: 0.4.17
-Release: 2%{?dist}.17
+Release: 2%{?dist}.18
Epoch: 1
Summary: iscsitarget kernel modules
@@ -71,6 +71,9 @@
%changelog
+* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.18
+- rebuild for new kernels
+
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.17
- rebuild for new kernels
14 years, 6 months
rpms/em8300-kmod/F-10 em8300-kmod.spec,1.36,1.37
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/em8300-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17110
Modified Files:
em8300-kmod.spec
Log Message:
* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.3-1.6
- rebuild for new kernels
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-10/em8300-kmod.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- em8300-kmod.spec 23 Aug 2009 18:34:45 -0000 1.36
+++ em8300-kmod.spec 2 Oct 2009 21:14:42 -0000 1.37
@@ -10,7 +10,7 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
Version: 0.17.3
-Release: 1%{?prever:.1.%{prever}}%{?dist}.5
+Release: 1%{?prever:.1.%{prever}}%{?dist}.6
Group: System Environment/Kernel
License: GPLv2+
@@ -66,6 +66,9 @@
%changelog
+* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.3-1.6
+- rebuild for new kernels
+
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.3-1.5
- rebuild for new kernels
14 years, 6 months
rpms/blcr-kmod/F-10 blcr-kmod.spec,1.17,1.18
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/blcr-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16981
Modified Files:
blcr-kmod.spec
Log Message:
* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-1.13
- rebuild for new kernels
Index: blcr-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/blcr-kmod/F-10/blcr-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blcr-kmod.spec 23 Aug 2009 18:34:29 -0000 1.17
+++ blcr-kmod.spec 2 Oct 2009 21:14:25 -0000 1.18
@@ -7,7 +7,7 @@
Name: blcr-kmod
Version: 0.8.1
-Release: 1%{?dist}.12
+Release: 1%{?dist}.13
Summary: Kernel module (kmod) for Berkeley Lab Checkpoint/Restart for Linux
%define distname blcr-%{version}
@@ -83,6 +83,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-1.13
+- rebuild for new kernels
+
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-1.12
- rebuild for new kernels
14 years, 6 months
rpms/buildsys-build-rpmfusion/F-10 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.32, 1.33 buildsys-build-rpmfusion.spec, 1.36, 1.37
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12897
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.36
- rebuild for kernel 2.6.27.35-170.2.94.fc10
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-10/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- buildsys-build-rpmfusion-kerneldevpkgs-current 23 Aug 2009 07:09:38 -0000 1.32
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 2 Oct 2009 19:57:50 -0000 1.33
@@ -1,3 +1,3 @@
-2.6.29.6-99.fc10
-2.6.29.6-99.fc10smp
-2.6.29.6-99.fc10PAE
+2.6.27.35-170.2.94.fc10
+2.6.27.35-170.2.94.fc10smp
+2.6.27.35-170.2.94.fc10PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-10/buildsys-build-rpmfusion.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- buildsys-build-rpmfusion.spec 23 Aug 2009 07:09:38 -0000 1.36
+++ buildsys-build-rpmfusion.spec 2 Oct 2009 19:57:50 -0000 1.37
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 10
-Release: 0.35
+Release: 0.36
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -100,6 +100,9 @@
%changelog
+* Fri Oct 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.36
+- rebuild for kernel 2.6.27.35-170.2.94.fc10
+
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.35
- rebuild for kernel 2.6.29.6-99.fc10
14 years, 6 months
rpms/k3b-extras-freeworld/devel k3b-1.0.5-ffmpeg.patch, 1.3, 1.4 k3b-lavc52.patch, 1.2, 1.3 .cvsignore, 1.3, 1.4 k3b-extras-freeworld.spec, 1.10, 1.11 sources, 1.3, 1.4 k3b-1.66.0-ffmpeg.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9044
Modified Files:
.cvsignore k3b-extras-freeworld.spec sources
Added Files:
k3b-1.0.5-ffmpeg.patch k3b-lavc52.patch
Removed Files:
k3b-1.66.0-ffmpeg.patch
Log Message:
* Thu Oct 01 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.0.5-7
- Epoch: 1 (F-12 revert to k3b-1.0.5)
k3b-1.0.5-ffmpeg.patch:
Index: k3b-1.0.5-ffmpeg.patch
===================================================================
RCS file: k3b-1.0.5-ffmpeg.patch
diff -N k3b-1.0.5-ffmpeg.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.5-ffmpeg.patch 1 Oct 2009 13:34:36 -0000 1.4
@@ -0,0 +1,92 @@
+diff -up k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
+--- k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in.ffmpeg 2008-05-27 03:23:36.000000000 -0500
++++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in 2008-09-17 10:49:46.000000000 -0500
+@@ -14,44 +14,7 @@ AC_ARG_WITH(
+ #
+ have_ffmpeg=no
+ if test "$ac_cv_use_ffmpeg" = "yes"; then
+- k3b_cxxflags_save="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
+- AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+- AC_COMPILE_IFELSE(
+- extern "C" {
+- #include <ffmpeg/avformat.h>
+- #include <ffmpeg/avcodec.h>
+- }
+-
+- int main() {
+- AVFormatContext* fc = 0;
+- AVPacket* p = 0;
+- av_register_all();
+- return av_read_frame( fc, p );
+- },
+- [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+- OLD_LIBS=$LIBS
+- LIBS="-lavformat -lavcodec $LIBS"
+- AC_LINK_IFELSE(
+- extern "C" {
+- #include <ffmpeg/avformat.h>
+- #include <ffmpeg/avcodec.h>
+- }
+-
+- int main() {
+- AVFormatContext* fc = 0;
+- AVPacket* p = 0;
+- av_register_all();
+- return av_read_frame( fc, p );
+- },
+- [ffmpeg_links=yes], [ffmpeg_links=no] )
+- AC_LANG_RESTORE
+- LIBS=$OLD_LIBS
+- have_ffmpeg=$ffmpeg_links
+- AC_MSG_RESULT($have_ffmpeg)
+- CXXFLAGS=$k3b_cxxflags_save
++ KDE_PKG_CHECK_MODULES(FFMPEG, libavcodec libavformat, have_ffmpeg=yes)
+ fi
+ AM_CONDITIONAL(include_FFMPEG, [test x$have_ffmpeg = xyes])
+
+diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
+--- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp.ffmpeg 2008-05-27 03:23:36.000000000 -0500
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-09-17 10:44:15.000000000 -0500
+@@ -22,7 +22,7 @@
+ #include <k3bpluginfactory.h>
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+
+ #include <math.h>
+diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ffmpeg 2008-05-27 03:23:36.000000000 -0500
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-09-17 10:44:15.000000000 -0500
+@@ -18,8 +18,8 @@
+ #include "k3bffmpegwrapper.h"
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ }
+
+ #include <string.h>
+diff -up k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am
+--- k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am.ffmpeg 2008-05-27 03:23:36.000000000 -0500
++++ k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am 2008-09-17 10:55:02.000000000 -0500
+@@ -1,11 +1,11 @@
+-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(all_includes)
++AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(FFMPEG_CFLAGS) $(all_includes)
+ KDE_CXXFLAGS = -D__STDC_CONSTANT_MACROS
+
+ kde_module_LTLIBRARIES = libk3bffmpegdecoder.la
+
+ libk3bffmpegdecoder_la_SOURCES = k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp
+
+-libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lavcodec -lavformat
++libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) $(FFMPEG_LIBS)
+ libk3bffmpegdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+
+ pluginsdir = $(kde_datadir)/k3b/plugins
k3b-lavc52.patch:
Index: k3b-lavc52.patch
===================================================================
RCS file: k3b-lavc52.patch
diff -N k3b-lavc52.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3b-lavc52.patch 1 Oct 2009 13:34:36 -0000 1.3
@@ -0,0 +1,27 @@
+diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 2008-12-15 20:47:09.000000000 +0100
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-12-15 21:23:34.000000000 +0100
+@@ -194,7 +194,11 @@ QString K3bFFMpegFile::typeComment() con
+ return i18n("Windows Media v1");
+ case CODEC_ID_WMAV2:
+ return i18n("Windows Media v2");
++#if LIBAVCODEC_VERSION_MAJOR < 52
+ case CODEC_ID_MP3LAME:
++#else
++ case CODEC_ID_MP3:
++#endif
+ return i18n("MPEG 1 Layer III");
+ case CODEC_ID_AAC:
+ return i18n("Advanced Audio Coding (AAC)");
+@@ -289,8 +293,10 @@ int K3bFFMpegFile::fillOutputBuffer()
+
+ #ifdef FFMPEG_BUILD_PRE_4629
+ int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
+-#else
++#elif LIBAVCODEC_VERSION_MAJOR < 52
+ int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
++#else
++ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
+ #endif
+ (short*)d->outputBuffer, &d->outputBufferSize,
+ d->packetData, d->packetSize );
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jun 2009 15:38:31 -0000 1.3
+++ .cvsignore 1 Oct 2009 13:34:36 -0000 1.4
@@ -1 +1 @@
-k3b-1.66.0alpha2.tar.bz2
+k3b-1.0.5.tar.bz2
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- k3b-extras-freeworld.spec 17 Jun 2009 15:38:31 -0000 1.10
+++ k3b-extras-freeworld.spec 1 Oct 2009 13:34:36 -0000 1.11
@@ -1,42 +1,46 @@
-%define pre alpha2
+%define kdelibs3 kdelibs
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%define ffmpeg ffmpeg
+%define _with_ffmpeg --with-ffmpeg
+%endif
+
+Name: k3b-extras-freeworld
+Epoch: 1
+Version: 1.0.5
+Release: 7%{?dist}
+Summary: Additional codec plugins for the k3b CD/DVD burning application
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: http://www.k3b.org
+Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+## upstreamable
+Patch50: k3b-1.0.5-ffmpeg.patch
-Name: k3b-extras-freeworld
-Summary: Additional codec plugins for the k3b CD/DVD burning application
+## upstream
+Patch100: k3b-lavc52.patch
-Version: 1.66.0
-Release: 0.1.%{pre}%{?dist}
+ExcludeArch: s390 s390x
-Group: Applications/Archiving
-License: GPLv2+
-URL: http://www.k3b.org/
-Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# TODO: bugzilla/document
-ExcludeArch: s390 s390x
-
-## upstreamable patches
-Patch50: k3b-1.66.0-ffmpeg.patch
-
-BuildRequires: cmake
-BuildRequires: flac-devel
-BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: kdemultimedia-devel
-BuildRequires: libdvdread-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-# needed by k3bsetup
-#BuildRequires: polkit-qt-devel
-BuildRequires: taglib-devel
-
-BuildRequires: ffmpeg-devel
+BuildRequires: %{kdelibs3}-devel
BuildRequires: lame-devel
BuildRequires: libdvdread-devel
BuildRequires: libmad-devel
+%{?ffmpeg:BuildRequires: %{ffmpeg}-devel automake}
+BuildRequires: libmusicbrainz-devel
+BuildRequires: gettext
+BuildRequires: taglib-devel
+
+Obsoletes: k3b-mp3 < 0.12.10
+Provides: k3b-mp3 = %{version}-%{release}
+
+# livna upgrade
+Obsoletes: k3b-extras-nonfree < 1.0.4-3
+Provides: k3b-extras-nonfree = %{version}-%{release}
Requires: k3b >= %{version}
@@ -46,56 +50,83 @@
handle CD/DVD burning application.
-
%prep
%setup -q -n k3b-%{version}
+%if 0%{?ffmpeg:1}
%patch50 -p1 -b .ffmpeg
+%patch100 -p1 -b .lavc52
+make -f admin/Makefile.common
+%endif
%build
+unset QTDIR
+[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} \
- ..
+%configure \
+ --disable-rpath \
+ --enable-new-ldflags \
+ --disable-debug --disable-warnings \
+ --disable-dependency-tracking --enable-final \
+ --with-libdvdread \
+ --with-external-libsamplerate=no \
+ --without-oggvorbis \
+ --without-flac \
+ --without-sndfile \
+ --without-hal \
+ --without-musepack \
+ --with-k3bsetup=no \
+ %{?_with_ffmpeg} %{!?_with_ffmpeg:--without-ffmpeg} \
+ --with-lame \
+ --with-libmad
+
+%global makeflags %{?_smp_mflags}%{nil}
+
+# We need just a few k3b core libs.
+# As FC k3b package no longer includes the libtool archives,
+# we cannot simply link them anymore.
+pushd libk3bdevice
+#ln -s %{_libdir}/libk3bdevice.la libk3bdevice.la
+make %makeflags
popd
-#make %{?_smp_mflags} -C %{_target_platform}/libk3bdevice
-#make %{?_smp_mflags} -C %{_target_platform}/libk3b
-make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/ffmpeg
-make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/mp3
-make %{?_smp_mflags} -C %{_target_platform}/plugins/encoder/lame
+pushd libk3b
+#ln -s %{_libdir}/libk3b.la libk3b.la
+make %makeflags
+popd
+# Now build individual plugins.
+make %makeflags -C plugins/decoder/mp3
+%{?ffmpeg:make %makeflags -C plugins/decoder/ffmpeg}
+make %makeflags -C plugins/encoder/lame
%install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/ffmpeg
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/mp3
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/encoder/lame
+make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/mp3
+%{?ffmpeg:make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/ffmpeg}
+make install DESTDIR=$RPM_BUILD_ROOT -C plugins/encoder/lame
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-%files
+%files
%defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/k3bffmpegdecoder.so
-%{_kde4_libdir}/kde4/k3blameencoder.so
-%{_kde4_libdir}/kde4/k3bmaddecoder.so
-%{_kde4_libdir}/kde4/kcm_k3blameencoder.so
-%{_kde4_datadir}/kde4/services/k3bffmpegdecoder.desktop
-%{_kde4_datadir}/kde4/services/k3blameencoder.desktop
-%{_kde4_datadir}/kde4/services/k3bmaddecoder.desktop
-%{_kde4_datadir}/kde4/services/kcm_k3blameencoder.desktop
+%{?ffmpeg:%{_libdir}/kde3/libk3bffmpegdecoder.*}
+%{?ffmpeg:%{_datadir}/apps/k3b/plugins/k3bffmpegdecoder.plugin}
+%{_libdir}/kde3/libk3blameencoder.*
+%{_datadir}/apps/k3b/plugins/k3blameencoder.plugin
+%{_libdir}/kde3/libk3bmaddecoder.*
+%{_datadir}/apps/k3b/plugins/k3bmaddecoder.plugin
%changelog
-* Wed Jun 17 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.66.0-0.1.alpha2
-- k3b-1.66.0
+* Thu Oct 01 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.0.5-7
+- Epoch: 1 (F-12 revert to k3b-1.0.5)
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.5-6
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jun 2009 15:38:31 -0000 1.3
+++ sources 1 Oct 2009 13:34:36 -0000 1.4
@@ -1 +1 @@
-60717ca718da93ee65f5fc2c0d9e8c71 k3b-1.66.0alpha2.tar.bz2
+e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2
--- k3b-1.66.0-ffmpeg.patch DELETED ---
14 years, 6 months
rpms/mythtv/devel mythtv.spec,1.50,1.51 sources,1.28,1.29
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11703
Modified Files:
mythtv.spec sources
Log Message:
* Wed Sep 30 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22144
- Update to pre-0.22 svn trunk revision 22144
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mythtv.spec 16 Sep 2009 12:41:15 -0000 1.50
+++ mythtv.spec 1 Oct 2009 03:51:12 -0000 1.51
@@ -9,13 +9,17 @@
# David Bussenschutt <buzz(a)oska.com>
# and others; see changelog at bottom for details.
#
-# The latest version of this file can be found at:
+# The latest canonical upstream version of this file can be found at:
#
-# http://www.mythtv.org/wiki/index.php/Mythtv-svn-rpmbuild.spec
+# http://svn.mythtv.org/svn/trunk/packaging/rpm/mythtv.spec
+#
+# The latest RPM Fusion version can be found at:
+#
+# http://cvs.rpmfusion.org/viewvc/rpms/mythtv/devel/?root=free
#
# Note:
#
-# This spec relies upon several files included in the RPMFusion mythtv
+# This spec relies upon several files included in the RPM Fusion mythtv
# src.rpm file. Please install it into your build tree before trying to
# build anything with this spec.
#
@@ -28,13 +32,13 @@
# The following options are disabled by default. Use these options to enable:
#
# --with directfb Enable directfb support
-# --with xvmcnvidia Enable NVidia XvMC support
#
# The following options are enabled by default. Use these options to disable:
#
+# --without vdpau Disable VDPAU support
+# --without xvmc Disable XvMC support
# --without perl Disable building of the perl bindings
# --without python Disable building of the python bindings
-# --without vdpau Disable NVidia VDPAU support
#
# # All plugins get built by default, but you can disable them as you wish:
#
@@ -61,14 +65,14 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r21864
+%define _svnrev r22144
%define branch trunk
#
# Basic descriptive tags for this package:
#
Name: mythtv
-Summary: A digital video recorder (DVR) application.
+Summary: A digital video recorder (DVR) application
URL: http://www.mythtv.org/
Group: Applications/Multimedia
@@ -90,20 +94,21 @@
# processor-specific optimizations. It seems to cause compile problems on many
# systems (particularly x86_64), so it is classified by the MythTV developers
# as "use at your own risk."
-%define with_proc_opt %{?_with_proc_opt: 1} %{!?_with_proc_opt: 0}
+%define with_proc_opt %{?_with_proc_opt: 1} %{!?_with_proc_opt: 0}
# Set "--with debug" to enable MythTV debug compile mode
-%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
+%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
# The following options are enabled by default. Use --without to disable them
-%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
-%define with_python %{?_without_python: 0} %{!?_without_python: 1}
-%define with_pulseaudio %{?_without_pulseaudio: 0} %{!?_without_pulseaudio: 1}
-%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1}
+%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
+%define with_python %{?_without_python: 0} %{!?_without_python: 1}
+%define with_pulseaudio %{?_without_pulseaudio: 0} %{!?_without_pulseaudio: 1}
# The following options are disabled by default. Use --with to enable them
-%define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0}
-%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0}
+%define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0}
+%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0}
# All plugins get built by default, but you can disable them as you wish
%define with_plugins %{?_without_plugins: 0} %{!?_without_plugins: 1}
@@ -153,7 +158,7 @@
BuildRequires: freetype-devel >= 2
BuildRequires: gcc-c++
BuildRequires: mysql-devel >= 5
-BuildRequires: qt4-devel
+BuildRequires: qt4-devel >= 4.4
BuildRequires: phonon-devel
BuildRequires: lm_sensors-devel
@@ -184,10 +189,9 @@
BuildRequires: gsm-devel
BuildRequires: lame-devel
BuildRequires: libdca-devel
-# libdvdcss will be dynamically loaded if installed
-#BuildRequires: libdvdcss-devel >= 1.2.7
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel >= 0.9.4
+# nb: libdvdcss will be dynamically loaded if installed
BuildRequires: libfame-devel >= 0.9.0
BuildRequires: libmad-devel
BuildRequires: libogg-devel
@@ -224,10 +228,8 @@
%endif
%if %{with_vdpau}
-%ifarch %{ix86} x86_64
BuildRequires: libvdpau-devel
%endif
-%endif
# API Build Requirements
@@ -270,6 +272,7 @@
%endif
%if %{with_mythvideo}
+Requires: perl(XML::Simple)
%endif
%if %{with_mythweather}
@@ -343,12 +346,12 @@
################################################################################
%package -n libmyth
-Summary: Library providing mythtv support.
+Summary: Library providing mythtv support
Group: System Environment/Libraries
Requires: freetype >= 2
Requires: lame
-Requires: qt4
+Requires: qt4 >= 4.4
Requires: qt4-MySQL
%description -n libmyth
@@ -359,14 +362,14 @@
################################################################################
%package -n libmyth-devel
-Summary: Development files for libmyth.
+Summary: Development files for libmyth
Group: Development/Libraries
Requires: libmyth = %{version}-%{release}
Requires: freetype-devel >= 2
Requires: mysql-devel >= 5
-Requires: qt4-devel
+Requires: qt4-devel >= 4.4
Requires: lm_sensors-devel
Requires: lirc-devel
@@ -394,7 +397,6 @@
Requires: gsm-devel
Requires: lame-devel
Requires: libdca-devel
-#Requires: libdvdcss-devel >= 1.2.7
Requires: libdvdnav-devel
Requires: libdvdread-devel >= 0.9.4
Requires: libfame-devel >= 0.9.0
@@ -412,6 +414,9 @@
Requires: alsa-lib-devel
Requires: arts-devel
Requires: jack-audio-connection-kit-devel
+%if %{with_pulseaudio}
+Requires: pulseaudio-libs-devel
+%endif
# Need dvb headers for dvb support
Requires: kernel-headers
@@ -430,10 +435,8 @@
%endif
%if %{with_vdpau}
-%ifarch %{ix86} x86_64
Requires: libvdpau-devel
%endif
-%endif
%description -n libmyth-devel
This package contains the header files and libraries for developing
@@ -483,7 +486,7 @@
Group: Applications/Multimedia
Requires: lame
Requires: mythtv-common = %{version}-%{release}
-Requires: wget
+Requires: wget
Conflicts: xmltv-grabbers < 0.5.37
%description backend
@@ -539,10 +542,8 @@
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(DBD::mysql)
-# Disabled because there are no RPM packages for these yet,
-# and RPM doesn't seem to be picking up on CPAN versions
-#Requires: perl(Net::UPnP)
-#Requires: perl(Net::UPnP::ControlPoint)
+Requires: perl(Net::UPnP)
+Requires: perl(Net::UPnP::ControlPoint)
%description -n perl-MythTV
Provides a perl-based interface to interacting with MythTV.
@@ -816,8 +817,8 @@
# Replace static lib paths with %{_lib} so we build properly on x86_64
# systems, where the libs are actually in lib64.
if [ "%{_lib}" != "lib" ]; then
- grep -rlZ /lib/ . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g'
- grep -rlZ /lib$ . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},'
+ grep -rlZ '/lib/' . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g'
+ grep -rlZ '/lib$' . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},'
grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g'
fi
@@ -827,6 +828,8 @@
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
+# And drop execute bit on theme html files
+ chmod -x themes/default/htmls/*.html
# Nuke Windows and Mac OS X build scripts
rm -rf contrib/Win32 contrib/OSX
@@ -864,7 +867,7 @@
sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
# On to mythplugins
- cd ..
+cd ..
##### MythPlugins
%if %{with_plugins}
@@ -886,13 +889,13 @@
chmod -R g-w ./*
cd ..
-# Prevent all of those nasty installs to ../../../../../bin/whatever
-# echo "QMAKE_PROJECT_DEPTH = 0" >> mythtv.pro
-# echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
-# chmod 644 settings.pro
+# Add execute bits to mythvideo python helper scripts
+ chmod +x mythvideo/mythvideo/scripts/ttvdb/*.py
+# Remove execute bits from some php mythweb files
+ chmod -x mythweb/classes/*.php
# And back to the compile root
- cd ..
+cd ..
%endif
@@ -911,7 +914,7 @@
--libdir=%{_libdir} \
--libdir-name=%{_lib} \
--mandir=%{_mandir} \
- --enable-iptv \
+ --enable-iptv \
--enable-pthreads \
--enable-ffmpeg-pthreads \
--enable-joystick-menu \
@@ -937,10 +940,8 @@
--xvmc-lib=XvMCNVIDIA_dynamic \
%endif
%if %{with_vdpau}
-%ifarch %{ix86} x86_64
--enable-vdpau \
%endif
-%endif
%if %{with_directfb}
--enable-directfb \
%else
@@ -971,7 +972,6 @@
--compile-type=release \
%endif
--enable-debug
-### --enable-libx264 \
# Insert rpm version-release for mythbackend --version output
find . -name version.pro -exec sed -i -e 's,svnversion \$\${SVNTREEDIR},echo "%{version}-%{release}",g' {} \;
@@ -1170,8 +1170,6 @@
mkdir -p %{buildroot}%{_datadir}/mythweb
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
-# fix up permissions
- chmod -R g-x %{buildroot}%{_datadir}/mythweb
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/
@@ -1196,9 +1194,9 @@
%postun -n libmyth -p /sbin/ldconfig
%pre backend
-# Add the "mythtv" user
+# Add the "mythtv" user, with membership in the video group
/usr/sbin/useradd -c "mythtvbackend User" \
- -s /sbin/nologin -r -d %{_varlibdir}/mythtv mythtv 2> /dev/null || :
+ -s /sbin/nologin -r -d %{_varlibdir}/mythtv -G video mythtv 2> /dev/null || :
%post backend
/sbin/chkconfig --add mythbackend
@@ -1263,8 +1261,8 @@
%{_datadir}/mythtv/devicemaster.xml
%{_datadir}/mythtv/deviceslave.xml
%{_datadir}/mythtv/setup.xml
+%{_bindir}/mythavtest
%{_bindir}/mythfrontend
-%{_bindir}/mythtv
%{_bindir}/mythtvosd
%{_bindir}/mythlcdserver
%{_bindir}/mythshutdown
@@ -1476,6 +1474,20 @@
################################################################################
%changelog
+* Wed Sep 30 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22144
+- Update to pre-0.22 svn trunk revision 22144
+
+* Sat Sep 26 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22076
+- Update to pre-0.22 svn trunk revision 22076
+
+* Fri Sep 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21940
+- Update to pre-0.22 svn trunk revision 21940
+- Include initial cut of semi-experimental advanced imon/lcdproc icon support
+- Assorted spec enhancements from James Twyford (via mythtv trac ticket 7090)
+
+* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21902
+- Update to pre-0.22 svn trunk revision 21902
+
* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21864
- Fix botched arch-specific handling of vdpau support
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 15 Sep 2009 03:03:47 -0000 1.28
+++ sources 1 Oct 2009 03:51:12 -0000 1.29
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-b019c9e3b7b2da6558d72f3a495ba4b7 mythtv-0.22.tar.bz2
-384d48ab757da512e9d96f6d87089075 mythplugins-0.22.tar.bz2
+ae6aa1d71890cce49114223830681842 mythtv-0.22.tar.bz2
+602b86b0e5a2414e5080e65b112a08bb mythplugins-0.22.tar.bz2
14 years, 7 months