rpms/php-pecl-pdflib/devel .cvsignore, 1.5, 1.6 php-pecl-pdflib.spec, 1.11, 1.12 sources, 1.5, 1.6 pdflib-php54.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/nonfree/rpms/php-pecl-pdflib/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28179
Modified Files:
.cvsignore php-pecl-pdflib.spec sources
Removed Files:
pdflib-php54.patch
Log Message:
Update to 2.1.9, provide ZTS extension
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 7 May 2010 04:42:10 -0000 1.5
+++ .cvsignore 9 Jun 2012 05:21:05 -0000 1.6
@@ -1 +1 @@
-pdflib-2.1.8.tgz
+pdflib-2.1.9.tgz
Index: php-pecl-pdflib.spec
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/php-pecl-pdflib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-pecl-pdflib.spec 2 May 2012 08:36:49 -0000 1.11
+++ php-pecl-pdflib.spec 9 Jun 2012 05:21:05 -0000 1.12
@@ -1,6 +1,7 @@
%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
+%{!?php_inidir: %{expand: %%global php_inidir %{_sysconfdir}/php.d}}
%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
-%{!?php_apiver: %{expand: %%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}}
+%{!?php_apiver: %{expand: %%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}}
%global pecl_name pdflib
%global extname pdf
@@ -8,19 +9,15 @@
Summary: Package for generating PDF files
Summary(fr): Extension pour générer des fichiers PDF
Name: php-pecl-pdflib
-Version: 2.1.8
-Release: 4%{?dist}
+Version: 2.1.9
+Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/pdflib
Source: http://pecl.php.net/get/pdflib-%{version}.tgz
-
Source2: xml2changelog
-# https://bugs.php.net/60397 php 5.4 build
-Patch0: pdflib-php54.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel, pdflib-lite-devel, php-pear
@@ -62,8 +59,6 @@
%setup -c -q
%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-%patch0 -p0 -b .php54
-
# Check version
extver=$(sed -n '/#define PHP_PDFLIB_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/php_pdflib.h)
if test "x${extver}" != "x%{version}"; then
@@ -71,38 +66,59 @@
exit 1
fi
+cp -pr %{pecl_name}-%{version} %{pecl_name}-zts
+
+# Create the config file
+cat > %{extname}.ini << 'EOF'
+; Enable PDFlib extension module
+extension=%{extname}.so
+EOF
+
%build
-cd pdflib-%{version}
-phpize
-%configure
+cd %{pecl_name}-%{version}
+%{_bindir}/phpize
+%configure --with-php-config=%{_bindir}/php-config
+make %{?_smp_mflags}
+
+%if 0%{?__ztsphp:1}
+cd ../%{pecl_name}-zts
+%{_bindir}/zts-phpize
+%configure --with-php-config=%{_bindir}/zts-php-config
make %{?_smp_mflags}
+%endif
%install
-cd pdflib-%{version}
rm -rf %{buildroot}
-make install INSTALL_ROOT=%{buildroot}
+
+make -C %{pecl_name}-%{version} install-modules INSTALL_ROOT=%{buildroot}
# Drop in the bit of configuration
-mkdir -p %{buildroot}%{_sysconfdir}/php.d
-cat > %{buildroot}%{_sysconfdir}/php.d/%{extname}.ini << 'EOF'
-; Enable PDFlib extension module
-extension=%{extname}.so
-EOF
+install -D -m 644 %{extname}.ini %{buildroot}%{php_inidir}/%{extname}.ini
# Install XML package description
-mkdir -p %{buildroot}%{pecl_xmldir}
-install -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+
+%if 0%{?__ztsphp:1}
+make -C %{pecl_name}-zts install-modules INSTALL_ROOT=%{buildroot}
+install -D -m 644 %{extname}.ini %{buildroot}%{php_ztsinidir}/%{extname}.ini
+%endif
%check
-cd %{pecl_name}-%{version}
-php -n \
- -d extension_dir=modules \
+%{_bindir}/php -n \
+ -d extension_dir=%{pecl_name}-%{version}/modules \
-d extension=%{extname}.so \
-m | grep %{extname}
+%if 0%{?__ztsphp:1}
+%{__ztsphp} -n \
+ -d extension_dir=%{pecl_name}-zts/modules \
+ -d extension=%{extname}.so \
+ -m | grep %{extname}
+%endif
+
%if 0%{?pecl_install:1}
%post
@@ -124,13 +140,22 @@
%files
%defattr(-, root, root, -)
-%doc CHANGELOG pdflib-%{version}/CREDITS
-%config(noreplace) %{_sysconfdir}/php.d/%{extname}.ini
+%doc CHANGELOG %{pecl_name}-%{version}/CREDITS
+%config(noreplace) %{php_inidir}/%{extname}.ini
%{php_extdir}/%{extname}.so
%{pecl_xmldir}/%{name}.xml
+%if 0%{?__ztsphp:1}
+%config(noreplace) %{php_ztsinidir}/%{extname}.ini
+%{php_ztsextdir}/%{extname}.so
+%endif
+
%changelog
+* Sat Jun 09 2012 Remi Collet <RPMS(a)FamilleCollet.com> 2.1.9-1
+- update to 2.1.9
+- add ZTS extension
+
* Wed May 02 2012 Remi Collet <rpmfusion(a)FamilleCollet.com> 2.1.8-4
- add patch for php 5.4
- fix filter for private .so
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 7 May 2010 04:42:10 -0000 1.5
+++ sources 9 Jun 2012 05:21:05 -0000 1.6
@@ -1 +1 @@
-ee1b7c30b68b2caba8a95ef9a45e9b84 pdflib-2.1.8.tgz
+04b4e0a2a8731c5f087f40620aca4ddf pdflib-2.1.9.tgz
--- pdflib-php54.patch DELETED ---
12 years, 5 months
- 1
- 0
rpms/mythtv/EL-6 mythtv.spec,1.85,1.86
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24567
Modified Files:
mythtv.spec
Log Message:
Fix bad source.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mythtv.spec 9 Jun 2012 02:21:10 -0000 1.85
+++ mythtv.spec 9 Jun 2012 02:25:42 -0000 1.86
@@ -155,7 +155,6 @@
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
Source110: mysql.txt
-Source111: 99-mythbackend.rules
Source401: mythweb.conf
12 years, 5 months
- 1
- 0
rpms/mythtv/EL-6 mythfrontend.png,NONE,1.1 mythtv-setup.png,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24442
Added Files:
mythfrontend.png mythtv-setup.png
Log Message:
Add missing icons.
12 years, 5 months
- 1
- 0
rpms/mythtv/EL-6 mythtv-0.25-fixes.patch, NONE, 1.1 mythtv_0.25_gcc_4.7.patch, NONE, 1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24286
Added Files:
mythtv-0.25-fixes.patch mythtv_0.25_gcc_4.7.patch
Log Message:
Add missing patches to cvs.
mythtv-0.25-fixes.patch:
mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44
mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264
mythplugins/mythgame/i18n/mythgame_fi.qm |binary
mythplugins/mythgame/i18n/mythgame_fi.ts | 178
mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++-
mythplugins/mythmusic/mythmusic/visualize.cpp | 60
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96
mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8
mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6
mythplugins/mythnews/i18n/mythnews_fi.qm |binary
mythplugins/mythnews/i18n/mythnews_fi.ts | 44
mythplugins/mythweather/i18n/mythweather_fi.qm |binary
mythplugins/mythweather/i18n/mythweather_fi.ts | 60
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84
mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3
mythtv/VERSION | 2
mythtv/bindings/python/MythTV/mythproto.py | 4
mythtv/bindings/python/MythTV/static.py | 2
mythtv/bindings/python/setup.py | 2
mythtv/configure | 15
mythtv/docs/doxygen-create-developer-docs.cfg | 2
mythtv/filters/yadif/filter_yadif.c | 2
mythtv/i18n/mythfrontend_fi.qm |binary
mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++----
mythtv/i18n/mythfrontend_nb.qm |binary
mythtv/i18n/mythfrontend_nb.ts | 2
mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2
mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55
mythtv/libs/libmyth/audio/audiooutputbase.h | 4
mythtv/libs/libmyth/audio/audiooutputca.cpp | 2
mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27
mythtv/libs/libmyth/remoteutil.cpp | 16
mythtv/libs/libmyth/remoteutil.h | 1
mythtv/libs/libmyth/rssparse.h | 1
mythtv/libs/libmythbase/bonjourregister.cpp | 5
mythtv/libs/libmythbase/compat.h | 2
mythtv/libs/libmythbase/logging.cpp | 3
mythtv/libs/libmythbase/serverpool.cpp | 46
mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6
mythtv/libs/libmythsoundtouch/STTypes.h | 2
mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1
mythtv/libs/libmythtv/audioinput.h | 1
mythtv/libs/libmythtv/avformatdecoder.cpp | 10
mythtv/libs/libmythtv/dtvrecorder.cpp | 4
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49
mythtv/libs/libmythtv/fileringbuffer.cpp | 6
mythtv/libs/libmythtv/libmythtv.pro | 1
mythtv/libs/libmythtv/mythairplayserver.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 30
mythtv/libs/libmythtv/mythplayer.h | 3
mythtv/libs/libmythtv/mythraopconnection.cpp | 262
mythtv/libs/libmythtv/mythraopconnection.h | 13
mythtv/libs/libmythtv/mythraopdevice.cpp | 13
mythtv/libs/libmythtv/osd.cpp | 2
mythtv/libs/libmythtv/playercontext.h | 4
mythtv/libs/libmythtv/ringbuffer.cpp | 8
mythtv/libs/libmythtv/teletextscreen.cpp | 8
mythtv/libs/libmythtv/tv_play.cpp | 26
mythtv/libs/libmythtv/tv_rec.cpp | 3
mythtv/libs/libmythtv/tvremoteutil.cpp | 55
mythtv/libs/libmythtv/tvremoteutil.h | 7
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3
mythtv/libs/libmythtv/videodisplayprofile.h | 2
mythtv/libs/libmythtv/videoout_xv.cpp | 7
mythtv/libs/libmythtv/videoout_xv.h | 1
mythtv/libs/libmythtv/videooutbase.cpp | 48
mythtv/libs/libmythui/mythmainwindow.cpp | 2
mythtv/libs/libmythupnp/httprequest.cpp | 1
mythtv/libs/libmythupnp/soapclient.h | 6
mythtv/programs/mythbackend/filetransfer.cpp | 4
mythtv/programs/mythbackend/housekeeper.cpp | 4
mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5
mythtv/programs/mythfrontend/globalsettings.cpp | 2
mythtv/programs/mythfrontend/guidegrid.cpp | 8
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7
mythtv/programs/mythtranscode/transcode.h | 5
mythtv/programs/mythutil/backendutils.cpp | 20
mythtv/programs/mythutil/commandlineparser.cpp | 4
mythtv/programs/mythutil/markuputils.cpp | 4
mythtv/programs/mythutil/mythutil.pro | 2
mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py | 2
mythtv/version.sh | 1
89 files changed, 5666 insertions(+), 2149 deletions(-)
--- NEW FILE mythtv-0.25-fixes.patch ---
mythplugins/mytharchive/i18n/mytharchive_fi.qm | Bin 29996 -> 33814 bytes
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238 ++-
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm | Bin 6953 -> 6977 bytes
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44 +-
mythplugins/mythgallery/i18n/mythgallery_fi.qm | Bin 13503 -> 18780 bytes
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264 ++-
mythplugins/mythgame/i18n/mythgame_fi.qm | Bin 15868 -> 16084 bytes
mythplugins/mythgame/i18n/mythgame_fi.ts | 178 +-
mythplugins/mythmusic/i18n/mythmusic_fi.qm | Bin 56677 -> 56868 bytes
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 ++++++++++--
mythplugins/mythmusic/mythmusic/visualize.cpp | 60 +-
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm | Bin 10270 -> 11758 bytes
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96 +-
.../mythnetvision/mythnetvision/nettree.cpp | 8 +-
.../mythnetvision/mythnetvision/rsseditor.cpp | 6 -
mythplugins/mythnews/i18n/mythnews_fi.qm | Bin 4889 -> 4512 bytes
mythplugins/mythnews/i18n/mythnews_fi.ts | 44 +-
mythplugins/mythweather/i18n/mythweather_fi.qm | Bin 24061 -> 23685 bytes
mythplugins/mythweather/i18n/mythweather_fi.ts | 60 +-
.../mythzoneminder/i18n/mythzoneminder_fi.qm | Bin 6899 -> 7281 bytes
.../mythzoneminder/i18n/mythzoneminder_fi.ts | 84 +-
.../mythzoneminder/mythzmserver/zmserver.cpp | 3 -
mythtv/VERSION | 2 +-
mythtv/bindings/python/MythTV/mythproto.py | 4 +-
mythtv/bindings/python/MythTV/static.py | 2 +-
mythtv/bindings/python/setup.py | 2 +-
mythtv/configure | 15 +-
mythtv/docs/doxygen-create-developer-docs.cfg | 2 +-
mythtv/filters/yadif/filter_yadif.c | 2 +-
mythtv/i18n/mythfrontend_fi.qm | Bin 532091 -> 613881 bytes
mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++-------
mythtv/i18n/mythfrontend_nb.qm | Bin 603663 -> 603587 bytes
mythtv/i18n/mythfrontend_nb.ts | 2 +-
mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 +-
mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 +-
mythtv/libs/libmyth/audio/audiooutputbase.h | 4 +
mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 +-
.../libmyth/audio/audiooutputdigitalencoder.cpp | 27 +-
mythtv/libs/libmyth/remoteutil.cpp | 16 -
mythtv/libs/libmyth/remoteutil.h | 1 -
mythtv/libs/libmyth/rssparse.h | 1 +
mythtv/libs/libmythbase/bonjourregister.cpp | 5 +-
mythtv/libs/libmythbase/compat.h | 2 +
mythtv/libs/libmythbase/logging.cpp | 3 +-
mythtv/libs/libmythbase/serverpool.cpp | 46 +-
.../requesthandler/deletethread.cpp | 6 +-
mythtv/libs/libmythsoundtouch/STTypes.h | 2 +-
.../libs/libmythsoundtouch/libmythsoundtouch.pro | 1 +
mythtv/libs/libmythtv/audioinput.h | 1 +
mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +-
mythtv/libs/libmythtv/dtvrecorder.cpp | 4 +-
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +-
mythtv/libs/libmythtv/fileringbuffer.cpp | 6 +-
mythtv/libs/libmythtv/libmythtv.pro | 1 +
mythtv/libs/libmythtv/mythairplayserver.cpp | 2 +-
mythtv/libs/libmythtv/mythplayer.cpp | 30 +-
mythtv/libs/libmythtv/mythplayer.h | 3 +
mythtv/libs/libmythtv/mythraopconnection.cpp | 262 +-
mythtv/libs/libmythtv/mythraopconnection.h | 13 +-
mythtv/libs/libmythtv/mythraopdevice.cpp | 13 +-
mythtv/libs/libmythtv/osd.cpp | 2 +-
mythtv/libs/libmythtv/playercontext.h | 4 +-
mythtv/libs/libmythtv/ringbuffer.cpp | 8 +-
mythtv/libs/libmythtv/teletextscreen.cpp | 8 +-
mythtv/libs/libmythtv/tv_play.cpp | 26 +-
mythtv/libs/libmythtv/tv_rec.cpp | 3 +
mythtv/libs/libmythtv/tvremoteutil.cpp | 55 +-
mythtv/libs/libmythtv/tvremoteutil.h | 7 +-
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 -
mythtv/libs/libmythtv/videodisplayprofile.h | 2 -
mythtv/libs/libmythtv/videoout_xv.cpp | 7 +-
mythtv/libs/libmythtv/videoout_xv.h | 1 +
mythtv/libs/libmythtv/videooutbase.cpp | 48 +-
mythtv/libs/libmythui/mythmainwindow.cpp | 2 +
mythtv/libs/libmythupnp/httprequest.cpp | 1 +
mythtv/libs/libmythupnp/soapclient.h | 6 +
mythtv/programs/mythbackend/filetransfer.cpp | 4 +
mythtv/programs/mythbackend/housekeeper.cpp | 4 +-
.../programs/mythfrontend/audiogeneralsettings.cpp | 5 +-
mythtv/programs/mythfrontend/globalsettings.cpp | 2 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 8 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +-
mythtv/programs/mythtranscode/transcode.h | 5 +-
mythtv/programs/mythutil/backendutils.cpp | 20 +
mythtv/programs/mythutil/commandlineparser.cpp | 4 +
mythtv/programs/mythutil/markuputils.cpp | 4 +-
mythtv/programs/mythutil/mythutil.pro | 2 +-
.../nv_python_libs/bliptv/bliptv_api.py | 2 +-
mythtv/version.sh | 1 +
89 files changed, 5666 insertions(+), 2149 deletions(-)
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm
index 2fc0f91..8e2d841 100644
Binary files a/mythplugins/mytharchive/i18n/mytharchive_fi.qm and b/mythplugins/mytharchive/i18n/mytharchive_fi.qm differ
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.ts b/mythplugins/mytharchive/i18n/mytharchive_fi.ts
index 1a10407..48fb51e 100644
--- a/mythplugins/mytharchive/i18n/mytharchive_fi.ts
+++ b/mythplugins/mytharchive/i18n/mytharchive_fi.ts
@@ -13,10 +13,64 @@
</message>
</context>
<context>
+ <name>BurnThemeUI</name>
+ <message>
+ <source>Has an intro and contains a main menu with 4 recordings per page. Does not have a chapter selection submenu.</source>
+ <translation>Sisältää intron ja päävalikon jossa 4 tallennetta per sivu.Ei ole kappaleita alivalikkona. </translation>
+ </message>
+ <message>
+ <source>Has an intro and contains a summary main menu with 10 recordings per page. Does not have a chapter selection submenu, recording titles, dates or category.</source>
+ <translation>Sisältää intron ja koostepäävalikon jossa 4 tallennetta per sivu.Ei ole kappaleita alivalikkona, tallenteiden nimiä, päivämääriä tai luokkaa.</translation>
+ </message>
+ <message>
+ <source>Has an intro and contains a main menu with 6 recordings per page. Does not have a scene selection submenu.</source>
+ <translation>Sisältää intron ja päävalikon jossa 6 tallennetta per sivu.Ei ole kohtauksia alivalikkona.</translation>
+ </message>
+ <message>
+ <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording.</source>
+ <translation>Sisältää intron ja koostepäävalikon jossa 3 tallennetta per sivu ja kohtaukset alivalikossa ja 8 kappalepistettä. Näyttää ohjelmatietosivun ennen jokaista tallennetta.</translation>
+ </message>
+ <message>
+ <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording. Uses animated thumb images.</source>
+ <translation>Sisältää intron ja koostepäävalikon jossa 3 tallennetta per sivu ja kohtaukset alivalikossa ja 8 kappalepistettä. Näyttää ohjelmatietosivun ennen jokaista tallennetta. Animoi pienoiskuvat.</translation>
+ </message>
+ <message>
+ <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points.</source>
+ <translation>Sisältää intron ja päävalikon jossa 3 tallennetta per sivu ja kohtausvalikon jossa 8 kappaletta alivalikkona. </translation>
+ </message>
+ <message>
+ <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. All the thumb images are animated.</source>
+ <translation>Sisältää intron ja päävalikon jossa 3 tallennetta per sivu ja 8:n kappaleen alivalikko. Kaikki pienoiskuvat on animoituja.</translation>
+ </message>
+ <message>
+ <source>Creates an auto play DVD with no menus. Shows an intro movie then for each title shows a details page followed by the video in sequence.</source>
+ <translation>Luo automaattisesti käynnistyvän DVD:n ilman menuja. Näyttää introvideon ja jokaiselle nimikkeelle näytetään lisätietosivu jota seuraa videot järjestyksessä.</translation>
+ </message>
+ <message>
+ <source>Creates an auto play DVD with no menus and no intro.</source>
+ <translation>Luo automaattisesti käynnistyvän DVD:n ilman valikkoja ja introja.</translation>
+ </message>
+</context>
+<context>
+ <name>DVDThemeSelector</name>
+ <message>
+ <source>No theme description file found!</source>
+ <translation>Teeman kuvausta ei löydy!</translation>
+ </message>
+ <message>
+ <source>Empty theme description!</source>
+ <translation>Tyhjä teeman kuvaus!</translation>
+ </message>
+ <message>
+ <source>Unable to open theme description file!</source>
+ <translation>Ei saada teeman kuvaustiedostoa auki!</translation>
+ </message>
+</context>
+<context>
<name>ExportNative</name>
<message>
<source>Cancel</source>
- <translation>Peruuta</translation>
+ <translation type="obsolete">Peruuta</translation>
</message>
<message>
<source>You need to add at least one item to archive!</source>
@@ -24,7 +78,7 @@
</message>
<message>
<source>Menu</source>
- <translation></translation>
+ <translation>Menu</translation>
</message>
<message>
<source>Remove Item</source>
@@ -58,6 +112,10 @@
<name>ImportNative</name>
<message>
<source>You need to select a valid chanID!</source>
+ <translation type="obsolete">Valitse kelvollinen kanava-id!</translation>
+ </message>
+ <message>
+ <source>You need to select a valid channel id!</source>
<translation>Valitse kelvollinen kanava-id!</translation>
</message>
<message>
@@ -65,27 +123,39 @@
<translation>Ei ollut mahdollista tuoda arkistoa. Tapahtui virhe ajettaessa 'mytharchivehelperiä'</translation>
</message>
<message>
- <source>Select a ChanID</source>
+ <source>Select a channel id</source>
<translation>Valitse kanava-id</translation>
</message>
<message>
- <source>Select a ChanNo</source>
+ <source>Select a channel number</source>
<translation>Valitse kanavanumero</translation>
</message>
<message>
+ <source>Select a channel name</source>
[...14108 lines suppressed...]
-#ifdef USING_OPENGL
+#ifdef USING_OPENGL_VIDEO
if (!profiles.contains("OpenGL Normal") &&
!profiles.contains("OpenGL High Quality") &&
!profiles.contains("OpenGL Slim"))
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 6dbf1aa..4ddac0e 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
+++ b/mythtv/programs/mythfrontend/guidegrid.cpp
@@ -1390,11 +1390,11 @@ void GuideGrid::customEvent(QEvent *event)
}
else if (resultid == "guidemenu")
{
- if (resulttext == tr("Record"))
+ if (resulttext == tr("Record This"))
{
quickRecord();
}
- else if (resulttext == tr("Change Channel"))
+ else if (resulttext == tr("Change to Channel"))
{
enter();
}
@@ -1578,7 +1578,7 @@ void GuideGrid::updateChannels(void)
if (!chinfo->icon.isEmpty())
{
QString iconurl =
- gCoreContext->GetMasterHostPrefix("ChannelIcon",
+ gCoreContext->GetMasterHostPrefix("ChannelIcons",
chinfo->icon);
item->SetImage(iconurl, "channelicon");
}
@@ -1612,7 +1612,7 @@ void GuideGrid::updateInfo(void)
m_channelImage->Reset();
if (!chinfo->icon.isEmpty())
{
- QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcon",
+ QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcons",
chinfo->icon);
m_channelImage->SetFilename(iconurl);
diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp
index 4f85c70..877371a 100644
--- a/mythtv/programs/mythfrontend/scheduleeditor.cpp
+++ b/mythtv/programs/mythfrontend/scheduleeditor.cpp
@@ -1476,12 +1476,7 @@ void MetadataOptions::PerformQuery()
void MetadataOptions::OnSearchListSelection(MetadataLookup *lookup)
{
- if (!lookup)
- return;
-
- m_lookup = lookup;
-
- m_metadataFactory->Lookup(lookup);
+ QueryComplete(lookup);
}
void MetadataOptions::OnImageSearchListSelection(ArtworkInfo info,
diff --git a/mythtv/programs/mythtranscode/transcode.h b/mythtv/programs/mythtranscode/transcode.h
index a99a871..ce5b909 100644
--- a/mythtv/programs/mythtranscode/transcode.h
+++ b/mythtv/programs/mythtranscode/transcode.h
@@ -1,9 +1,10 @@
+#include <QPointer>
#include "recordingprofile.h"
#include "fifowriter.h"
#include "transcodedefs.h"
#include "programtypes.h"
+#include "playercontext.h"
-class PlayerContext;
class ProgramInfo;
class NuppelVideoRecorder;
class MythPlayer;
@@ -49,7 +50,7 @@ class Transcode : public QObject
int keyframedist;
NuppelVideoRecorder *nvr;
MythPlayer *player;
- PlayerContext *player_ctx;
+ QPointer<PlayerContext> player_ctx;
RingBuffer *inRingBuffer;
RingBuffer *outRingBuffer;
FIFOWriter *fifow;
diff --git a/mythtv/programs/mythutil/backendutils.cpp b/mythtv/programs/mythutil/backendutils.cpp
index 151fa7d..494e071 100644
--- a/mythtv/programs/mythutil/backendutils.cpp
+++ b/mythtv/programs/mythutil/backendutils.cpp
@@ -1,8 +1,12 @@
+// C++ includes
+#include <iostream>
+
// libmyth* headers
#include "exitcodes.h"
#include "mythcorecontext.h"
#include "mythlogging.h"
#include "remoteutil.h"
+#include "videometadata.h"
// local headers
#include "backendutils.h"
@@ -79,6 +83,21 @@ static int ScanVideos(const MythUtilCommandLineParser &cmdline)
return GENERIC_EXIT_CONNECT_ERROR;
}
+static int ParseVideoFilename(const MythUtilCommandLineParser &cmdline)
+{
+ QString filename = cmdline.toString("parsevideo");
+ cout << "Title: " << VideoMetadata::FilenameToMeta(filename, 1)
+ .toLocal8Bit().constData() << endl
+ << "Season: " << VideoMetadata::FilenameToMeta(filename, 2)
+ .toLocal8Bit().constData() << endl
+ << "Episode: " << VideoMetadata::FilenameToMeta(filename, 3)
+ .toLocal8Bit().constData() << endl
+ << "Subtitle: " << VideoMetadata::FilenameToMeta(filename, 4)
+ .toLocal8Bit().constData() << endl;
+
+ return GENERIC_EXIT_OK;
+}
+
void registerBackendUtils(UtilMap &utilMap)
{
utilMap["clearcache"] = &ClearSettingsCache;
@@ -86,6 +105,7 @@ void registerBackendUtils(UtilMap &utilMap)
utilMap["resched"] = &Reschedule;
utilMap["scanvideos"] = &ScanVideos;
utilMap["systemevent"] = &SendSystemEvent;
+ utilMap["parsevideo"] = &ParseVideoFilename;
}
/* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/mythtv/programs/mythutil/commandlineparser.cpp b/mythtv/programs/mythutil/commandlineparser.cpp
index 7f00e50..f4a6035 100644
--- a/mythtv/programs/mythutil/commandlineparser.cpp
+++ b/mythtv/programs/mythutil/commandlineparser.cpp
@@ -96,6 +96,10 @@ void MythUtilCommandLineParser::LoadArguments(void)
"local database settings cache used by each program, causing "
"options to be re-read from the database upon next use.")
->SetGroup("Backend")
+ << add("--parse-video-filename", "parsevideo", "", "",
+ "Diagnostic tool for testing filename formats against what "
+ "the Video Library name parser will detect them as.")
+ ->SetGroup("Backend")
// jobutils.cpp
<< add("--queuejob", "queuejob", "",
diff --git a/mythtv/programs/mythutil/markuputils.cpp b/mythtv/programs/mythutil/markuputils.cpp
index 94fc136..fee2df3 100644
--- a/mythtv/programs/mythutil/markuputils.cpp
+++ b/mythtv/programs/mythutil/markuputils.cpp
@@ -144,8 +144,8 @@ static int CopySkipListToCutList(const MythUtilCommandLineParser &cmdline)
cutlist[it.key()] = MARK_CUT_END;
pginfo.SaveCutList(cutlist);
- cout << QString("Cutlist copied to Commercial Skip List\n")
- .toLocal8Bit().constData();
+ cout << "Commercial Skip List copied to Cutlist\n";
+ LOG(VB_GENERAL, LOG_NOTICE, "Commercial Skip List copied to Cutlist");
return GENERIC_EXIT_OK;
}
diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/mythutil.pro
index 774528f..066e618 100644
--- a/mythtv/programs/mythutil/mythutil.pro
+++ b/mythtv/programs/mythutil/mythutil.pro
@@ -2,7 +2,7 @@ include ( ../../settings.pro )
include ( ../../version.pro )
include ( ../programs-libs.pro )
-QT += network sql
+QT += network sql xml
TEMPLATE = app
CONFIG += thread
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
index 2f2ad3b..4abbf69 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
@@ -187,7 +187,7 @@ class Videos(object):
self.config[u'urls'] = {}
# v2 api calls - An example that must be customized for each target site
- self.config[u'urls'][u'video.search'] = "http://www.blip.tv/search?q=%s;&page=%s;&pagelen=%s;&language_code=%s;&sk..."
+ self.config[u'urls'][u'video.search'] = "http://www.blip.tv/?search=%s;&page=%s;&pagelen=%s;&language_code=%s;&ski..."
self.config[u'urls'][u'categories'] = "http://www.blip.tv/?section=categories&cmd=view&skin=api"
self.config[u'image_extentions'] = ["png", "jpg", "bmp"] # Acceptable image extentions
diff --git a/mythtv/version.sh b/mythtv/version.sh
index d2c53af..a8939c4 100755
--- a/mythtv/version.sh
+++ b/mythtv/version.sh
@@ -22,6 +22,7 @@ GITREPOPATH="exported"
cd ${GITTREEDIR}
+git status > /dev/null 2>&1
SOURCE_VERSION=$(git describe --dirty || git describe || echo Unknown)
case "${SOURCE_VERSION}" in
mythtv_0.25_gcc_4.7.patch:
h264_qpel_mmx.c | 8 !!!!!!!!
1 file changed, 8 modifications(!)
--- NEW FILE mythtv_0.25_gcc_4.7.patch ---
*** ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c.org 2012-03-31 20:52:29.923150437 -0400
--- ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400
***************
*** 398,404 ****
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
: "memory"\
);\
src += 4-(h+5)*srcStride;\
--- 398,404 ----
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: "memory"\
);\
src += 4-(h+5)*srcStride;\
***************
*** 446,452 ****
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
"2: \n\t"\
: "+a"(src)\
! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
: "memory"\
);\
tmp += 4;\
--- 446,452 ----
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
"2: \n\t"\
: "+a"(src)\
! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
: "memory"\
);\
tmp += 4;\
***************
*** 823,829 ****
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
"memory"\
--- 823,829 ----
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
"memory"\
***************
*** 878,884 ****
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
"2: \n\t"
: "+a"(src)
! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)
"memory"
--- 878,884 ----
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
"2: \n\t"
: "+a"(src)
! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)
"memory"
12 years, 5 months
- 1
- 0
rpms/mythtv/EL-6 mythtv.spec,1.84,1.85
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24128
Modified Files:
mythtv.spec
Log Message:
* Fri May 04 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-6
- Add Bonjour (Airplay) support.
- Fix user creation for packages that create directories owned by mythtv user.
Fixes BZ#2309.
- Update to latest 0.25/fixes.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mythtv.spec 9 Jun 2012 02:17:35 -0000 1.84
+++ mythtv.spec 9 Jun 2012 02:21:10 -0000 1.85
@@ -3,6 +3,7 @@
#
# by: Chris Petersen <rpm(a)forevermore.net>
# Jarod Wilson <jarod(a)wilsonet.com>
+# Richard Shaw <hobbes1069(a)gmail.com>
#
# Modified/Extended from the great work of:
# Axel Thimm <Axel.Thimm(a)ATrpms.net>
@@ -29,15 +30,10 @@
# and override RPM's defaults.
# --with debug Enable debug mode
#
-# The following options are disabled by default. Use these options to enable:
-#
-# --with directfb Enable directfb support
-#
# The following options are enabled by default. Use these options to disable:
#
# --without vdpau Disable VDPAU support
# --without crystalhd Disable Crystal HD support
-# --without xvmc Disable XvMC support
# --without perl Disable building of the perl bindings
# --without python Disable building of the python bindings
#
@@ -50,7 +46,6 @@
# --without mythmusic
# --without mythnetvision
# --without mythnews
-# --without mythvideo
# --without mythweather
# --without mythzoneminder
# --without mythweb
@@ -62,12 +57,20 @@
%define desktop_applications mythfrontend mythtv-setup
# The vendor name we should attribute the aforementioned entries to
-%define desktop_vendor RPMFusion
+%define desktop_vendor RPMFusion
# Git revision and branch ID
# 0.24 release: git tag v0.24.1
-%define _gitrev e89d6a9f7e
-%define branch fixes/0.24
+%define _gitrev 1a671d0
+
+# Mythtv and plugins from github.com
+%global githash1 g1f5962a
+%global githash2 9615da9
+# Mythweb from github.com
+%global githash3 g1d056f7
+%global githash4 0fc49a5
+
+%define branch fixes/0.25
#
# Basic descriptive tags for this package:
@@ -78,17 +81,17 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.24.1
+Version: 0.25
%if "%{branch}" == "master"
-Release: 0.1.git.%{_gitrev}%{?dist}
+Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 5%{?dist}
+Release: 6%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
# projects... For a breakdown of the licensing, see PACKAGE-LICENSING.
-License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+)
+License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+)
################################################################################
@@ -103,14 +106,19 @@
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+%define with_vaapi %{?_without_vaapi: 0} %{?!_without_vaapi: 1}
+
+%if 0%{?rhel}
+%define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0}
+%else
%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
-%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1}
+%endif
+
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
+%define with_php %{?_without_php: 0} %{!?_without_php: 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}
# FAAC is non-free, so we disable it by default
%define with_faac %{?_with_faac: 1} %{?!_with_faac: 0}
@@ -122,7 +130,6 @@
%define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame: 1}
%define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic: 1}
%define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews: 1}
-%define with_mythvideo %{?_without_mythvideo: 0} %{!?_without_mythvideo: 1}
%define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1}
%define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1}
%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1}
@@ -130,11 +137,15 @@
################################################################################
-Source0: mythtv-%{version}.tar.bz2
-Source1: mythplugins-%{version}.tar.bz2
-Patch0: mythtv-%{version}-fixes.patch
-Patch1: mythplugins-%{version}-fixes.patch
-#Patch2: mythweb-%{version}-fixes.patch\
+# https://github.com/MythTV/mythtv/tarball/v0.25
+Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
+# https://github.com/MythTV/mythweb/tarball/v0.25
+Source1: MythTV-mythweb-v%{version}-0-%{githash3}.tar.gz
+
+Patch0: mythtv-0.25-fixes.patch
+#Patch1: mythweb-%{version}-fixes.patch
+Patch2: mythtv_0.25_gcc_4.7.patch
+
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig
Source102: mythbackend.init
@@ -144,17 +155,9 @@
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
Source110: mysql.txt
+Source111: 99-mythbackend.rules
Source401: mythweb.conf
-################################################################################
-# Python setup
-
-%if %{with_python}
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
-%endif
-
-################################################################################
# Global MythTV and Shared Build Requirements
@@ -178,12 +181,8 @@
BuildRequires: freetype-devel >= 2
BuildRequires: gcc-c++
BuildRequires: mysql-devel >= 5
-%if 0%{?fedora} >= 14
BuildRequires: qt-webkit-devel
-BuildRequires: qt-devel >= 4.4
-%else
-BuildRequires: qt4-devel >= 4.4
-%endif
+BuildRequires: qt-devel >= 4.6
BuildRequires: phonon-devel
BuildRequires: lm_sensors-devel
@@ -218,23 +217,31 @@
BuildRequires: libdvdread-devel >= 0.9.4
BuildRequires: libcdio-devel
# nb: libdvdcss will be dynamically loaded if installed
-BuildRequires: libfame-devel >= 0.9.0
+#BuildRequires: libfame-devel >= 0.9.0
BuildRequires: libogg-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
-BuildRequires: taglib-devel >= 1.5
-BuildRequires: transcode >= 0.6.8
+BuildRequires: taglib-devel >= 1.6
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
# Audio framework support
+BuildRequires: SDL-devel
+BuildRequires: sox-devel
BuildRequires: alsa-lib-devel
-BuildRequires: arts-devel
BuildRequires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
BuildRequires: pulseaudio-libs-devel
%endif
+BuildRequires: avahi-compat-libdns_sd-devel
+
+# Bluray support
+BuildRequires: libxml2-devel
+#BuildRequires: libudf-devel
+
+# Subtitle support
+BuildRequires: libass-devel
# Need dvb headers to build in dvb support
BuildRequires: kernel-headers
@@ -244,14 +251,14 @@
BuildRequires: libiec61883-devel
BuildRequires: libraw1394-devel
-%if %{with_directfb}
-BuildRequires: directfb-devel
-%endif
-
%if %{with_vdpau}
BuildRequires: libvdpau-devel
%endif
+%if %{with_vaapi}
+BuildRequires: libva-devel
+%endif
+
%if %{with_crystalhd}
BuildRequires: libcrystalhd-devel
%endif
@@ -270,11 +277,18 @@
BuildRequires: perl(HTTP::Request)
BuildRequires: perl(Net::UPnP::QueryResponse)
BuildRequires: perl(Net::UPnP::ControlPoint)
+BuildRequires: perl(DBD::mysql)
+BuildRequires: perl(IO::Socket::INET6)
+%endif
+
+%if %{with_php}
+# No php specific requirements yet.
%endif
%if %{with_python}
BuildRequires: python-devel
BuildRequires: MySQL-python
+BuildRequires: python-urlgrabber
%endif
# Plugin Build Requirements
@@ -289,21 +303,11 @@
BuildRequires: zlib-devel
%endif
-%if %{with_mythmusic}
-BuildRequires: libcdaudio-devel >= 0.99.6
-BuildRequires: cdparanoia-devel
-BuildRequires: libvisual-devel
-BuildRequires: SDL-devel
-%endif
-
%if %{with_mythnews}
%endif
BuildRequires: ncurses-devel
-%if %{with_mythvideo}
-Requires: perl(XML::Simple)
-%endif
%if %{with_mythweather}
Requires: mythweather >= %{version}
@@ -320,6 +324,8 @@
Requires: perl(Image::Size)
BuildRequires: perl(SOAP::Lite)
Requires: perl(SOAP::Lite)
+BuildRequires: perl(JSON)
+Requires: perl(JSON)
%endif
%if %{with_mythzoneminder}
@@ -344,26 +350,21 @@
Requires: mythtv-frontend = %{version}-%{release}
Requires: mythtv-setup = %{version}-%{release}
Requires: perl-MythTV = %{version}-%{release}
+Requires: php-MythTV = %{version}-%{release}
Requires: python-MythTV = %{version}-%{release}
-
Requires: mythplugins = %{version}-%{release}
-# These are available via mythtv's built-in theme downloader now,
-# so lets not install them by default.
-#Requires: mythtv-themes = %{version}
-
Requires: mysql-server >= 5, mysql >= 5
-# XMLTV is not yet packaged for rpmfusion
-#Requires: xmltv
+Requires: xmltv
# Generate the required mythtv-frontend-api version string here so we only
# have to do it once.
-%define mythfeapiver %(echo %{version} | awk -F. '{print $1 "." $2}')
+%global mythfeapiver %(echo %{version} | awk -F. '{print $1 "." $2}')
################################################################################
%description
MythTV provides a unified graphical interface for recording and viewing
-television programs. Refer to the mythtv package for more information.
+television programs. Refer to the mythtv package for more information.
There are also several add-ons and themes available. In order to facilitate
installations with smart/apt-get/yum and other related package
@@ -372,15 +373,15 @@
MythTV implements the following DVR features, and more, with a
unified graphical interface:
- - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
- - Video compression using RTjpeg or MPEG-4, and support for DVB and
- hardware encoder cards/devices.
- - Program listing retrieval using XMLTV
- - Themable, semi-transparent on-screen display
- - Electronic program guide
- - Scheduled recording of TV programs
- - Resolution of conflicts between scheduled recordings
- - Basic video editing
+- Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
+- Video compression using RTjpeg or MPEG-4, and support for DVB and
+ hardware encoder cards/devices.
+- Program listing retrieval using XMLTV
+- Themable, semi-transparent on-screen display
+- Electronic program guide
+- Scheduled recording of TV programs
+- Resolution of conflicts between scheduled recordings
+- Basic video editing
################################################################################
@@ -402,7 +403,7 @@
Requires: freetype >= 2
Requires: lame
-Requires: qt4 >= 4.4
+Requires: qt4 >= 4.6
Requires: qt4-MySQL
%description libs
@@ -422,7 +423,7 @@
Requires: freetype-devel >= 2
Requires: mysql-devel >= 5
-Requires: qt4-devel >= 4.4
+Requires: qt4-devel >= 4.6
Requires: lm_sensors-devel
Requires: lirc-devel
@@ -460,7 +461,6 @@
# Audio framework support
Requires: alsa-lib-devel
-Requires: arts-devel
Requires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
Requires: pulseaudio-libs-devel
@@ -474,14 +474,14 @@
Requires: libiec61883-devel
Requires: libraw1394-devel
-%if %{with_directfb}
-Requires: directfb-devel
-%endif
-
%if %{with_vdpau}
Requires: libvdpau-devel
%endif
+%if %{with_vaapi}
+Requires: libva-devel
+%endif
+
%if %{with_crystalhd}
Requires: libcrystalhd-devel
%endif
@@ -512,11 +512,14 @@
Summary: Client component of mythtv (a DVR)
Group: Applications/Multimedia
Requires: freetype, lame
+Requires: perl(XML::Simple)
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Provides: mythtv-frontend-api = %{mythfeapiver}
-Obsoletes: mythcontrols < %{version}-%{release}
-Provides: mythcontrols = %{version}-%{release}
+Obsoletes: mythcontrols < %{version}-%{release}
+Provides: mythcontrols = %{version}-%{release}
+Obsoletes: mythvideo < %{version}-%{release}
+Provides: mythvideo = %{version}-%{release}
%description frontend
MythTV provides a unified graphical interface for recording and viewing
@@ -534,7 +537,6 @@
Group: Applications/Multimedia
Requires: lame
Requires: mythtv-common = %{version}-%{release}
-Requires: wget
Requires(pre): shadow-utils
Conflicts: xmltv-grabbers < 0.5.37
@@ -555,7 +557,6 @@
Requires: freetype
Requires: mythtv-backend = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
-Requires: wget
%description setup
MythTV provides a unified graphical interface for recording and viewing
@@ -607,6 +608,21 @@
################################################################################
+%if %{with_php}
+
+%package -n php-MythTV
+Summary: PHP bindings for MythTV
+Group: Development/Languages
+# Wish we could do this:
+#BuildArch: noarch
+
+%description -n php-MythTV
+Provides a PHP-based interface to interacting with MythTV.
+
+%endif
+
+################################################################################
+
%if %{with_python}
%package -n python-MythTV
@@ -634,7 +650,6 @@
Group: Applications/Multimedia
Requires: mythmusic = %{version}-%{release}
-Requires: mythvideo = %{version}-%{release}
Requires: mythweather = %{version}-%{release}
Requires: mythgallery = %{version}-%{release}
Requires: mythgame = %{version}-%{release}
@@ -667,6 +682,8 @@
Requires: python >= 2.3.5
Requires: python-imaging
Requires: transcode >= 1.0.2
+Requires: m2vrequantiser
+Requires: pmount
%description -n mytharchive
MythArchive is a new plugin for MythTV that lets you create DVDs from
@@ -741,32 +758,6 @@
%endif
################################################################################
-%if %{with_mythvideo}
-
-%package -n mythvideo
-Summary: A generic video player frontend module for MythTV
-Group: Applications/Multimedia
-Requires: mythtv-frontend-api = %{mythfeapiver}
-Requires: mplayer
-Requires: transcode >= 0.6.8
-Requires: python-imdb
-Requires: python-MythTV = %{version}-%{release}
-
-Provides: mythdvd = %{version}-%{release}
-Obsoletes: mythdvd < %{version}-%{release}
-
-%description -n mythvideo
-MythVideo is a MythTV module that allows you to play videos, DVDs and
-(optionally) VCDs. It can also be configured to let you rip DVDs and
-transcode their video and audio content to other (generally smaller)
-formats. The player can either use the MythTV internal software (which
-now supports DVD menus), or simply to invoke your favorite DVD/XVCD
-playing software (mplayer, ogle, xine, etc) as an external
-command. The transcoding is based on and derived from the excellent
-transcode package.
-
-%endif
-################################################################################
%if %{with_mythweather}
%package -n mythweather
@@ -789,6 +780,7 @@
Requires: php >= 5.1
Requires: php-mysql
Requires: php-process
+Requires: php-MythTV
%description -n mythweb
The web interface to MythTV.
@@ -836,7 +828,20 @@
################################################################################
%prep
-%setup -q -c -a 1
+#### MythWeb
+# Provided as a separate download so we deal with it here.
+%setup -q -T -b 1 -n MythTV-mythweb-%{githash4}
+
+# Fix up permissions for MythWeb
+chmod -R g-w ./*
+
+# Remove execute bits from some php mythweb files
+# chmod -x mythweb/classes/*.php
+
+
+#### MythTV
+#setup -q -c -a 1
+%setup -q -n MythTV-%{name}-%{githash2}
# Replace static lib paths with %{_lib} so we build properly on x86_64
# systems, where the libs are actually in lib64.
@@ -846,10 +851,11 @@
grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g'
fi
-##### MythTV
+%patch0 -p1 -b .mythtv
+#patch1 -p1 -b .mythplug
+%patch2 -p1 -b .gcc47
-cd mythtv-%{version}
-%patch0 -p2
+pushd mythtv
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -873,47 +879,18 @@
# chmod 644 settings.pro
# We also need Xv libs to build XvMCNVIDIA
- sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
+# sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
-# On to mythplugins
-cd ..
+popd
-##### MythPlugins
-%if %{with_plugins}
-cd mythplugins-%{version}
-%patch1 -p2
-#patch2 -p1
-
-# Fix /mnt/store -> /var/lib/mythmusic
- cd mythmusic
- sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp
- cd ..
-
-# Fix /mnt/store -> /var/lib/mythvideo
- cd mythvideo
- sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp
- cd ..
-
-# Fix up permissions for MythWeb
- cd mythweb
- chmod -R g-w ./*
- cd ..
-
-# Remove execute bits from some php mythweb files
- chmod -x mythweb/classes/*.php
-
-# And back to the compile root
-cd ..
-
-%endif
################################################################################
%build
# First, we build MythTV
-cd mythtv-%{version}
+pushd mythtv
# Similar to 'percent' configure, but without {_target_platform} and
# {_exec_prefix} etc... MythTV no longer accepts the parameters that the
@@ -933,8 +910,7 @@
--enable-libfftw3 \
--enable-x11 --x11-path=%{_includedir} \
--enable-xv \
- --enable-xvmc-vld \
- --enable-opengl-video --enable-opengl-vsync \
+ --enable-opengl-video \
--enable-xrandr \
--enable-lirc \
--enable-ivtv \
@@ -944,25 +920,24 @@
--enable-libfaac --enable-nonfree \
%endif
--enable-libmp3lame \
+ --enable-libx264 \
--enable-libtheora --enable-libvorbis \
--enable-libxvid \
%if %{with_vdpau}
--enable-vdpau \
%endif
+%if %{with_vaapi}
+ --enable-vaapi \
+%endif
%if %{with_crystalhd}
--enable-crystalhd \
%endif
-%if !%{with_xvmc}
- --disable-xvmcw \
-%endif
-%if %{with_directfb}
- --enable-directfb \
-%else
- --disable-directfb \
-%endif
%if !%{with_perl}
--without-bindings=perl \
%endif
+%if !%{with_php}
+ --without-bindings=php \
+%endif
%if !%{with_python}
--without-bindings=python \
%endif
@@ -988,20 +963,21 @@
# Insert rpm version-release for mythbackend --version output
echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION
+ echo 'BRANCH="%{branch}"' >> VERSION
# Make
make %{?_smp_mflags}
# Prepare to build the plugins
- cd ..
- mkdir temp
- temp=`pwd`/temp
- make -C mythtv-%{version} install INSTALL_ROOT=$temp
+ popd
+ mkdir fakeroot
+ temp=`pwd`/fakeroot
+ make -C mythtv install INSTALL_ROOT=$temp
export LD_LIBRARY_PATH=$temp%{_libdir}:$LD_LIBRARY_PATH
# Next, we build the plugins
%if %{with_plugins}
-cd mythplugins-%{version}
+pushd mythplugins
# Fix things up so they can find our "temp" install location for mythtv-libs
echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
@@ -1052,11 +1028,6 @@
%else
--disable-mythnews \
%endif
- %if %{with_mythvideo}
- --enable-mythvideo \
- %else
- --disable-mythvideo \
- %endif
%if %{with_mythweather}
--enable-mythweather \
%else
@@ -1073,29 +1044,25 @@
--disable-mythnetvision \
%endif
--enable-opengl \
- --enable-libvisual \
--enable-fftw \
- --enable-sdl
+# --enable-sdl
make %{?_smp_mflags}
- cd ..
+ popd
%endif
################################################################################
%install
-
-# Clean
- rm -rf %{buildroot}
-
# First, install MythTV
-cd mythtv-%{version}
+pushd mythtv
make install INSTALL_ROOT=%{buildroot}
ln -s mythtv-setup %{buildroot}%{_bindir}/mythtvsetup
mkdir -p %{buildroot}%{_localstatedir}/lib/mythtv
+ mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo
mkdir -p %{buildroot}%{_localstatedir}/cache/mythtv
mkdir -p %{buildroot}%{_localstatedir}/log/mythtv
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
@@ -1112,15 +1079,19 @@
# chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth*.py
# mysql.txt and other config/init files
- install -m 644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
+ install -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
%if 0%{?fedora} >= 16
- install -p -m 644 %{SOURCE104} %{buildroot}%{_unitdir}/
+ install -p -m 0644 %{SOURCE104} %{buildroot}%{_unitdir}/
+ # Install udev rules for devices that may initialize late in the boot
+ # process so they are available for mythbackend.
+ mkdir -p %{buildroot}/lib/udev/rules.d/
+ install -p -m 0644 %{SOURCE111} %{buildroot}/lib/udev/rules.d/
%else
- install -p -m 755 %{SOURCE102} %{buildroot}%{_sysconfdir}/init.d/mythbackend
- install -p -m 644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/mythbackend
+ install -p -m 0755 %{SOURCE102} %{buildroot}%{_sysconfdir}/init.d/mythbackend
+ install -p -m 0644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/mythbackend
%endif
- install -p -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend
+ install -p -m 0644 %{SOURCE103} %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend
# Desktop entries
mkdir -p %{buildroot}%{_datadir}/pixmaps
@@ -1140,20 +1111,17 @@
mkdir -p %{buildroot}%{_datadir}/mythtv/build/
install -p -m 644 settings.pro %{buildroot}%{_datadir}/mythtv/build/
- cd ..
+popd
# MythPlugins
%if %{with_plugins}
-cd mythplugins-%{version}
+pushd mythplugins
make install INSTALL_ROOT=%{buildroot}
%if %{with_mythmusic}
mkdir -p %{buildroot}%{_localstatedir}/lib/mythmusic
%endif
-%if %{with_mythvideo}
- mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo
-%endif
%if %{with_mythgallery}
mkdir -p %{buildroot}%{_localstatedir}/lib/pictures
%endif
@@ -1171,30 +1139,24 @@
ln -s ../../../../../%{_sysconfdir}/mythgame/ \
%{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml
%endif
+popd
%if %{with_mythweb}
- cd mythweb
+ pushd ../MythTV-mythweb-%{githash4}
mkdir -p %{buildroot}%{_datadir}/mythweb
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-# drop .htaccess file, settings handled in the above
+ # drop .htaccess file, settings handled in the above
rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
- cd ..
+ popd
%endif
# And back to the build/install root
- cd ..
%endif
-################################################################################
-
-%clean
-rm -rf %{buildroot}
-
-################################################################################
%post libs -p /sbin/ldconfig
@@ -1206,10 +1168,32 @@
getent passwd mythtv >/dev/null || \
useradd -r -g mythtv -d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
-c "mythbackend user" mythtv
+# Make sure the mythtv user is in the audio and video group for existing
+# or new installs.
+usermod -a -G audio,video mythtv
exit 0
+
+%pre frontend
+# Add the "mythtv" user, with membership in the audio and video group
+getent group mythtv >/dev/null || groupadd -r mythtv
+getent passwd mythtv >/dev/null || \
+ useradd -r -g mythtv -d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
+ -c "mythbackend user" mythtv
# Make sure the mythtv user is in the audio and video group for existing
# or new installs.
usermod -a -G audio,video mythtv
+exit 0
+
+%pre -n mythmusic
+# Add the "mythtv" user, with membership in the audio and video group
+getent group mythtv >/dev/null || groupadd -r mythtv
+getent passwd mythtv >/dev/null || \
+ useradd -r -g mythtv -d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
+ -c "mythbackend user" mythtv
+# Make sure the mythtv user is in the audio and video group for existing
+# or new installs.
+usermod -a -G audio,video mythtv
+exit 0
%post backend
%if 0%{?fedora} >= 16
@@ -1267,65 +1251,68 @@
################################################################################
%files
-%defattr(-,root,root,-)
%files docs
-%defattr(-,root,root,-)
-%doc mythtv-%{version}/README*
-%doc mythtv-%{version}/UPGRADING
-%doc mythtv-%{version}/AUTHORS
-%doc mythtv-%{version}/COPYING
-%doc mythtv-%{version}/FAQ
-%doc mythtv-%{version}/database mythtv-%{version}/keys.txt
-%doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png
-%doc mythtv-%{version}/docs/*.txt
-%doc mythtv-%{version}/PACKAGE-LICENSING
-%doc mythtv-%{version}/contrib
+%doc mythtv/README*
+%doc mythtv/UPGRADING
+%doc mythtv/AUTHORS
+%doc mythtv/COPYING
+%doc mythtv/FAQ
+%doc mythtv/database mythtv/keys.txt
+# Do we really need the API documentation?
+#%doc mythtv/docs/*.html mythtv/docs/*.png
+#%doc mythtv/docs/*.txt
+%doc mythtv/PACKAGE-LICENSING
+%doc mythtv/contrib
%files common
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythtv
%dir %{_datadir}/mythtv
%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
%config(noreplace) %{_sysconfdir}/mythtv/config.xml
+%{_bindir}/mythccextractor
%{_bindir}/mythcommflag
+%{_bindir}/mythmetadatalookup
+%{_bindir}/mythutil
%{_bindir}/mythpreviewgen
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
%{_datadir}/mythtv/mythconverg*.pl
-%dir %{_datadir}/mythtv/locales
-%{_datadir}/mythtv/locales/*
+%{_datadir}/mythtv/locales/
+%{_datadir}/mythtv/metadata/
+%{_datadir}/mythtv/hardwareprofile/
%files backend
-%defattr(-,root,root,-)
%{_bindir}/mythbackend
%{_bindir}/mythfilldatabase
%{_bindir}/mythjobqueue
+%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_bindir}/mythffmpeg
+%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
+%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv
%if 0%{?fedora} >=16
%{_unitdir}/mythbackend.service
+/lib/udev/rules.d/99-mythbackend.rules
%else
%{_sysconfdir}/init.d/mythbackend
%config(noreplace) %{_sysconfdir}/sysconfig/mythbackend
%endif
%config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv
-%dir %{_datadir}/mythtv/internetcontent
-%{_datadir}/mythtv/internetcontent/*
+%{_datadir}/mythtv/internetcontent/
+%{_datadir}/mythtv/html/
%files setup
-%defattr(-,root,root,-)
%{_bindir}/mythtv-setup
%{_bindir}/mythtvsetup
%{_datadir}/mythtv/setup.xml
%{_datadir}/applications/*mythtv-setup.desktop
%files frontend
-%defattr(-,root,root,-)
%{_datadir}/mythtv/CDS_scpd.xml
%{_datadir}/mythtv/CMGR_scpd.xml
%{_datadir}/mythtv/MFEXML_scpd.xml
@@ -1335,14 +1322,12 @@
%{_datadir}/mythtv/setup.xml
%{_bindir}/mythavtest
%{_bindir}/mythfrontend
-%{_bindir}/mythtvosd
+#%%{_bindir}/mythmessage
%{_bindir}/mythlcdserver
%{_bindir}/mythshutdown
%{_bindir}/mythwelcome
-%{_bindir}/mythffplay
%dir %{_libdir}/mythtv
-%dir %{_libdir}/mythtv/filters
-%{_libdir}/mythtv/filters/*
+%{_libdir}/mythtv/filters/
%dir %{_libdir}/mythtv/plugins
%dir %{_datadir}/mythtv/i18n
%dir %{_datadir}/mythtv/fonts
@@ -1351,20 +1336,17 @@
%{_datadir}/mythtv/i18n/mythfrontend_*.qm
%{_datadir}/applications/*mythfrontend.desktop
%{_datadir}/pixmaps/myth*.png
-%dir %{_datadir}/mythtv/metadata
-%{_datadir}/mythtv/metadata/*
+%{_datadir}/mythtv/metadata/
+# Myth Video is now Video Gallery
+%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
%files base-themes
-%defattr(-,root,root,-)
-%dir %{_datadir}/mythtv/themes
-%{_datadir}/mythtv/themes/*
+%{_datadir}/mythtv/themes/
%files libs
-%defattr(-,root,root,-)
%{_libdir}/*.so.*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%exclude %{_libdir}/*.a
@@ -1373,7 +1355,6 @@
%if %{with_perl}
%files -n perl-MythTV
-%defattr(-,root,root,-)
%{perl_vendorlib}/MythTV.pm
%dir %{perl_vendorlib}/MythTV
%{perl_vendorlib}/MythTV/*.pm
@@ -1383,27 +1364,28 @@
%exclude %{perl_vendorarch}/auto/MythTV/.packlist
%endif
+%if %{with_php}
+%files -n php-MythTV
+%{_datadir}/mythtv/bindings/php/*
+%endif
+
%if %{with_python}
%files -n python-MythTV
-%defattr(-,root,root,-)
-%dir %{python_sitelib}/MythTV/
%{_bindir}/mythpython
-%{python_sitelib}/MythTV/*
+%{python_sitelib}/MythTV/
%{python_sitelib}/MythTV-*.egg-info
%endif
%if %{with_plugins}
%files -n mythplugins
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/COPYING
+%doc mythplugins/COPYING
%if %{with_mytharchive}
%files -n mytharchive
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mytharchive/AUTHORS
-%doc mythplugins-%{version}/mytharchive/COPYING
-%doc mythplugins-%{version}/mytharchive/README
-%doc mythplugins-%{version}/mytharchive/TODO
+%doc mythplugins/mytharchive/AUTHORS
+%doc mythplugins/mytharchive/COPYING
+%doc mythplugins/mytharchive/README
+%doc mythplugins/mytharchive/TODO
%{_bindir}/mytharchivehelper
%{_libdir}/mythtv/plugins/libmytharchive.so
%{_datadir}/mythtv/archivemenu.xml
@@ -1414,28 +1396,25 @@
%if %{with_mythbrowser}
%files -n mythbrowser
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythbrowser/AUTHORS
-%doc mythplugins-%{version}/mythbrowser/COPYING
-%doc mythplugins-%{version}/mythbrowser/README
+%doc mythplugins/mythbrowser/AUTHORS
+%doc mythplugins/mythbrowser/COPYING
+%doc mythplugins/mythbrowser/README
%{_libdir}/mythtv/plugins/libmythbrowser.so
%{_datadir}/mythtv/i18n/mythbrowser_*.qm
%endif
%if %{with_mythgallery}
%files -n mythgallery
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythgallery/AUTHORS
-%doc mythplugins-%{version}/mythgallery/COPYING
-%doc mythplugins-%{version}/mythgallery/README
+%doc mythplugins/mythgallery/AUTHORS
+%doc mythplugins/mythgallery/COPYING
+%doc mythplugins/mythgallery/README
%{_libdir}/mythtv/plugins/libmythgallery.so
%{_datadir}/mythtv/i18n/mythgallery_*.qm
-%{_localstatedir}/lib/pictures
+%attr(-,mythtv,mythtv) %{_localstatedir}/lib/pictures
%endif
%if %{with_mythgame}
%files -n mythgame
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythgame
%config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml
%{_libdir}/mythtv/plugins/libmythgame.so
@@ -1449,10 +1428,9 @@
%if %{with_mythmusic}
%files -n mythmusic
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythmusic/AUTHORS
-%doc mythplugins-%{version}/mythmusic/COPYING
-%doc mythplugins-%{version}/mythmusic/README
+%doc mythplugins/mythmusic/AUTHORS
+%doc mythplugins/mythmusic/COPYING
+%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
%{_localstatedir}/lib/mythmusic
%{_datadir}/mythtv/musicmenu.xml
@@ -1462,34 +1440,19 @@
%if %{with_mythnews}
%files -n mythnews
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythnews/AUTHORS
-%doc mythplugins-%{version}/mythnews/COPYING
-%doc mythplugins-%{version}/mythnews/README
+%doc mythplugins/mythnews/AUTHORS
+%doc mythplugins/mythnews/COPYING
+%doc mythplugins/mythnews/README
%{_libdir}/mythtv/plugins/libmythnews.so
%{_datadir}/mythtv/mythnews
%{_datadir}/mythtv/i18n/mythnews_*.qm
%endif
-%if %{with_mythvideo}
-%files -n mythvideo
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythvideo/COPYING
-%doc mythplugins-%{version}/mythvideo/README*
-%{_libdir}/mythtv/plugins/libmythvideo.so
-%{_datadir}/mythtv/mythvideo
-%{_datadir}/mythtv/i18n/mythvideo_*.qm
-%{_datadir}/mythtv/video_settings.xml
-%{_datadir}/mythtv/videomenu.xml
-%{_localstatedir}/lib/mythvideo
-%endif
-
%if %{with_mythweather}
%files -n mythweather
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythweather/AUTHORS
-%doc mythplugins-%{version}/mythweather/COPYING
-%doc mythplugins-%{version}/mythweather/README
+%doc mythplugins/mythweather/AUTHORS
+%doc mythplugins/mythweather/COPYING
+%doc mythplugins/mythweather/README
%{_libdir}/mythtv/plugins/libmythweather.so
%{_datadir}/mythtv/i18n/mythweather_*.qm
%{_datadir}/mythtv/weather_settings.xml
@@ -1499,17 +1462,15 @@
%if %{with_mythweb}
%files -n mythweb
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythweb/README
+%doc ../MythTV-mythweb-%{githash4}/README
+%doc ../MythTV-mythweb-%{githash4}/LICENSE
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
%defattr(-,apache,apache,0775)
-%dir %{_datadir}/mythweb
-%{_datadir}/mythweb/*
+%{_datadir}/mythweb/
%endif
%if %{with_mythzoneminder}
%files -n mythzoneminder
-%defattr(-,root,root,-)
%{_libdir}/mythtv/plugins/libmythzoneminder.so
%{_datadir}/mythtv/zonemindermenu.xml
%{_bindir}/mythzmserver
@@ -1518,10 +1479,9 @@
%if %{with_mythnetvision}
%files -n mythnetvision
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythnetvision/AUTHORS
-%doc mythplugins-%{version}/mythnetvision/ChangeLog
-%doc mythplugins-%{version}/mythnetvision/README
+%doc mythplugins/mythnetvision/AUTHORS
+%doc mythplugins/mythnetvision/ChangeLog
+%doc mythplugins/mythnetvision/README
%{_bindir}/mythfillnetvision
%{_libdir}/mythtv/plugins/libmythnetvision.so
%{_datadir}/mythtv/mythnetvision
@@ -1533,7 +1493,55 @@
################################################################################
+%clean
+rm -rf %{buildroot}
+%if %{with_mythweb}
+rm -rf ../MythTV-mythweb-%{githash4}
+%endif
+
+################################################################################
+
%changelog
+* Fri May 04 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-6
+- Add Bonjour (Airplay) support.
+- Fix user creation for packages that create directories owned by mythtv user.
+ Fixes BZ#2309.
+- Update to latest 0.25/fixes.
+
+* Sun Apr 29 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-5
+- Update to latest 0.25/fixes.
+- Really fix logrotate this time.
+- Add pmount to mytharchive requirements.
+
+* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
+- Removed obsolete build requirement for arts-devel.
+- Re-add %%clean since it's still needed for mythweb.
+- Update logrotate config for systemd.
+
+* Wed Apr 18 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-2
+- Update to latest fixes/0.25.
+- Change --logfile to --logpath for init files.
+- Obsolete mythvideo in spec file.
+
+* Tue Mar 20 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-1
+- Update to latest release 0.25.
+
+* Fri Mar 03 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-2
+- Remove transcode as build requirement.
+- Misc. spec file cleanup.
+
+* Mon Feb 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-1
+- Update to latest version.
+- Update mythbackend systemd service file for better compatibilty with devices
+ that take time to initialize due to firmware loading.
+- Add dependency m2vrequantiser for mytharchive.
+- Patched for building with gcc 4.7 (rawhide/Fedora 17).
+
+* Mon Dec 12 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.1-6
+- Fix %%post to make sure group membership gets set for the mythtv user.
+- Fix ownership of mythtv directories.
+- Update to latest 0.24.1-fixes, git revision 40f3bae.
+
* Mon Nov 21 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.1-5
- Fix typo in spec file causing mythtv user to not be created (#2051).
- Change mythbackend systemd type to "simple" and other fixes (#2016).
@@ -1623,414 +1631,3 @@
* Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r23902
- Update to svn trunk, revision 23902
- Starts tracking 0.24-bound svn trunk, now that 0.23 has branched
-
-* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
-- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
-
-* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718
-- Update to svn trunk, revision 23718
-
-* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
-- Update to svn trunk, revision 23702
-- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins
-
-* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23662
-- Update to svn trunk, revision 23662
-
-* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23630
-- Update to svn trunk, revision 23630
-- Make mythbackend --version actually print useful stuff now (like pkg ver)
-
-* Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23586
-- Update to svn trunk, revision 23586
-- Attempt to fix implicit link issue w/XvMCW
-
-* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
-- Update to svn trunk, revision 23535
-
-* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479
-- Update to svn trunk, revision 23479
-- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
-
-* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23456
-- Update to svn trunk, revision 23456
-
-* Tue Feb 02 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23443
-- Update to svn trunk, revision 23443
-- Don't try applying 0.22 svn fixes branch patches to 0.23 svn trunk, duh
-
-* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23433
-- Update to svn trunk, revision 23433
-- Drop dropped mythflix plugin
-- Add new mythnetvision plugin
-
-* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2
-- Update to release-0-22-fixes branch, svn revision 22880
-
-* Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-1
-- Update to 0.22 release
-
-* Sat Oct 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.9.rc2
-- Update to 0.22-rc2
-
-* Tue Oct 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.8.rc1
-- Update to release-0-22-fixes branch, svn revision 22579
-
-* Tue Oct 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.7.rc1
-- Update to release-0-22-fixes branch, svn revision 22548
-
-* Fri Oct 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.6.rc1
-- Update to release-0-22-fixes branch, svn revision 22507
-
-* Wed Oct 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.5.rc1
-- Update to 0.22-rc1
-- Now tracking release-0-22-fixes branch
-
-* Tue Oct 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22427
-- Update to pre-0.22 svn trunk revision 22427
-- Conditionalize R: php-process on F11+ so we can build and
- install properly on F10 (builds forthcoming once 0.22 is out)
-
-* Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22366
-- Update to pre-0.22 svn trunk revision 22366
-- Disable faac by default, since its been deteremined to be non-free now
-
-* Thu Oct 08 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22304
-- Update to pre-0.22 svn trunk revision 22304
-
-* Tue Oct 06 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22270
-- Update to pre-0.22 svn trunk revision 22270
-- Fix temp include path for building plugins
-- Drop some old shouldn't-be-needed-anymore BR
-- Use fftw v3 instead of v2 now
-
-* Sun Oct 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22228
-- Update to pre-0.22 svn trunk revision 22228
-
-* Fri Oct 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22179
-- Update to pre-0.22 svn trunk revision 22179
-- Drop BR: libmad-devel, its no longer used
-
-* 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
-
-* Tue Sep 15 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.3.svn.r21864
-- Oops, no libvdpau for powerpc
-
-* Mon Sep 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21864
-- Update to pre-0.22 svn trunk revision 21864
-- Enable vdpau support, now that libvdpau is packaged in Fedora
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21778
-- Update to pre-0.22 svn trunk revision 21778
-- Build for ppc again, breakage is fixed
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21770
-- Update to pre-0.22 svn trunk revision 21770
-
-* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
-- Update to pre-0.22 svn trunk revision 21745
-
-* Sun Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21685
-- Update to pre-0.22 svn trunk revision 21685
-
-* Fri Sep 05 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21667
-- Update to pre-0.22 svn trunk revision 21667
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21591
-- Update to pre-0.22 svn trunk revision 21591
-- ExcludeArch: ppc/ppc64 for now, since it keeps failing to build
- and I just don't have the time to investigate the fix at the moment,
- so both ppc mythtv svn trunk users will just have to deal with it...
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21585
-- Update to pre-0.22 svn trunk revision 21585
-
-* Mon Aug 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21336
-- Update to pre-0.22 svn trunk revision 21336
-
-* Sat Aug 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21179
-- Update to pre-0.22 svn trunk revision 21179
-
-* Tue Aug 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21118
-- Update to pre-0.22 svn trunk revision 21118
-- Add infra for builds with vdpau support (need libvdpau in either
- Fedora or RPM Fusion before we can enable by default...)
-
-* Sat Jun 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20728
-- Update to pre-0.22 svn trunk revision 20728
-- Drop BR: kdelibs3-devel, MythBrowser ported to qt4 now (rfbz#626)
-
-* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20701
-- Update to pre-0.22 svn trunk revision 20701
-
-* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668
-- Update to pre-0.22 svn trunk revision 20668
-
-* Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20586
-- Update to pre-0.22 svn trunk revision 20586
-- Fix upgrade path for people that have mythphone installed (rfbz#596)
-- Remove ExcludeArch: ppc64, build deps now present
-
-* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20488
-- Update to pre-0.22 svn trunk, revision 20488
-
-* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20462
-- Update to pre-0.22 svn trunk, revision 20462
-
-* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448
-- Update to pre-0.22 svn trunk, revision 20448
-- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567)
-
-* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20371
-- Update to pre-0.22 svn trunk, revision 20371
-- Relocate Requires: wget to the sub-packages where necessary (rfbz#384)
-- Don't use a52dec, mythtv has its own internal support these days
-
-* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317
-- Update to pre-0.22 svn trunk, revision 20317
-
-* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20293
-- Update to pre-0.22 svn trunk, revision 20293
-- Add BuildRequires: phonon-devel
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273
-- rebuild for new F11 features
-
-* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20273
-- Update to pre-0.22 svn trunk, revision 20273
-
-* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20232
-- Update to pre-0.22 svn trunk, revision 20232
-
-* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196
-- Update to pre-0.22 svn trunk, revision r20196
-- Carries work-around for qt 4.5 "everthing is a prepared statement now"
- bug/quirk (rpmfusion bz#421)
-
-* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107
-- Update to pre-0.22 svn trunk, revision 20107
-- Features misc gcc 4.4 and qt 4.5 build fixage
-
-* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089
-- Update to pre-0.22 svn trunk, revision 20089
-
-* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20019
-- Update to pre-0.22 svn trunk, revision 20019
-
-* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19980
-- Update to pre-0.22 svn trunk, revision 19980
-
-* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19874
-- Update to pre-0.22 svn trunk, revision 19874
-
-* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811
-- Update to pre-0.22 svn trunk, revision 19811
-- Drop mythcontrols plugin (functionality merged into mythfrontend)
-- Re-enable building iptv support
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19722
-- Update to pre-0.22 svn trunk, revision 19722
-- MythPhone plugin is dead as a doornail (MythTV changeset 19702)
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19721
-- Update to pre-0.22 svn trunk, revision 19721
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19630
-- Update to pre-0.22 svn trunk, revision 19630
-- Fix a %%files list screw-up w/mythgame-emulators nukage
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19622
-- Update to pre-0.22 svn trunk, revision 19622
-
-* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19534
-- Update to pre-0.22 svn trunk, revision 19534
-- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
-
-* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467
-- Update to pre-0.22 svn trunk, revision 19467
-
-* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
-- MythTV svn trunk (pre-0.22), revision 19390
-- Re-enable fast cmov on x86_64 by default
-- Add BR: yasm-devel to enable yasm-specific improvements
-
-* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
-- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
-- Major cleanup and porting from my personal spec (which was a combination
- of works from atrpms and some of Jarod's earlier works).
-- Add a few more --with and --without options, including the ability to
- disable specific mythplugins and/or all plugins.
-
-* 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
-
-* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
-- Enable fast cmov on x86_64
-- Disable mythgame-emulators convenience meta-package, deps not
- available in the free repo (if available at all)
-
-* Mon Oct 06 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-12
-- Update release-0-21-fixes patches (r18567)
-
-* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-11
-- Work-around for broken cdparanoia header (rhbz#463009)
-
-* Wed Sep 17 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-10
-- Nuke a bunch of configure flags that really shouldn't be
- enabled anymore, per discussion with mythtv devs.
-
-* Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-9
-- Conditionalize some qt/qt3 stuff so spec builds on
- all currently supported Fedora releases
-- Add work-around for lirc-libs mock quirk on f8 builds
-
-* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8
-- Don't BR: libdvdcss-devel
-- Update release-0-21-fixes patches (r18161)
-- Rebuild for libraw1394 v2.0.0
-
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7
-- rebuild
-
-* Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7
-- Disable XvMC VLD and Pro support on ppc due to lack of
- openchrome driver.
-
-* Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6
-- Fix spec typo
-- Disable mythstream patch for now, too much fuzz, revisit later
-
-* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5
-- Update release-0-21-fixes patches (r17859)
-- Don't use %%bcond, breaks on some older buildsystems
-- Put several bits in -common sub-package, as both backend
- and frontend may need them for one reason or another
-
-* Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4
-- Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel
-- Make building with nVidia XvMC an available custom option, fix up
- conflict between it and other XvMC implementations
-- Update release-0-21-fixes patches (r17338)
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3
-- Fix up PACKAGE-LICENSING inclusion
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2
-- RPMFusion package review cleanups
-- Put mythtv-setup.desktop in mythtv-setup package
-- Fix up initscript to start properly
-- Drop unused %%ghostattr define
-- Attempt to clarify licensing
-- Clean up assorted Requires and BuildRequires
-- Update release-0-21-fixes patches (r16965)
-
-* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
-- MythTV 0.21 (r16468)
-- Add release-0-21-fixes for DVD menu display fix (r16486)
-
-* Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394
-- Update to latest release-0-21-fixes pre-release branch code (16394).
-
-* Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316
-- Update to latest release-0-21-fixes pre-release branch code (16316).
-- Add mythgame-emulators meta-package that requires a bunch of
- emulators for roms mythgame knows about.
-- Account for python egg on f9+
-- Enable gsm support by default
-
-* Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307
-- Update to latest release-0-21-fixes pre-release branch code (16307).
-- Try to fix up a bunch of rpmlint warnings and errors.
-
-* Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238
-- Update to latest svn trunk (16238).
-- Package up python bits.
-
-* Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019
-- Update to latest svn trunk (16019).
-
-* Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914
-- Update to latest svn trunk (15914).
-- Turn on multi-threaded video decoding.
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699
-- More spec file overhauling, make it build in Fedora 9
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699
-- Update to latest svn trunk (15699).
-- Misc spec reformatting.
-
-* Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614
-- Update to latest svn trunk (15614).
-
-* Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281
-- Update to latest svn trunk (15281).
-- Fix up version-release insertion in mythbackend --version output
-
-* Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081
-- Update to latest svn trunk (15081).
-
-* Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888
-- Update to latest svn trunk (14888).
-
-* Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695
-- Update to latest svn trunk (14695).
-
-* Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667
-- Update to latest svn trunk (14667).
-- Build dvb support against kernel-headers instead
-- Drop unnecessary patches
-- Tweak BR: to not use any file deps (I only care about recent distros)
-- Rework mythweb bits to be compliant w/Fedora packaging guidelines
-- Enable OpenGL video output support
-- Make dvb and opengl bits non-conditional (always enabled)
-
-* Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658
-- Update to latest svn trunk (14658).
-- Tweak configure options a bit more
-
-* Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589
-- Update to latest svn trunk (14589).
-- Restructure how optflags are passed into build
-- Nuke some extra non-standard macros
-- Drop ancient dvb tarball, create with_dvb option, always using v4l-devel
-
-* Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488
-- Update to latest svn trunk (14488).
-
-* Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346
-- Update to latest svn trunk (14346).
-
-* Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337
-- Update to latest svn trunk (14337).
-
-* Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492
-- Update to latest svn trunk (13492).
-- More non-standard macro nuking
-
-* Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487
-- Update to latest svn trunk (13487).
-- Reshuffle theme files
-- Credit where credit is due: forking this off the current ATrpms spec
12 years, 5 months
- 1
- 0
rpms/mythtv/EL-6 mythtv.spec, 1.83, 1.84 sources, 1.51, 1.52 mythplugins-0.24.1-fixes.patch, 1.2, NONE mythtv-0.24.1-fixes.patch, 1.2, NONE mythtv-0.24.1-glu_h_gluErrorString.patch, 1.1, NONE mythweb-0.24.1-fixes.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24009
Modified Files:
mythtv.spec sources
Removed Files:
mythplugins-0.24.1-fixes.patch mythtv-0.24.1-fixes.patch
mythtv-0.24.1-glu_h_gluErrorString.patch
mythweb-0.24.1-fixes.patch
Log Message:
Branch cleanup.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mythtv.spec 18 Nov 2011 22:20:06 -0000 1.83
+++ mythtv.spec 9 Jun 2012 02:17:35 -0000 1.84
@@ -83,7 +83,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -135,12 +135,10 @@
Patch0: mythtv-%{version}-fixes.patch
Patch1: mythplugins-%{version}-fixes.patch
#Patch2: mythweb-%{version}-fixes.patch\
-Patch3: mythtv-0.24.1-glu_h_gluErrorString.patch
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig
Source102: mythbackend.init
Source103: mythbackend.logrotate
-Source104: mythbackend.service
Source106: mythfrontend.png
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
@@ -148,8 +146,6 @@
Source110: mysql.txt
Source401: mythweb.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
################################################################################
# Python setup
@@ -854,7 +850,6 @@
cd mythtv-%{version}
%patch0 -p2
-%patch3 -p1 -b .p3
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -1209,7 +1204,7 @@
# Add the "mythtv" user, with membership in the audio and video group
getent group mythtv >/dev/null || groupadd -r mythtv
getent passwd mythtv >/dev/null || \
- useradd -r -g mythtv -d d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
+ useradd -r -g mythtv -d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
-c "mythbackend user" mythtv
exit 0
# Make sure the mythtv user is in the audio and video group for existing
@@ -1276,12 +1271,16 @@
%files docs
%defattr(-,root,root,-)
-%doc mythtv-%{version}/README* mythtv-%{version}/UPGRADING
-%doc mythtv-%{version}/AUTHORS mythtv-%{version}/COPYING mythtv-%{version}/FAQ
+%doc mythtv-%{version}/README*
+%doc mythtv-%{version}/UPGRADING
+%doc mythtv-%{version}/AUTHORS
+%doc mythtv-%{version}/COPYING
+%doc mythtv-%{version}/FAQ
%doc mythtv-%{version}/database mythtv-%{version}/keys.txt
%doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png
%doc mythtv-%{version}/docs/*.txt
%doc mythtv-%{version}/PACKAGE-LICENSING
+%doc mythtv-%{version}/contrib
%files common
%defattr(-,root,root,-)
@@ -1535,6 +1534,12 @@
################################################################################
%changelog
+* Mon Nov 21 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.1-5
+- Fix typo in spec file causing mythtv user to not be created (#2051).
+- Change mythbackend systemd type to "simple" and other fixes (#2016).
+- Update to latest 0.24.1-fixes, git revision f5fd11fa54.
+- Readd contrib directory (#1924).
+
* Fri Oct 28 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.24.1-4
- Fix for glibc bug rhbz#747377
! Reminder:
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 17 May 2011 22:34:20 -0000 1.51
+++ sources 9 Jun 2012 02:17:35 -0000 1.52
@@ -1,4 +1,2 @@
-be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
-be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-6870c679619ec58456e76839745411d8 mythtv-0.24.1.tar.bz2
-3fbe948f05263000fb50ec20d89835b6 mythplugins-0.24.1.tar.bz2
+68928bcd22857d4905cc6141e3b7f7dc MythTV-mythtv-v0.25-0-g1f5962a.tar.gz
+370bf39a67c1d405d455e4ff74180cba MythTV-mythweb-v0.25-0-g1d056f7.tar.gz
--- mythplugins-0.24.1-fixes.patch DELETED ---
--- mythtv-0.24.1-fixes.patch DELETED ---
--- mythtv-0.24.1-glu_h_gluErrorString.patch DELETED ---
--- mythweb-0.24.1-fixes.patch DELETED ---
12 years, 5 months
- 1
- 0
rpms/wl-kmod/devel broadcom-wl-5.100.82.112-kernel-3.4.patch, NONE, 1.1 wl-kmod.spec, 1.62, 1.63
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29973
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.4.patch
Log Message:
* Fri Jun 08 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
- Added patch to build for kernel >= 3.4
broadcom-wl-5.100.82.112-kernel-3.4.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.4.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-01-09 15:07:19.779120052 +0100
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-06-08 19:33:56.732583669 +0200
@@ -40,7 +40,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
#include <asm/system.h>
+#endif
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- wl-kmod.spec 19 Apr 2012 21:19:12 -0000 1.62
+++ wl-kmod.spec 8 Jun 2012 20:08:16 -0000 1.63
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 2%{?dist}.1
+Release: 3%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -17,6 +17,7 @@
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
Patch0: broadcom-wl-5.100.82.112-license.patch
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
+Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
BuildRequires: %{_bindir}/kmodtool
@@ -54,6 +55,7 @@
%endif
%patch0 -p1 -b .license
%patch1 -p1 -b .kernel-3.2
+%patch2 -p1 -b .kernel-3.4
popd
for kernel_version in %{?kernel_versions} ; do
@@ -83,6 +85,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 08 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
+- Added patch to build for kernel >= 3.4
+
* Thu Apr 19 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2.1
- Rebuilt for Rawhide
12 years, 5 months
- 1
- 0
rpms/wl-kmod/F-17 broadcom-wl-5.100.82.112-kernel-3.4.patch, NONE, 1.1 wl-kmod.spec, 1.72, 1.73
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29079
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.4.patch
Log Message:
* Fri Jun 08 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
- Added patch to build for kernel >= 3.4
broadcom-wl-5.100.82.112-kernel-3.4.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.4.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-01-09 15:07:19.779120052 +0100
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-06-08 19:33:56.732583669 +0200
@@ -40,7 +40,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
#include <asm/system.h>
+#endif
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- wl-kmod.spec 5 Jun 2012 11:31:27 -0000 1.72
+++ wl-kmod.spec 8 Jun 2012 19:40:56 -0000 1.73
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
Name: wl-kmod
Version: 5.100.82.112
-Release: 2%{?dist}.13
+Release: 3%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -17,6 +17,7 @@
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
Patch0: broadcom-wl-5.100.82.112-license.patch
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
+Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
BuildRequires: %{_bindir}/kmodtool
@@ -54,6 +55,7 @@
%endif
%patch0 -p1 -b .license
%patch1 -p1 -b .kernel-3.2
+%patch2 -p1 -b .kernel-3.4
popd
for kernel_version in %{?kernel_versions} ; do
@@ -83,6 +85,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 08 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
+- Added patch to build for kernel >= 3.4
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.13
- Rebuilt for updated kernel
12 years, 5 months
- 1
- 0
rpms/qmmp-plugins-freeworld/F-17 .cvsignore, 1.14, 1.15 qmmp-plugins-freeworld.spec, 1.22, 1.23 sources, 1.14, 1.15 qmmp-0.5.3-mms-include-usleep.patch, 1.1, NONE
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12266
Modified Files:
.cvsignore qmmp-plugins-freeworld.spec sources
Removed Files:
qmmp-0.5.3-mms-include-usleep.patch
Log Message:
* Fri Jun 08 2012 Karel Volný <kvolny(a)redhat.com> 0.5.5-1
- version bump
- removed qmmp-0.5.3-mms-include-usleep.patch (accepted upstream)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-17/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 23 Jan 2012 18:52:13 -0000 1.14
+++ .cvsignore 8 Jun 2012 10:48:35 -0000 1.15
@@ -1 +1 @@
-qmmp-0.5.3.tar.bz2
+qmmp-0.5.5.tar.bz2
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-17/qmmp-plugins-freeworld.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qmmp-plugins-freeworld.spec 2 Mar 2012 15:01:38 -0000 1.22
+++ qmmp-plugins-freeworld.spec 8 Jun 2012 10:48:35 -0000 1.23
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
-Version: 0.5.3
-Release: 3%{?dist}
+Version: 0.5.5
+Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -10,8 +10,6 @@
Source2: qmmp-filter-provides.sh
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-filter-provides.sh
-# Sent upstream via email 20120123
-Patch0: qmmp-0.5.3-mms-include-usleep.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -33,7 +31,6 @@
%prep
%setup -q -n qmmp-%{version}
-%patch0 -p1
cp %{SOURCE2} .
chmod +x qmmp-filter-provides.sh
# adjust includes for the header move in latest ffmpeg
@@ -134,6 +131,10 @@
%changelog
+* Fri Jun 08 2012 Karel Volný <kvolny(a)redhat.com> 0.5.5-1
+- version bump
+- removed qmmp-0.5.3-mms-include-usleep.patch (accepted upstream)
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-3
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-17/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 23 Jan 2012 18:52:13 -0000 1.14
+++ sources 8 Jun 2012 10:48:35 -0000 1.15
@@ -1 +1 @@
-3d4dc1ff7fcdb00e6d61a88cbd8749fb qmmp-0.5.3.tar.bz2
+8174905dcf7ae6fedaf044fda51e7314 qmmp-0.5.5.tar.bz2
--- qmmp-0.5.3-mms-include-usleep.patch DELETED ---
12 years, 5 months
- 1
- 0
rpms/qmmp-plugins-freeworld/devel .cvsignore, 1.15, 1.16 qmmp-plugins-freeworld.spec, 1.23, 1.24 sources, 1.15, 1.16
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10680
Modified Files:
.cvsignore qmmp-plugins-freeworld.spec sources
Log Message:
* Fri Jun 08 2012 Karel Volný <kvolny(a)redhat.com> 0.5.5-1
- version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 13 May 2012 10:42:41 -0000 1.15
+++ .cvsignore 8 Jun 2012 09:42:37 -0000 1.16
@@ -1 +1 @@
-qmmp-0.5.4.tar.bz2
+qmmp-0.5.5.tar.bz2
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/qmmp-plugins-freeworld.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- qmmp-plugins-freeworld.spec 13 May 2012 10:42:41 -0000 1.23
+++ qmmp-plugins-freeworld.spec 8 Jun 2012 09:42:37 -0000 1.24
@@ -1,5 +1,5 @@
Name: qmmp-plugins-freeworld
-Version: 0.5.4
+Version: 0.5.5
Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
@@ -131,6 +131,9 @@
%changelog
+* Fri Jun 08 2012 Karel Volný <kvolny(a)redhat.com> 0.5.5-1
+- version bump
+
* Fri Mar 02 2012 Karel Volný <kvolny(a)redhat.com> 0.5.4-1
- version bump
- removed patch to include usleep from QThread (qmmp-0.5.3-mms-include-usleep.patch)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 13 May 2012 10:42:41 -0000 1.15
+++ sources 8 Jun 2012 09:42:37 -0000 1.16
@@ -1 +1 @@
-9df751d6fba0fad668cf32807ac03ff1 qmmp-0.5.4.tar.bz2
+8174905dcf7ae6fedaf044fda51e7314 qmmp-0.5.5.tar.bz2
12 years, 5 months
- 1
- 0