rpms/dvdrip/devel - New directory
by Xavier Lamien
Author: laxathom
Update of /cvs/free/rpms/dvdrip/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/free/owners/tmpcvsL18795/rpms/dvdrip/devel
Log Message:
Directory /cvs/free/rpms/dvdrip/devel added to the repository
15 years, 11 months
rpms/dvdrip - New directory
by Xavier Lamien
Author: laxathom
Update of /cvs/free/rpms/dvdrip
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/free/owners/tmpcvsL18795/rpms/dvdrip
Log Message:
Directory /cvs/free/rpms/dvdrip added to the repository
15 years, 11 months
rpms/kplayer/devel kplayer-snapshot.sh,NONE,1.1 sources,1.4,1.5
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/kplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6538
Modified Files:
sources
Added Files:
kplayer-snapshot.sh
Log Message:
No need to export the kplayer-snapshot.sh script to the lookaside cache.
Commited it directly to CVS
--- NEW FILE kplayer-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
cvs=$(date +%Y%m%d)cvs
name=kplayer
cd "$tmp"
cvs -z3 -d:pserver:anonymous@kplayer.cvs.sourceforge.net:/cvsroot/kplayer export -D $(date +%Y%m%d) $name
cd $name
version=$(cat ChangeLog |grep release|awk '{print $1}'|awk 'NR == 1')
cd ..
tar jcf "$pwd"/$name-$version-$cvs.tar.bz2 $name
echo "Written: $name-$version-$cvs.tar.bz2"
cd - >/dev/null
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kplayer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 Dec 2008 05:27:46 -0000 1.4
+++ sources 12 Dec 2008 05:37:18 -0000 1.5
@@ -1,2 +1 @@
637c4783500b5f0848410f106b10fb45 kplayer-0.7.0-20081211cvs.tar.bz2
-03665d50113a82abac2fefeef807b97f kplayer-snapshot.sh
15 years, 11 months
rpms/kplayer/F-9 kplayer-snapshot.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 kplayer.spec, 1.2, 1.3 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/kplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6359
Modified Files:
.cvsignore kplayer.spec sources
Added Files:
kplayer-snapshot.sh
Log Message:
* Fri Dec 12 2008 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-1.20081211cvs
- kplayer-0.7.0
- License is GPLv3+ and GFDL
--- NEW FILE kplayer-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
cvs=$(date +%Y%m%d)cvs
name=kplayer
cd "$tmp"
cvs -z3 -d:pserver:anonymous@kplayer.cvs.sourceforge.net:/cvsroot/kplayer export -D $(date +%Y%m%d) $name
cd $name
version=$(cat ChangeLog |grep release|awk '{print $1}'|awk 'NR == 1')
cd ..
tar jcf "$pwd"/$name-$version-$cvs.tar.bz2 $name
echo "Written: $name-$version-$cvs.tar.bz2"
cd - >/dev/null
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 15 Sep 2008 16:07:17 -0000 1.3
+++ .cvsignore 12 Dec 2008 05:33:10 -0000 1.4
@@ -1 +1 @@
-kplayer-0.6.3.tar.bz2
+kplayer-0.7.0-20081211cvs.tar.bz2
Index: kplayer.spec
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-9/kplayer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kplayer.spec 15 Sep 2008 16:04:53 -0000 1.2
+++ kplayer.spec 12 Dec 2008 05:33:10 -0000 1.3
@@ -1,24 +1,20 @@
-
-%define kdelibs kdelibs
-%if 0%{?fedora} > 6
-%define kdelibs kdelibs3
-%endif
+%define cvsversion 20081211cvs
Name: kplayer
-Epoch: 1
-Version: 0.6.3
-Release: 2%{?dist}
+Epoch: 1
+Version: 0.7.0
+Release: 1.%cvsversion%{?dist}
Summary: A media player based on MPlayer
-
Group: Applications/Multimedia
-License: GPLv3
+License: GPLv3+ and GFDL
URL: http://kplayer.sourceforge.net/
-Source0: http://osdn.dl.sourceforge.net/sourceforge/kplayer/kplayer-%{version}.tar...
+Source0: %{name}-%{version}-%cvsversion.tar.bz2
+Source1: %{name}-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
BuildRequires: desktop-file-utils
-BuildRequires: %{kdelibs}-devel
+BuildRequires: gettext
+BuildRequires: kdelibs-devel
Requires: mplayer
#Requires(hint): libdvdcss
@@ -39,38 +35,32 @@
%prep
-%setup -q
+%setup -q -n %{name}
-[ ! -f configure ] && \
-make -f admin/Makefile.common
+%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON .
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependancy-tracking --disable-final
-
-make %{?_smp_mflags}
-
+make %{?_smp_mflags} VERBOSE=1
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
+ # Install HTML docs in the correct location and
+ mv $lang_dir $lang_dir.TMP
+ mkdir $lang_dir
+ mv $lang_dir.TMP $lang_dir/%{name}
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
@@ -82,44 +72,53 @@
done
fi
+# Install servicemenus in the correct location:
+mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
+mv %{buildroot}%{_datadir}/kde4/apps/konqueror/servicemenus/* \
+ %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
+
%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/*.desktop ||:
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
-for icon_theme in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+
%postun
-for icon_theme in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING README TODO
-%{_bindir}/kplayer
-%{_datadir}/applications/kde/*kplayer.desktop
-%{_datadir}/apps/kplayer/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%doc AUTHORS BUGS ChangeLog COPYING* README TODO
+%{_bindir}/%{name}
+%{_datadir}/applications/kde4/*%{name}.desktop
+%{_datadir}/kde4/apps/%{name}/
+%{_datadir}/kde4/services/*%{name}*.desktop
+%{_datadir}/kde4/services/ServiceMenus/
%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/*kplayer*.desktop
-%{_libdir}/kde3/libkplayerpart.*
+%{_libdir}/kde4/lib%{name}part.*
%changelog
+* Fri Dec 12 2008 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-1.20081211cvs
+- kplayer-0.7.0
+- License is GPLv3+ and GFDL
+
* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1:0.6.3-2
- kplayer-0.6.3
- License: GPLv3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 15 Sep 2008 16:07:17 -0000 1.3
+++ sources 12 Dec 2008 05:33:10 -0000 1.4
@@ -1 +1 @@
-f55dab07cefb666f745015ac4dc5de2a kplayer-0.6.3.tar.bz2
+637c4783500b5f0848410f106b10fb45 kplayer-0.7.0-20081211cvs.tar.bz2
15 years, 11 months
rpms/kplayer/F-10 kplayer-snapshot.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 kplayer.spec, 1.3, 1.4 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/kplayer/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5870
Modified Files:
.cvsignore kplayer.spec sources
Added Files:
kplayer-snapshot.sh
Log Message:
* Fri Dec 12 2008 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-1.20081211cvs
- kplayer-0.7.0
- License is GPLv3+ and GFDL
--- NEW FILE kplayer-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
cvs=$(date +%Y%m%d)cvs
name=kplayer
cd "$tmp"
cvs -z3 -d:pserver:anonymous@kplayer.cvs.sourceforge.net:/cvsroot/kplayer export -D $(date +%Y%m%d) $name
cd $name
version=$(cat ChangeLog |grep release|awk '{print $1}'|awk 'NR == 1')
cd ..
tar jcf "$pwd"/$name-$version-$cvs.tar.bz2 $name
echo "Written: $name-$version-$cvs.tar.bz2"
cd - >/dev/null
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 4 Sep 2008 17:05:29 -0000 1.3
+++ .cvsignore 12 Dec 2008 05:30:47 -0000 1.4
@@ -1 +1 @@
-kplayer-0.6.3.tar.bz2
+kplayer-0.7.0-20081211cvs.tar.bz2
Index: kplayer.spec
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-10/kplayer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kplayer.spec 4 Sep 2008 17:05:29 -0000 1.3
+++ kplayer.spec 12 Dec 2008 05:30:47 -0000 1.4
@@ -1,24 +1,20 @@
-
-%define kdelibs kdelibs
-%if 0%{?fedora} > 6
-%define kdelibs kdelibs3
-%endif
+%define cvsversion 20081211cvs
Name: kplayer
-Epoch: 1
-Version: 0.6.3
-Release: 2%{?dist}
+Epoch: 1
+Version: 0.7.0
+Release: 1.%cvsversion%{?dist}
Summary: A media player based on MPlayer
-
Group: Applications/Multimedia
-License: GPLv3
+License: GPLv3+ and GFDL
URL: http://kplayer.sourceforge.net/
-Source0: http://osdn.dl.sourceforge.net/sourceforge/kplayer/kplayer-%{version}.tar...
+Source0: %{name}-%{version}-%cvsversion.tar.bz2
+Source1: %{name}-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
BuildRequires: desktop-file-utils
-BuildRequires: %{kdelibs}-devel
+BuildRequires: gettext
+BuildRequires: kdelibs-devel
Requires: mplayer
#Requires(hint): libdvdcss
@@ -39,38 +35,32 @@
%prep
-%setup -q
+%setup -q -n %{name}
-[ ! -f configure ] && \
-make -f admin/Makefile.common
+%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON .
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependancy-tracking --disable-final
-
-make %{?_smp_mflags}
-
+make %{?_smp_mflags} VERBOSE=1
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
+HTML_DIR=$(kde4-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
+ # Install HTML docs in the correct location and
+ mv $lang_dir $lang_dir.TMP
+ mkdir $lang_dir
+ mv $lang_dir.TMP $lang_dir/%{name}
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
@@ -82,9 +72,14 @@
done
fi
+# Install servicemenus in the correct location:
+mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
+mv %{buildroot}%{_datadir}/kde4/apps/konqueror/servicemenus/* \
+ %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
+
%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/*.desktop ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/*.desktop ||:
%clean
@@ -92,34 +87,38 @@
%post
-for icon_theme in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+
%postun
-for icon_theme in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING README TODO
-%{_bindir}/kplayer
-%{_datadir}/applications/kde/*kplayer.desktop
-%{_datadir}/apps/kplayer/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%doc AUTHORS BUGS ChangeLog COPYING* README TODO
+%{_bindir}/%{name}
+%{_datadir}/applications/kde4/*%{name}.desktop
+%{_datadir}/kde4/apps/%{name}/
+%{_datadir}/kde4/services/*%{name}*.desktop
+%{_datadir}/kde4/services/ServiceMenus/
%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/*kplayer*.desktop
-%{_libdir}/kde3/libkplayerpart.*
+%{_libdir}/kde4/lib%{name}part.*
%changelog
+* Fri Dec 12 2008 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-1.20081211cvs
+- kplayer-0.7.0
+- License is GPLv3+ and GFDL
+
* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1:0.6.3-2
- kplayer-0.6.3
- License: GPLv3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 4 Sep 2008 17:05:29 -0000 1.3
+++ sources 12 Dec 2008 05:30:47 -0000 1.4
@@ -1 +1 @@
-f55dab07cefb666f745015ac4dc5de2a kplayer-0.6.3.tar.bz2
+637c4783500b5f0848410f106b10fb45 kplayer-0.7.0-20081211cvs.tar.bz2
15 years, 11 months
rpms/kplayer/devel .cvsignore, 1.3, 1.4 kplayer.spec, 1.3, 1.4 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/kplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5669
Modified Files:
.cvsignore kplayer.spec sources
Log Message:
* Fri Dec 12 2008 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-1.20081211cvs
- kplayer-0.7.0
- License is GPLv3+ and GFDL
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kplayer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 4 Sep 2008 17:05:29 -0000 1.3
+++ .cvsignore 12 Dec 2008 05:27:46 -0000 1.4
@@ -1 +1,2 @@
-kplayer-0.6.3.tar.bz2
+kplayer-0.7.0-20081211cvs.tar.bz2
+kplayer-snapshot.sh
Index: kplayer.spec
===================================================================
RCS file: /cvs/free/rpms/kplayer/devel/kplayer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kplayer.spec 4 Sep 2008 17:05:29 -0000 1.3
+++ kplayer.spec 12 Dec 2008 05:27:46 -0000 1.4
@@ -1,24 +1,20 @@
-
-%define kdelibs kdelibs
-%if 0%{?fedora} > 6
-%define kdelibs kdelibs3
-%endif
+%define cvsversion 20081211cvs
Name: kplayer
-Epoch: 1
-Version: 0.6.3
-Release: 2%{?dist}
+Epoch: 1
+Version: 0.7.0
+Release: 1.%cvsversion%{?dist}
Summary: A media player based on MPlayer
-
Group: Applications/Multimedia
-License: GPLv3
+License: GPLv3+ and GFDL
URL: http://kplayer.sourceforge.net/
-Source0: http://osdn.dl.sourceforge.net/sourceforge/kplayer/kplayer-%{version}.tar...
+Source0: %{name}-%{version}-%cvsversion.tar.bz2
+Source1: %{name}-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
BuildRequires: desktop-file-utils
-BuildRequires: %{kdelibs}-devel
+BuildRequires: gettext
+BuildRequires: kdelibs-devel
Requires: mplayer
#Requires(hint): libdvdcss
@@ -39,38 +35,32 @@
%prep
-%setup -q
+%setup -q -n %{name}
-[ ! -f configure ] && \
-make -f admin/Makefile.common
+%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON .
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependancy-tracking --disable-final
-
-make %{?_smp_mflags}
-
+make %{?_smp_mflags} VERBOSE=1
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
+HTML_DIR=$(kde4-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
+ # Install HTML docs in the correct location and
+ mv $lang_dir $lang_dir.TMP
+ mkdir $lang_dir
+ mv $lang_dir.TMP $lang_dir/%{name}
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
@@ -82,9 +72,14 @@
done
fi
+# Install servicemenus in the correct location:
+mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
+mv %{buildroot}%{_datadir}/kde4/apps/konqueror/servicemenus/* \
+ %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
+
%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/*.desktop ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/*.desktop ||:
%clean
@@ -92,34 +87,38 @@
%post
-for icon_theme in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+
%postun
-for icon_theme in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING README TODO
-%{_bindir}/kplayer
-%{_datadir}/applications/kde/*kplayer.desktop
-%{_datadir}/apps/kplayer/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%doc AUTHORS BUGS ChangeLog COPYING* README TODO
+%{_bindir}/%{name}
+%{_datadir}/applications/kde4/*%{name}.desktop
+%{_datadir}/kde4/apps/%{name}/
+%{_datadir}/kde4/services/*%{name}*.desktop
+%{_datadir}/kde4/services/ServiceMenus/
%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/*kplayer*.desktop
-%{_libdir}/kde3/libkplayerpart.*
+%{_libdir}/kde4/lib%{name}part.*
%changelog
+* Fri Dec 12 2008 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-1.20081211cvs
+- kplayer-0.7.0
+- License is GPLv3+ and GFDL
+
* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1:0.6.3-2
- kplayer-0.6.3
- License: GPLv3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kplayer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 4 Sep 2008 17:05:29 -0000 1.3
+++ sources 12 Dec 2008 05:27:46 -0000 1.4
@@ -1 +1,2 @@
-f55dab07cefb666f745015ac4dc5de2a kplayer-0.6.3.tar.bz2
+637c4783500b5f0848410f106b10fb45 kplayer-0.7.0-20081211cvs.tar.bz2
+03665d50113a82abac2fefeef807b97f kplayer-snapshot.sh
15 years, 11 months
rpms/mythtv/F-9 mythtv.spec,1.7,1.8
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4163
Modified Files:
mythtv.spec
Log Message:
damn. screwed up a fix slightly...
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythtv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mythtv.spec 12 Dec 2008 03:49:51 -0000 1.7
+++ mythtv.spec 12 Dec 2008 05:05:53 -0000 1.8
@@ -831,6 +831,7 @@
%{_bindir}/mythwelcome
%dir %{_libdir}/mythtv
%dir %{_libdir}/mythtv/filters
+%{_libdir}/mythtv/filters/*
%dir %{_libdir}/mythtv/plugins
%{_datadir}/mythtv/*.ttf
%dir %{_datadir}/mythtv/i18n
15 years, 11 months
rpms/mythtv/F-10 mythtv.spec,1.14,1.15
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3435
Modified Files:
mythtv.spec
Log Message:
damn. screwed up a fix slightly...
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mythtv.spec 12 Dec 2008 03:48:38 -0000 1.14
+++ mythtv.spec 12 Dec 2008 04:55:42 -0000 1.15
@@ -831,6 +831,7 @@
%{_bindir}/mythwelcome
%dir %{_libdir}/mythtv
%dir %{_libdir}/mythtv/filters
+%{_libdir}/mythtv/filters/*
%dir %{_libdir}/mythtv/plugins
%{_datadir}/mythtv/*.ttf
%dir %{_datadir}/mythtv/i18n
15 years, 11 months
rpms/mythtv/devel mythtv.spec,1.14,1.15
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3305
Modified Files:
mythtv.spec
Log Message:
damn. screwed up a fix slightly...
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mythtv.spec 12 Dec 2008 03:44:15 -0000 1.14
+++ mythtv.spec 12 Dec 2008 04:52:21 -0000 1.15
@@ -831,6 +831,7 @@
%{_bindir}/mythwelcome
%dir %{_libdir}/mythtv
%dir %{_libdir}/mythtv/filters
+%{_libdir}/mythtv/filters/*
%dir %{_libdir}/mythtv/plugins
%{_datadir}/mythtv/*.ttf
%dir %{_datadir}/mythtv/i18n
15 years, 11 months
rpms/mythtv/F-9 mythplugins-0.21-svnfixes.patch, 1.3, 1.4 mythtv-0.21-svnfixes.patch, 1.3, 1.4 mythtv.spec, 1.6, 1.7
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32002
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
- Update to release-0-21-fixes patches (r19344)
- Includes critical fix for supporting use of FireWire cable
boxes w/Fedora's native FireWire driver stack (finally!)
- Fix missing package ownership of some stray dirs (rpmfusion bz#222)
mythplugins-0.21-svnfixes.patch:
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:32:20 -0000 1.3
+++ mythplugins-0.21-svnfixes.patch 12 Dec 2008 03:49:51 -0000 1.4
@@ -2,7 +2,24 @@
===================================================================
--- mythplugins/mythweb/INSTALL (revision 16468)
+++ mythplugins/mythweb/INSTALL (working copy)
-@@ -195,6 +195,10 @@
+@@ -2,7 +2,7 @@
+ requirements and instructions for MythWeb. Please see README for other
+ information.
+
+-February 16, 2008
++October 26, 2008
+
+ ========
+ Contents
+@@ -18,6 +18,7 @@
+ 5.0 Apache
+ 5.1 Apache Config
+ 6.0 Lighttpd
++7.0 PHP
+
+ =======
+ Summary
+@@ -195,6 +196,10 @@
mod_deflate
mod_headers
@@ -13,6 +30,32 @@
=================
5.1 Apache Config
=================
+@@ -245,3 +250,25 @@
+
+ Sorry, no documentation here yet...
+
++=======
++7.0 PHP
++=======
++
++PHP tries to determine the system's local timezone settings automatically
++but may not be successful on every distribution. To ensure that PHP uses
++the correct timezone, edit php.ini and configure the date.timezone variable
++to your local timezone.
++
++For example, to set the PHP timezone to Europe/London:
++
++ vim /etc/php.ini
++
++add/uncomment the date.timezone variable:
++
++ date.timezone = Europe/London
++
++and then restart Apache (exact commands depend on distribution):
++
++ /etc/init.d/apache2 stop
++ /etc/init.d/apache2 start
++
Index: mythplugins/mythweb/modules/music/stream.php
===================================================================
--- mythplugins/mythweb/modules/music/stream.php (revision 16468)
@@ -1176,6 +1219,34 @@
backend_command(array('FORGET_RECORDING', implode(backend_sep, $row), '0'));
// Delay a second so the scheduler can catch up
sleep(1);
+Index: mythplugins/mythweb/README
+===================================================================
+--- mythplugins/mythweb/README (revision 16468)
++++ mythplugins/mythweb/README (working copy)
+@@ -135,10 +135,16 @@
+ Q: I get a "500 server error" (or some other number) when trying to view
+ MythWeb.
+ A: Check your apache logs for details about what caused the error. Usually,
+- it means that you didn't set up a required module. Read the
++ it means that you didn't set up a required module. Read the
+ mythweb.conf.apache file in more detail to make sure you didn't miss
+ an important setup file.
+
++Q: MythWeb complains about "Warning: Unknown Programme" after Daylight Savings
++ Time has started/finished.
++A: PHP may not have determined your local timezone correctly. Read the PHP
++ section of MythWeb's INSTALL file to find out how to correctly configure
++ your timezone in PHP.
++
+ ======================
+ 4.0 Submitting Patches
+ ======================
+@@ -150,5 +156,3 @@
+ other "diff -u" patches, but if there have been any major changes in SVN (there
+ occasionally are), I won't put much effort into trying to make your patch work,
+ so please just use SVN.
+-
+-
Index: mythplugins/configure
===================================================================
--- mythplugins/configure (revision 16468)
@@ -10168,6 +10239,7 @@
<position>0,0</position>
</image>
+
Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468)
@@ -12142,6 +12214,19 @@
command_string = "Internal";
gContext->GetMainWindow()->HandleMedia(command_string, filename);
+Index: mythplugins/mythvideo/mythvideo/videofilter.cpp
+===================================================================
+--- mythplugins/mythvideo/mythvideo/videofilter.cpp (revision 16468)
++++ mythplugins/mythvideo/mythvideo/videofilter.cpp (working copy)
+@@ -293,7 +293,7 @@
+ {
+ if (runtime == kRuntimeFilterUnknown)
+ {
+- matches = mdata.Length() < 0;
++ matches = mdata.Length() == 0;
+ }
+ else
+ {
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
mythtv-0.21-svnfixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.21-svnfixes.patch 29 Nov 2008 06:32:20 -0000 1.3
+++ mythtv-0.21-svnfixes.patch 12 Dec 2008 03:49:51 -0000 1.4
@@ -7332,6 +7332,10 @@
</message>
</context>
</TS>
+Index: mythtv/i18n/mythfrontend_nb.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythtv/i18n/mythfrontend_de.ts
===================================================================
--- mythtv/i18n/mythfrontend_de.ts (revision 16468)
@@ -25114,6 +25118,34 @@
</message>
</context>
<context>
+Index: mythtv/i18n/mythfrontend_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_cz.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_de.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_sv.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_he.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_dk.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythtv/configure
===================================================================
--- mythtv/configure (revision 16468)
@@ -26358,6 +26390,10 @@
Hauppauge website for the most accurate information.</P>
<P>A PVR-150 comes in a number of versions:
<UL>
+Index: mythtv/docs/mythtv-HOWTO.pdf
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythtv/docs/index.html
===================================================================
--- mythtv/docs/index.html (revision 16468)
@@ -26387,7 +26423,7 @@
Index: mythtv/libs/libs-targetfix.pro
===================================================================
--- mythtv/libs/libs-targetfix.pro (revision 0)
-+++ mythtv/libs/libs-targetfix.pro (revision 19169)
++++ mythtv/libs/libs-targetfix.pro (revision 19344)
@@ -0,0 +1,20 @@
+# Common project modifications to change the generated target.
+
@@ -26679,6 +26715,55 @@
image->SetDontRoundPosition(true);
subtitleOSD->AddType(image);
+Index: mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
+===================================================================
+--- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (revision 16468)
++++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (working copy)
+@@ -981,28 +981,25 @@
+ correct_bttv = true;
+
+ QString driver = (char *)vcap.driver;
+- if (driver == "cx8800" || driver == "go7007" || driver == "em28xx")
++ channelfd = open(videodevice.ascii(), O_RDWR);
++ if (channelfd < 0)
+ {
+- channelfd = open(videodevice.ascii(), O_RDWR);
+- if (channelfd < 0)
+- {
+- VERBOSE(VB_IMPORTANT, LOC_ERR +
+- QString("Can't open video device: %1").arg(videodevice));
+- perror("open video:");
+- KillChildren();
+- return false;
+- }
+-
+- if (driver == "go7007")
+- {
+- go7007 = true;
+- }
+-
+- inpixfmt = FMT_NONE;
+- InitFilters();
+- DoV4L2();
++ VERBOSE(VB_IMPORTANT, LOC_ERR +
++ QString("Can't open video device: %1").arg(videodevice));
++ perror("open video:");
++ KillChildren();
+ return false;
+ }
++
++ if (driver == "go7007")
++ {
++ go7007 = true;
++ }
++
++ inpixfmt = FMT_NONE;
++ InitFilters();
++ DoV4L2();
++ return false;
+ }
+
+ channelfd = fd;
Index: mythtv/libs/libmythtv/videoout_d3d.cpp
===================================================================
--- mythtv/libs/libmythtv/videoout_d3d.cpp (revision 16468)
@@ -26999,6 +27084,28 @@
allowedquit = true;
dvd_video_codec_changed = false;
continue;
+@@ -3446,10 +3447,6 @@
+ .av_substream_index;
+ }
+
+- if (firstloop && pkt->pts != (int64_t)AV_NOPTS_VALUE)
+- lastapts = (long long)(av_q2d(curstream->time_base) *
+- pkt->pts * 1000);
+-
+ if ((onlyvideo > 0) || (pkt->stream_index != audIdx))
+ {
+ ptr += len;
+@@ -3457,6 +3454,10 @@
+ continue;
+ }
+
++ if (firstloop && pkt->pts != (int64_t)AV_NOPTS_VALUE)
++ lastapts = (long long)(av_q2d(curstream->time_base) *
++ pkt->pts * 1000);
++
+ if (skipaudio)
+ {
+ if ((lastapts < lastvpts - (10.0 / fps)) ||
@@ -3749,9 +3750,6 @@
picframe->frameNumber = framesPlayed;
@@ -27982,7 +28089,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.h
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19169)
++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19344)
@@ -0,0 +1,12 @@
+#ifndef _FREESAT_HUFFMAN_H_
+#define _FREESAT_HUFFMAN_H_
@@ -28005,3049 +28112,4377 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_tables.h
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19169)
-@@ -0,0 +1,3042 @@
-+/*
-+ * This table was derived from on-air transmissions. It certainly has omissions and
-+ * almost certainly contains errors. Use entirely at your own risk.
-+ */
-+
-+static struct hufftab fsat_huffman1[] =
-+{
-+ { START, 0x00000000, 2, 'T'},
-+ { START, 0x40000000, 3, 'B'},
-+ { START, 0x60000000, 5, 'L'},
-+ { START, 0x68000000, 7, 'K'},
-+ { START, 0x6a000000, 8, '6'},
-+ { START, 0x6c000000, 6, 'Q'},
-+ { START, 0x70000000, 5, 'D'},
-+ { START, 0x78000000, 5, 'H'},
-+ { START, 0x80000000, 4, 'C'},
-+ { START, 0x90000000, 4, 'I'},
-+ { START, 0xa0000000, 5, 'R'},
-+ { START, 0xa8000000, 5, 'N'},
-+ { START, 0xb0000000, 5, 'E'},
-+ { START, 0xb8000000, 8, 'V'},
-+ { START, 0xb9000000, 10, 'Z'},
-+ { START, 0xb9400000, 11, '1'},
-+ { START, 0xb9600000, 11, '3'},
-+ { START, 0xb9800000, 9, '2'},
-+ { START, 0xba000000, 7, 'U'},
[...9085 lines suppressed...]
++
++}
++
+ MHEntryField::~MHEntryField()
+ {
+
Index: mythtv/libs/libmythdvdnav/libmythdvdnav.pro
===================================================================
--- mythtv/libs/libmythdvdnav/libmythdvdnav.pro (revision 16468)
@@ -40283,24 +43222,150 @@
===================================================================
--- mythtv/programs/mythbackend/backendutil.cpp (revision 16468)
+++ mythtv/programs/mythbackend/backendutil.cpp (working copy)
-@@ -207,7 +207,7 @@
+@@ -20,26 +20,20 @@
+ #include "libmyth/util.h"
+ #include "libmyth/compat.h"
+
+-static QMap<int, int> fsID_cache;
++static QMap<QString, int> fsID_cache;
+ static QMutex cache_lock;
+
+ /// gets stable fsIDs based of the dirID
+-static int GetfsID(int dirID)
++static int GetfsID(vector<FileSystemInfo>::iterator fsInfo)
+ {
++ QString fskey = fsInfo->hostname + ":" + fsInfo->directory;
+ QMutexLocker lock(&cache_lock);
+- if (!fsID_cache.contains(dirID))
+- fsID_cache[dirID] = fsID_cache.count();
++ if (!fsID_cache.contains(fskey))
++ fsID_cache[fskey] = fsID_cache.count();
+
+- return fsID_cache[dirID];
++ return fsID_cache[fskey];
+ }
+
+-// checks the cache if we know this dirID, used to skip known unique file systems
+-static bool HasfsID(int dirID)
+-{
+- QMutexLocker lock(&cache_lock);
+- return fsID_cache.contains(dirID);
+-}
+-
+ static size_t GetCurrentMaxBitrate(QMap<int, EncoderLink *> *encoderList)
+ {
+ size_t totalKBperMin = 0;
+@@ -180,7 +174,7 @@
+ while (it != strlist.end())
+ {
+ fsInfo.hostname = *(it++);
+- fsInfo.directory = fsInfo.hostname.section(".", 0, 0) + ":" + *(it++);
++ fsInfo.directory = *(it++);
+ fsInfo.isLocal = (*(it++)).toInt();
+ fsInfo.fsID = (*(it++)).toInt();
+ fsInfo.dirID = (*(it++)).toInt();
+@@ -198,7 +192,11 @@
+ for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++)
+ {
+ if (it1->fsID == -1)
+- it1->fsID = GetfsID(it1->dirID);
++ {
++ it1->fsID = GetfsID(it1);
++ it1->directory =
++ it1->hostname.section(".", 0, 0) + ":" + it1->directory;
++ }
+
+ it2 = it1;
+ for (it2++; it2 != fsInfos.end(); it2++)
+@@ -206,14 +204,14 @@
+ // Sometimes the space reported for an NFS mounted dir is slightly
// different than when it is locally mounted because of block sizes
if (it2->fsID == -1 &&
- (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
+- (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
+ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
<= maxWriteFiveSec))
{
-@@ -292,7 +292,7 @@
+ if (!it1->hostname.contains(it2->hostname))
+ it1->hostname = it1->hostname + "," + it2->hostname;
+- it1->directory = it1->directory + "," + it2->directory;
++ it1->directory = it1->directory + "," +
++ it2->hostname.section(".", 0, 0) + ":" + it2->directory;
+ fsInfos.erase(it2);
+ it2 = it1;
+ }
+@@ -276,32 +274,56 @@
+ fsInfos.push_back(fsInfo);
+ }
+
++ VERBOSE(VB_SCHEDULE+VB_FILE, "Determining unique filesystems");
+ size_t maxWriteFiveSec = GetCurrentMaxBitrate(tvList)/12 /*5 seconds*/;
+ maxWriteFiveSec = max((size_t)2048, maxWriteFiveSec); // safety for NFS mounted dirs
+ vector<FileSystemInfo>::iterator it1, it2;
+ for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++)
+ {
+ if (it1->fsID == -1)
+- it1->fsID = GetfsID(it1->dirID);
++ it1->fsID = GetfsID(it1);
+ else
+ continue;
+
++ VERBOSE(VB_SCHEDULE+VB_FILE,
++ QString("%1:%2 (fsID %3, dirID %4) using %5 out of %6 KB, "
++ "looking for matches")
++ .arg(it1->hostname).arg(it1->directory)
++ .arg(it1->fsID).arg(it1->dirID)
++ .arg(it1->usedSpaceKB).arg(it1->totalSpaceKB));
+ it2 = it1;
+ for (it2++; it2 != fsInfos.end(); it2++)
+ {
++ VERBOSE(VB_SCHEDULE+VB_FILE,
++ QString(" Checking %1:%2 (dirID %3) using %4 of %5 KB")
++ .arg(it2->hostname).arg(it2->directory).arg(it2->dirID)
++ .arg(it2->usedSpaceKB).arg(it2->totalSpaceKB));
++ VERBOSE(VB_SCHEDULE+VB_FILE,
++ QString(" Total KB Diff: %1 (want <= 32)")
++ .arg((long)absLongLong(it1->totalSpaceKB - it2->totalSpaceKB)));
++ VERBOSE(VB_SCHEDULE+VB_FILE,
++ QString(" Used KB Diff: %1 (want <= %2)")
++ .arg((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB))
++ .arg(maxWriteFiveSec));
++
// Sometimes the space reported for an NFS mounted dir is slightly
// different than when it is locally mounted because of block sizes
- if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
+- if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++ if (it2->fsID == -1 &&
+ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
<= maxWriteFiveSec))
{
+ it2->fsID = it1->fsID;
++
++ VERBOSE(VB_SCHEDULE+VB_FILE,
++ QString(" MATCH Found: %1:%2 will use fsID %3")
++ .arg(it2->hostname).arg(it2->directory)
++ .arg(it2->fsID));
+ }
+ }
+ }
+
+- if (print_verbose_messages & VB_FILE)
++ if (print_verbose_messages & (VB_FILE|VB_SCHEDULE))
+ {
+ cout << "--- GetFilesystemInfos directory list start ---" << endl;
+ for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++)
+@@ -313,7 +335,8 @@
+ else
+ cout << "Remote";
+ cout << endl;
+- cout << " Drive ID: " << it1->fsID << endl;
++ cout << " fsID : " << it1->fsID << endl;
++ cout << " dirID : " << it1->dirID << endl;
+ cout << " TotalKB : " << it1->totalSpaceKB << endl;
+ cout << " UsedKB : " << it1->usedSpaceKB << endl;
+ cout << " FreeKB : " << it1->freeSpaceKB << endl;
Index: mythtv/programs/mythtv-setup/setup.xml
===================================================================
--- mythtv/programs/mythtv-setup/setup.xml (revision 16468)
@@ -40784,7 +43849,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19344)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -41288,7 +44353,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19344)
@@ -0,0 +1,69 @@
+@rem = '--*-Perl-*--
+@rem
@@ -41370,7 +44435,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19344)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -41432,7 +44497,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19344)
@@ -0,0 +1,58 @@
+@Echo off
+::
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythtv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mythtv.spec 29 Nov 2008 06:32:20 -0000 1.6
+++ mythtv.spec 12 Dec 2008 03:49:51 -0000 1.7
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r19169
+%define _svnver r19344
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 14%{?dist}
+Release: 15%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -255,6 +255,8 @@
Group: Applications/Multimedia
Requires: lame
Requires: mythtv-common = %{version}-%{release}
+# libraw1394 2.0.0-5 for f10+ and 1.3.0-11 for f9 contain a critical fix
+Requires: libraw1394 >= 1.3.0-11
Conflicts: xmltv-grabbers < 0.5.37
%description backend
@@ -772,6 +774,7 @@
%files common
%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythtv
+%dir %{_datadir}/mythtv
%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
%config(noreplace) %{_sysconfdir}/mythtv/config.xml
%{_bindir}/mythcommflag
@@ -826,7 +829,8 @@
%{_bindir}/mythlcdserver
%{_bindir}/mythshutdown
%{_bindir}/mythwelcome
-%{_libdir}/mythtv/filters
+%dir %{_libdir}/mythtv
+%dir %{_libdir}/mythtv/filters
%dir %{_libdir}/mythtv/plugins
%{_datadir}/mythtv/*.ttf
%dir %{_datadir}/mythtv/i18n
@@ -848,6 +852,7 @@
%{_includedir}/*
%{_libdir}/*.so
%exclude %{_libdir}/*.a
+%dir %{_datadir}/mythtv/build
%{_datadir}/mythtv/build/settings.pro
%files -n mythplugins
@@ -1003,6 +1008,8 @@
%{perl_vendorlib}/MythTV.pm
%dir %{perl_vendorlib}/MythTV
%{perl_vendorlib}/MythTV/*.pm
+%dir %{perl_vendorlib}/IO/Socket
+%dir %{perl_vendorlib}/IO/Socket/INET
%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
%exclude %{perl_vendorarch}/auto/MythTV/.packlist
@@ -1015,6 +1022,12 @@
%endif
%changelog
+* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
+- Update to release-0-21-fixes patches (r19344)
+- Includes critical fix for supporting use of FireWire cable
+ boxes w/Fedora's native FireWire driver stack (finally!)
+- Fix missing package ownership of some stray dirs (rpmfusion bz#222)
+
* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
- Update release-0-21-fixes patches (r19169)
- Should resolve 720p playback stutter, rpmfusion bz#186
15 years, 11 months
