rpms/ffmpegthumbnailer/F-18 .cvsignore, 1.7, 1.8 ffmpegthumbnailer.spec, 1.13, 1.14 sources, 1.7, 1.8
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/ffmpegthumbnailer/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26389
Modified Files:
.cvsignore ffmpegthumbnailer.spec sources
Log Message:
* Wed Aug 29 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 2.0.8-1
- 2.0.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpegthumbnailer/F-18/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 29 Sep 2011 15:58:25 -0000 1.7
+++ .cvsignore 29 Aug 2012 12:40:22 -0000 1.8
@@ -1 +1 @@
-ffmpegthumbnailer-2.0.7.tar.gz
+ffmpegthumbnailer-2.0.8.tar.gz
Index: ffmpegthumbnailer.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpegthumbnailer/F-18/ffmpegthumbnailer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ffmpegthumbnailer.spec 26 Jun 2012 09:07:08 -0000 1.13
+++ ffmpegthumbnailer.spec 29 Aug 2012 12:40:22 -0000 1.14
@@ -1,6 +1,6 @@
Name: ffmpegthumbnailer
-Version: 2.0.7
-Release: 5%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
Summary: Lightweight video thumbnailer that can be used by file managers
Group: Applications/Multimedia
@@ -8,12 +8,7 @@
URL: http://code.google.com/p/ffmpegthumbnailer/
Source0: http://ffmpegthumbnailer.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# patch in upstream svn
-# http://code.google.com/p/ffmpegthumbnailer/source/diff?spec=svn228&r=228&...
-# Patch0: %%{name}-libdl.patch
-# patch sent upstream
-# https://code.google.com/p/ffmpegthumbnailer/issues/detail?id=83
-# Patch1: %%{name}-null.patch
+
BuildRequires: ffmpeg-devel, libpng-devel, libjpeg-devel
BuildRequires: chrpath, automake, autoconf
@@ -24,7 +19,7 @@
%package devel
Summary: Headers and libraries for building apps that use ffmpegthumbnailer
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This video thumbnailer can be used to create thumbnails for your video files,
@@ -38,7 +33,8 @@
%configure --enable-png \
--enable-jpeg \
--disable-static \
- --enable-gio
+ --enable-gio \
+ --enable-thumbnailer
make %{?_smp_mflags}
@@ -49,12 +45,11 @@
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/ffmpegthumbnailer
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
@@ -62,17 +57,20 @@
%{_bindir}/ffmpegthumbnailer
%{_libdir}/libffmpegthumbnailer.so.4*
%{_mandir}/man1/ffmpegthumbnailer.1.gz
+# gnome thumbnailer registration
+%dir %{_datadir}/thumbnailers
+%{_datadir}/thumbnailers/ffmpegthumbnailer.thumbnailer
%files devel
%defattr(-,root,root,-)
%{_libdir}/libffmpegthumbnailer.so
-%{_libdir}/pkgconfig/lib%{name}.pc
-%dir %{_includedir}/libffmpegthumbnailer
-%{_includedir}/libffmpegthumbnailer/*.h
+%{_libdir}/pkgconfig/libffmpegthumbnailer.pc
+%{_includedir}/libffmpegthumbnailer/
+
%changelog
-* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.7-5
-- Rebuilt for FFmpeg
+* Wed Aug 29 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 2.0.8-1
+- 2.0.8
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.7-4
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpegthumbnailer/F-18/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 29 Sep 2011 15:58:25 -0000 1.7
+++ sources 29 Aug 2012 12:40:22 -0000 1.8
@@ -1 +1 @@
-2b5726894792ef484793dce9568a065a ffmpegthumbnailer-2.0.7.tar.gz
+03e081f89778cd5e4fce30b29a4630e1 ffmpegthumbnailer-2.0.8.tar.gz
11 years, 8 months
rpms/mythtv/F-18 ChangeLog, 1.2, 1.3 mythbackend.service, 1.7, 1.8 mythtv-0.25.2-fixes.patch, 1.1, 1.2 mythtv.spec, 1.102, 1.103
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16200
Modified Files:
ChangeLog mythbackend.service mythtv-0.25.2-fixes.patch
mythtv.spec
Log Message:
* Sat Aug 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-2
- Update to latest fixes/0.25.
- Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-18/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 22 Jul 2012 18:42:46 -0000 1.2
+++ ChangeLog 28 Aug 2012 18:14:44 -0000 1.3
@@ -1,3 +1,73 @@
+commit 46cab93562429cd19029402a2387f63a72aeb898
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Jul 31 14:21:22 2012 -0400
+
+ Correct --printexpire option in mythbackend.
+
+ This corrects logic that was accidentally inverted in 8bc8dd54, and
+ allows `mythbackend --printexpire` to be used again.
+ (cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
+
+commit 8ab229a8bed860fb0855797c683655a7465e2ee4
+Merge: a4cdc9e 1c496c8
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Jul 31 14:22:32 2012 -0400
+
+ Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+
+commit 1c496c81662eabda444452071eb18f2fd375d4d0
+Author: Kyle <klillis(a)gmail.com>
+Date: Mon Jul 30 13:34:11 2012 -0400
+
+ Fixes #10897. Clear paused when we unpause FirewireRecorder.
+
+ Signed-off-by: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
+
+commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
+Author: Daniel Thor Kristjansson <dkristjansson(a)mythtv.org>
+Date: Tue Jul 24 12:13:16 2012 -0400
+
+ Fixes #10870. Fix Start/Stop race condition in StreamHandler.
+
+ This is a backport of [445faaa47].
+
+commit a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sun Jul 29 12:42:41 2012 +0100
+
+ Restore setup pincode following [57adc5d120] - 'Flatten the Setup Menus in the default menu theme' which dropped util_menu.xml but failed to carry over the <password> markup.
+ (cherry picked from commit 134417fe3bf7170f3419d2388a6c26afe16c4927)
+
+commit 3256849b14cc882536a153e7fbe4724adf03260c
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Tue Jul 24 10:56:15 2012 -0700
+
+ Subtitles: backport some code to enable cc608 TT deprecation log message.
+
+commit 39fad46248bbcbe5ab27068e73fb7c5a91bc155b
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Tue Jul 24 08:23:53 2012 -0700
+
+ Subtitles: Put a "DEPRECATED_608_TELETEXT" message into the logs.
+
+ Support for CEA-608 teletext captions is to be removed. Allow users
+ to check whether they would be affected. Refs #10786.
+ (cherry picked from commit 7b1aef85ec92658acb91c1ff019aed909e5df30a)
+
+commit 9e0d839be7667056dc65b79711dda84159a1b13d
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Tue Jul 24 14:11:47 2012 +0100
+
+ Set m_cdWatcher to NULL after deletion, fixes segfault on exiting frontend. Fixes #10936
+ (cherry picked from commit de851dd273eaa80689a427f915c7db40d015e0ba)
+
+commit 10a68895e1fcd5c409058d2eb61fe59e78736235
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sun Jul 22 23:24:40 2012 +0100
+
+ Fix segfault after music scan completes.
+ (cherry picked from commit b2379ae9b8d42c23c3feee26b52a1f0a2ebef394)
+
commit ed58b3a818a1796340ba0f085a53159eb1d52266
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Sat Jul 21 23:53:41 2012 +0100
@@ -14,6 +84,13 @@
e.g. GStreamer/Source/gst-plugins-ugly/gst/synaesthesia/synaescope.c
(cherry picked from commit e331017f2d1ee9be82da9c0b64ca4435ec3efd1e)
+commit a4cdc9e01295991056cdc8c5411e70937b1a4842
+Merge: 450ed91 f0e2ad8
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Jul 20 21:06:48 2012 -0400
+
+ Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+
commit f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
Date: Wed Jul 18 20:49:11 2012 +1000
@@ -41,3 +118,12 @@
off network access.
Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+
+commit 450ed915d3a13b84489ecdebdad6fca18fc8c312
+Author: GDragon <gdragon(a)jetcom.org>
+Date: Mon Jul 9 15:33:31 2012 -0400
+
+ Properly set job type in fromProgram and fromRecorded methods.
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)
Index: mythbackend.service
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-18/mythbackend.service,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mythbackend.service 22 Jul 2012 18:42:46 -0000 1.7
+++ mythbackend.service 28 Aug 2012 18:14:44 -0000 1.8
@@ -44,7 +44,7 @@
# Default setting assumes a system wide install. Otherwise it should be set to
# the folder containing the .mythtv subfolder containing the config.xml file
-Environment=HOME=/etc/mythtv
+Environment=MYTHCONFDIR=/etc/mythtv
# systemd changes execution from the calling user (possibly root) to this user
# if you have permissions problems or obscure errors try logging in as mythtv
mythtv-0.25.2-fixes.patch:
checksums/mythplugins-0.25.2.md5sum | 1
checksums/mythtv-0.25.2.md5sum | 1
mythplugins/mythmusic/mythmusic/musicplayer.cpp | 7
mythplugins/mythmusic/mythmusic/polygon.h | 4
mythtv/bindings/python/MythTV/dataheap.py | 2
mythtv/html/setup/wizard-network.qsp | 4
mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++---------
mythtv/libs/libmythtv/firewirerecorder.cpp | 1
mythtv/libs/libmythtv/streamhandler.cpp | 34 +---
mythtv/libs/libmythtv/streamhandler.h | 6
mythtv/libs/libmythtv/subtitlescreen.cpp | 6
mythtv/libs/libmythtv/subtitlescreen.h | 7
mythtv/programs/mythbackend/main_helpers.cpp | 2
mythtv/themes/defaultmenu/mainmenu.xml | 1
14 files changed, 176 insertions(+), 96 deletions(-)
Index: mythtv-0.25.2-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-18/mythtv-0.25.2-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-0.25.2-fixes.patch 22 Jul 2012 18:42:46 -0000 1.1
+++ mythtv-0.25.2-fixes.patch 28 Aug 2012 18:14:44 -0000 1.2
@@ -1,8 +1,58 @@
- mythplugins/mythmusic/mythmusic/polygon.h | 4 +-
- mythtv/html/setup/wizard-network.qsp | 4 +
- mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++++++----------
- 3 files changed, 133 insertions(+), 71 deletions(-)
+ checksums/mythplugins-0.25.2.md5sum | 1 +
+ checksums/mythtv-0.25.2.md5sum | 1 +
+ mythplugins/mythmusic/mythmusic/musicplayer.cpp | 7 +
+ mythplugins/mythmusic/mythmusic/polygon.h | 4 +-
+ mythtv/bindings/python/MythTV/dataheap.py | 2 +
+ mythtv/html/setup/wizard-network.qsp | 4 +
+ mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++--------
+ mythtv/libs/libmythtv/firewirerecorder.cpp | 1 +
+ mythtv/libs/libmythtv/streamhandler.cpp | 34 ++---
+ mythtv/libs/libmythtv/streamhandler.h | 6 +-
+ mythtv/libs/libmythtv/subtitlescreen.cpp | 6 +-
+ mythtv/libs/libmythtv/subtitlescreen.h | 7 +-
+ mythtv/programs/mythbackend/main_helpers.cpp | 2 +-
+ mythtv/themes/defaultmenu/mainmenu.xml | 1 +
+ 14 files changed, 176 insertions(+), 96 deletions(-)
+diff --git a/checksums/mythplugins-0.25.2.md5sum b/checksums/mythplugins-0.25.2.md5sum
+new file mode 100644
+index 0000000..16f5965
+--- /dev/null
++++ b/checksums/mythplugins-0.25.2.md5sum
+@@ -0,0 +1 @@
++80466458a82759d213fe69af63d6dc80 mythplugins-0.25.2.tar.bz2
+diff --git a/checksums/mythtv-0.25.2.md5sum b/checksums/mythtv-0.25.2.md5sum
+new file mode 100644
+index 0000000..f02e863
+--- /dev/null
++++ b/checksums/mythtv-0.25.2.md5sum
+@@ -0,0 +1 @@
++2bf8c0aa75e88d39747e59c27aa6072e mythtv-0.25.2.tar.bz2
+diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
+index b0cccf5..d94e08f 100644
+--- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp
++++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
+@@ -105,6 +105,7 @@ MusicPlayer::~MusicPlayer()
+ m_cdWatcher->stop();
+ m_cdWatcher->wait();
+ delete m_cdWatcher;
++ m_cdWatcher = NULL;
+ }
+
+ if (!hasClient())
+@@ -283,6 +284,12 @@ void MusicPlayer::stop(bool stopAll)
+ m_output = NULL;
+ }
+
++ if (stopAll && m_cdWatcher)
++ {
++ m_cdWatcher->stop();
++ m_cdWatcher->wait();
++ }
++
+ // because we don't actually stop the audio output we have to fake a Stopped
+ // event so any listeners can act on it
+ OutputEvent oe(OutputEvent::Stopped);
diff --git a/mythplugins/mythmusic/mythmusic/polygon.h b/mythplugins/mythmusic/mythmusic/polygon.h
index 2884d8e..d859d5d 100644
--- a/mythplugins/mythmusic/mythmusic/polygon.h
@@ -23,6 +73,26 @@
}
};
#endif
+diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py
+index dd832ba..ae817e7 100644
+--- a/mythtv/bindings/python/MythTV/dataheap.py
++++ b/mythtv/bindings/python/MythTV/dataheap.py
+@@ -612,6 +612,7 @@ class Job( DBDataWrite, JOBTYPE, JOBCMD, JOBFLAG, JOBSTATUS ):
+ def fromRecorded(cls, rec, type, status=None, schedruntime=None,
+ hostname=None, args=None, flags=None):
+ job = cls(db=rec._db)
++ job.type = type
+ job.chanid = rec.chanid
+ job.starttime = rec.starttime
+ if status:
+@@ -632,6 +633,7 @@ class Job( DBDataWrite, JOBTYPE, JOBCMD, JOBFLAG, JOBSTATUS ):
+ if prog.rectype != prog.rsRecorded:
+ raise MythError('Invalid recording type for Job.')
+ job = cls(db=prog._db)
++ job.type = type
+ job.chanid = prog.chanid
+ job.starttime = prog.recstartts
+ if status:
diff --git a/mythtv/html/setup/wizard-network.qsp b/mythtv/html/setup/wizard-network.qsp
index 03c37ac..59b67a9 100644
--- a/mythtv/html/setup/wizard-network.qsp
@@ -289,3 +359,196 @@
}
}
+diff --git a/mythtv/libs/libmythtv/firewirerecorder.cpp b/mythtv/libs/libmythtv/firewirerecorder.cpp
+index 9caa28e..fbb5ed0 100644
+--- a/mythtv/libs/libmythtv/firewirerecorder.cpp
++++ b/mythtv/libs/libmythtv/firewirerecorder.cpp
+@@ -210,6 +210,7 @@ bool FirewireRecorder::PauseAndWait(int timeout)
+ {
+ LOG(VB_RECORD, LOG_INFO, LOC +
+ QString("PauseAndWait(%1) -- unpause").arg(timeout));
++ paused = false;
+ StartStreaming();
+ unpauseWait.wakeAll();
+ }
+diff --git a/mythtv/libs/libmythtv/streamhandler.cpp b/mythtv/libs/libmythtv/streamhandler.cpp
+index 2b0a7b6..fbe9399 100644
+--- a/mythtv/libs/libmythtv/streamhandler.cpp
++++ b/mythtv/libs/libmythtv/streamhandler.cpp
+@@ -26,9 +26,15 @@ StreamHandler::StreamHandler(const QString &device) :
+
+ StreamHandler::~StreamHandler()
+ {
+- if (!_stream_data_list.empty())
++ QMutexLocker locker(&_add_rm_lock);
++
+ {
+- LOG(VB_GENERAL, LOG_ERR, LOC + "dtor & _stream_data_list not empty");
++ QMutexLocker locker2(&_listener_lock);
++ if (!_stream_data_list.empty())
++ {
++ LOG(VB_GENERAL, LOG_ERR, LOC +
++ "dtor & _stream_data_list not empty");
++ }
+ }
+
+ // This should never be triggered.. just to be safe..
+@@ -41,6 +47,8 @@ void StreamHandler::AddListener(MPEGStreamData *data,
+ bool needs_buffering,
+ QString output_file)
+ {
++ QMutexLocker locker(&_add_rm_lock);
++
+ LOG(VB_RECORD, LOG_INFO, LOC + QString("AddListener(0x%1) -- begin")
+ .arg((uint64_t)data,0,16));
+ if (!data)
+@@ -93,6 +101,8 @@ void StreamHandler::AddListener(MPEGStreamData *data,
+
+ void StreamHandler::RemoveListener(MPEGStreamData *data)
+ {
++ QMutexLocker locker(&_add_rm_lock);
++
+ LOG(VB_RECORD, LOG_INFO, LOC + QString("RemoveListener(0x%1) -- begin")
+ .arg((uint64_t)data,0,16));
+ if (!data)
+@@ -158,12 +168,6 @@ void StreamHandler::Start(void)
+ while (!_running && !_error && _running_desired)
+ _running_state_changed.wait(&_start_stop_lock, 100);
+
+- if (!_running_desired)
+- {
+- LOG(VB_GENERAL, LOG_WARNING, LOC +
+- "Programmer Error: Stop called before Start finished");
+- }
+-
+ if (_error)
+ {
+ LOG(VB_GENERAL, LOG_WARNING, LOC + "Start failed");
+@@ -175,17 +179,9 @@ void StreamHandler::Stop(void)
+ {
+ QMutexLocker locker(&_start_stop_lock);
+
+- do
+- {
+- SetRunningDesired(false);
+- while (!_running_desired && _running)
+- _running_state_changed.wait(&_start_stop_lock, 100);
+- if (_running_desired)
+- {
+- LOG(VB_GENERAL, LOG_WARNING, LOC +
+- "Programmer Error: Start called before Stop finished");
+- }
+- } while (_running_desired);
++ SetRunningDesired(false);
++ while (_running)
++ _running_state_changed.wait(&_start_stop_lock, 100);
+
+ wait();
+ }
+diff --git a/mythtv/libs/libmythtv/streamhandler.h b/mythtv/libs/libmythtv/streamhandler.h
+index 1db0584..8f97cdb 100644
+--- a/mythtv/libs/libmythtv/streamhandler.h
++++ b/mythtv/libs/libmythtv/streamhandler.h
+@@ -45,7 +45,9 @@ class PIDInfo
+ typedef QMap<uint,PIDInfo*> PIDInfoMap;
+
+ // locking order
+-// _pid_lock -> _listener_lock -> _start_stop_lock
++// _pid_lock -> _listener_lock
++// _add_rm_lock -> _listener_lock
++// -> _start_stop_lock
+
+ class StreamHandler : protected MThread, public DeviceReaderCB
+ {
+@@ -101,6 +103,8 @@ class StreamHandler : protected MThread, public DeviceReaderCB
+ bool _needs_buffering;
+ bool _allow_section_reader;
+
++ QMutex _add_rm_lock;
++
+ mutable QMutex _start_stop_lock;
+ volatile bool _running_desired;
+ volatile bool _error;
+diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
+index 9ec70e9..43dc711 100644
+--- a/mythtv/libs/libmythtv/subtitlescreen.cpp
++++ b/mythtv/libs/libmythtv/subtitlescreen.cpp
+@@ -922,7 +922,8 @@ void FormattedTextSubtitle::InitFromCC608(vector<CC608Text*> &buffers,
+ CC708CharacterAttribute attr(isItalic, isBold, isUnderline,
+ clr[min(max(0, color), 7)],
+ useBackground);
+- FormattedTextChunk chunk(captionText, attr, parent);
++ FormattedTextChunk chunk(captionText, attr, parent,
++ cc->teletextmode);
+ line.chunks += chunk;
+ LOG(VB_VBI, LOG_INFO,
+ QString("Adding cc608 chunk (%1,%2): %3")
+@@ -1089,6 +1090,7 @@ bool FormattedTextChunk::Split(FormattedTextChunk &newChunk)
+ QString("Failed to split chunk '%1'").arg(text));
+ return false;
+ }
++ newChunk.isTeletext = isTeletext;
+ newChunk.parent = parent;
+ newChunk.format = format;
+ newChunk.text = text.mid(lastSpace + 1).trimmed() + ' ';
+@@ -1119,6 +1121,8 @@ QString FormattedTextChunk::ToLogString(void) const
+ .arg(format.boldface);
+ str += QString("font=%1 ").arg(format.font_tag);
+ str += QString(" text='%1'").arg(text);
++ if (isTeletext)
++ str += " DEPRECATED_608_TELETEXT";
+ return str;
+ }
+
+diff --git a/mythtv/libs/libmythtv/subtitlescreen.h b/mythtv/libs/libmythtv/subtitlescreen.h
+index 44b3f6a..8821dff 100644
+--- a/mythtv/libs/libmythtv/subtitlescreen.h
++++ b/mythtv/libs/libmythtv/subtitlescreen.h
+@@ -110,11 +110,11 @@ class FormattedTextChunk
+ {
+ public:
+ FormattedTextChunk(const QString &t, CC708CharacterAttribute formatting,
+- SubtitleScreen *p)
+- : text(t), format(formatting), parent(p)
++ SubtitleScreen *p, bool teletext = false)
++ : text(t), format(formatting), parent(p), isTeletext(teletext)
+ {
+ }
+- FormattedTextChunk(void) : parent(NULL) {}
++ FormattedTextChunk(void) : parent(NULL), isTeletext(false) {}
+
+ QSize CalcSize(float layoutSpacing = 0.0f) const
+ {
+@@ -130,6 +130,7 @@ class FormattedTextChunk
+ QString text;
+ CC708CharacterAttribute format;
+ SubtitleScreen *parent; // where fonts and sizes are kept
++ bool isTeletext;
+ };
+
+ class FormattedTextLine
+diff --git a/mythtv/programs/mythbackend/main_helpers.cpp b/mythtv/programs/mythbackend/main_helpers.cpp
+index 5017af4..28d5a4a 100644
+--- a/mythtv/programs/mythbackend/main_helpers.cpp
++++ b/mythtv/programs/mythbackend/main_helpers.cpp
+@@ -405,7 +405,7 @@ int handle_command(const MythBackendCommandLineParser &cmdline)
+ return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_CONNECT_ERROR;
+ }
+
+- if (!cmdline.toBool("printexpire"))
++ if (cmdline.toBool("printexpire"))
+ {
+ expirer = new AutoExpire();
+ expirer->PrintExpireList(cmdline.toString("printexpire"));
+diff --git a/mythtv/themes/defaultmenu/mainmenu.xml b/mythtv/themes/defaultmenu/mainmenu.xml
+index 1c72a92..b747575 100644
+--- a/mythtv/themes/defaultmenu/mainmenu.xml
++++ b/mythtv/themes/defaultmenu/mainmenu.xml
+@@ -41,6 +41,7 @@
+ <text>Setup</text>
+ <description>Configure MythTV and plugins</description>
+ <action>MENU main_settings.xml</action>
++ <password>SetupPinCode</password>
+ </button>
+
+ </mythmenu>
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-18/mythtv.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mythtv.spec 22 Jul 2012 18:42:46 -0000 1.102
+++ mythtv.spec 28 Aug 2012 18:14:44 -0000 1.103
@@ -60,7 +60,7 @@
# Git revision and branch ID
# 0.25 release: git tag v0.25.1
-%define _gitrev v0.25.2-4-ged58b3a
+%define _gitrev v0.25.2-15-g46cab93
%define branch fixes/0.25
# Mythtv and plugins from github.com
@@ -81,7 +81,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1293,7 +1293,7 @@
%{_datadir}/pixmaps/myth*.png
%{_datadir}/mythtv/metadata/
# Myth Video is now Video Gallery
-%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
+%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
%files base-themes
%{_datadir}/mythtv/themes/
@@ -1365,7 +1365,7 @@
%doc mythplugins/mythgallery/README
%{_libdir}/mythtv/plugins/libmythgallery.so
%{_datadir}/mythtv/i18n/mythgallery_*.qm
-%attr(-,mythtv,mythtv) %{_localstatedir}/lib/pictures
+%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/pictures
%endif
%if %{with_mythgame}
@@ -1387,7 +1387,7 @@
%doc mythplugins/mythmusic/COPYING
%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
-%{_localstatedir}/lib/mythmusic
+%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic
%{_datadir}/mythtv/musicmenu.xml
%{_datadir}/mythtv/music_settings.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
@@ -1441,10 +1441,14 @@
%changelog
+* Sat Aug 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-2
+- Update to latest fixes/0.25.
+- Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).
+
* Mon Jul 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Patch HLS for adapative x264 profile.
- Make sure mythbackend starts after time has synced.
-- Update to latest fixies/0.25.
+- Update to latest fixes/0.25.
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Patch for PHP 5.4 warnings.
11 years, 8 months
rpms/dvdstyler/F-18 .cvsignore, 1.10, 1.11 dvdstyler.spec, 1.20, 1.21 sources, 1.11, 1.12
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5766
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* Sun Aug 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-1
- Update upstream release
* Tue Aug 07 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-0.1.rc1
- Update upstream release
- Drop patch2 and patch3, seems that was applied in upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 28 Sep 2011 22:39:16 -0000 1.10
+++ .cvsignore 28 Aug 2012 16:09:05 -0000 1.11
@@ -1 +1 @@
-DVDStyler-2.0rc1.tar.bz2
+DVDStyler-2.3.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/dvdstyler.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dvdstyler.spec 11 Jul 2012 20:52:12 -0000 1.20
+++ dvdstyler.spec 28 Aug 2012 16:09:05 -0000 1.21
@@ -1,19 +1,15 @@
Name: dvdstyler
Epoch: 1
-Version: 2.0
-Release: 0.5.rc1%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.dvdstyler.de/
-Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}rc1.tar.bz2
+Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-make-desktopfile-valid.patch
Patch1: dvdstyler-wxVillaLib-libjpeg.patch
-# Based on http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/dvdstyler/files/pa...
-# Fixes 'directory not empty' error because of xmlto outputting a new .proc file
-Patch2: dvdstyler-docs-xmlto.patch
-Patch3: dvdstyler-ffmpeg54.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# build
BuildRequires: automake, autoconf
@@ -23,6 +19,7 @@
BuildRequires: wxGTK-devel >= 2.6.3
BuildRequires: wxsvg-devel >= 1.0.10
BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg
BuildRequires: libgnomeui-devel
# mpeg
BuildRequires: dvdauthor
@@ -44,7 +41,7 @@
Requires: mjpegtools
Requires: mkisofs
Requires: mpgtx
-Requires: wxsvg >= 1.0.10
+Requires: wxsvg >= 1.1.9
# note: do not add Require: totem-backend or another DVD player - see
# RPM Fusion bug 366 for more details
@@ -55,11 +52,9 @@
%prep
-%setup -q -n DVDStyler-%{version}rc1
+%setup -q -n DVDStyler-%{version}
%patch0 -b .validdesktop
%patch1 -b .libjpeg
-%patch2 -b .xmlto
-%patch3 -p1 -b .ffmpeg54
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -85,10 +80,6 @@
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
@@ -99,6 +90,13 @@
%{_mandir}/*/*.gz
%changelog
+* Sun Aug 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-1
+- Update upstream release
+
+* Tue Aug 07 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-0.1.rc1
+- Update upstream release
+- Drop patch2 and patch3, seems that was applied in upstream
+
* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0-0.5.rc1
- Switch to pkgconfig(libudev)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 28 Sep 2011 22:39:16 -0000 1.11
+++ sources 28 Aug 2012 16:09:05 -0000 1.12
@@ -1 +1 @@
-d6acd1a2c6ec591b794c632d532d5887 DVDStyler-2.0rc1.tar.bz2
+0f1b4e8e3e6acc24e73634160e727f20 DVDStyler-2.3.tar.bz2
11 years, 8 months
rpms/yle-dl/EL-6 yle-dl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Juha Tuomala
Author: tuju
Update of /cvs/free/rpms/yle-dl/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20635/EL-6
Modified Files:
.cvsignore sources
Added Files:
yle-dl.spec
Log Message:
Initial import.
--- NEW FILE yle-dl.spec ---
Name: yle-dl
Version: 2.0.1
Release: 3%{?dist}
License: GPLv2
Summary: Command-line tool to download videos from Finnish broadcasting company
Group: Applications/Multimedia
Url: http://users.tkk.fi/~aajanki/rtmpdump-yle/
Source0: http://users.tkk.fi/~aajanki/rtmpdump-yle/%{name}-%{version}.tar.gz
BuildRequires: openssl-devel, json-c-devel, python-devel
Requires: rtmpdump, python-crypto
BuildArch: noarch
%description
yle-dl is a command-line program for downloading media files
from the two video streaming services of the Finnish national
broadcasting company YLE: Yle Areena (http://areena.yle.fi/),
and Elävä Arkisto (http://www.yle.fi/elavaarkisto/).
It is an extension of RTMPDump (http://rtmpdump.mplayerhq.hu/),
which is based on XBMC RTMP code used in RTMPDumper by team
boxee.
%prep
%setup -q -n %{name}-%{version}
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_docdir}
mkdir -p %{buildroot}/%{_datadir}/%{name}
make DESTDIR=%{buildroot} prefix=%{_usr} install
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc ChangeLog COPYING README README.fi
%{_bindir}/yle-dl
%{_datadir}/%{name}
%changelog
* Sun Aug 08 2012 Juha Tuomala <tuju(a)iki.fi> 2.0.1-3
- Minor pkg cleanups.
* Sun Aug 08 2012 Juha Tuomala <tuju(a)iki.fi> 2.0.1-2
- update to 2.0.1
* Sat Jun 4 2011 Juha Tuomala <tuju(a)iki.fi> 1.4.2-1
- Initial RPM creation.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/yle-dl/EL-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Aug 2012 19:02:03 -0000 1.1
+++ .cvsignore 28 Aug 2012 11:44:35 -0000 1.2
@@ -0,0 +1 @@
+yle-dl-2.0.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/yle-dl/EL-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Aug 2012 19:02:04 -0000 1.1
+++ sources 28 Aug 2012 11:44:35 -0000 1.2
@@ -0,0 +1 @@
+40a009684699a32e0515aaf1745a96a7 yle-dl-2.0.1.tar.gz
11 years, 8 months
rpms/thunderbird-enigmail/F-16 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 thunderbird-enigmail.spec, 1.26, 1.27 crashreporter-remove-static.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6050
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Removed Files:
crashreporter-remove-static.patch
Log Message:
Enigmail 1.4.4 for Thunderbird 15.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Jul 2012 17:18:29 -0000 1.20
+++ .cvsignore 28 Aug 2012 07:57:18 -0000 1.21
@@ -1,2 +1,2 @@
-enigmail-1.4.3.tar.gz
-thunderbird-14.0.source.tar.bz2
+enigmail-1.4.4.tar.gz
+thunderbird-15.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 21 Jul 2012 17:18:29 -0000 1.21
+++ sources 28 Aug 2012 07:57:18 -0000 1.22
@@ -1,2 +1,2 @@
-4a253db11436a32ef81d5917c4ee6e25 enigmail-1.4.3.tar.gz
-64dcfaa0aa47aa5fd8588090503fac9d thunderbird-14.0.source.tar.bz2
+1bc36b5077f6b01b6acf0f75565dddc8 enigmail-1.4.4.tar.gz
+e41f88ca2fd0c9bc608aa2c145b3bc2c thunderbird-15.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- thunderbird-enigmail.spec 21 Jul 2012 17:18:29 -0000 1.26
+++ thunderbird-enigmail.spec 28 Aug 2012 07:57:18 -0000 1.27
@@ -16,8 +16,8 @@
%global libvpx_version 1.0.0
%global _default_patch_fuzz 2
-%global thunver 14.0
-%global thunmax 15.0
+%global thunver 15.0
+%global thunmax 16.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -35,11 +35,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4.3
+Version: 1.4.4
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -63,7 +63,6 @@
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
-Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
@@ -144,7 +143,6 @@
%patch0 -p2 -b .dir
# Mozilla (XULRunner) patches
cd mozilla
-%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
%patch104 -p1 -b .gcc47
cd ..
@@ -202,7 +200,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
+# sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -278,6 +276,12 @@
#===============================================================================
%changelog
+* Mon Aug 27 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-2
+- Enigmail 1.4.4 for Thunderbird 15.0
+
+* Wed Aug 21 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-1
+- Enigmail 1.4.4 for Thunderbird 14.0
+
* Sat Jul 21 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.3-1
- Enigmail 1.4.3 for Thunderbird 14.0
--- crashreporter-remove-static.patch DELETED ---
11 years, 8 months
rpms/thunderbird-enigmail/F-17 .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 thunderbird-enigmail.spec, 1.22, 1.23 crashreporter-remove-static.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31768
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Removed Files:
crashreporter-remove-static.patch
Log Message:
Enigmail 1.4.4 for Thunderbird 15.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 21 Jul 2012 17:08:45 -0000 1.19
+++ .cvsignore 28 Aug 2012 06:20:10 -0000 1.20
@@ -1,2 +1,2 @@
-enigmail-1.4.3.tar.gz
-thunderbird-14.0.source.tar.bz2
+enigmail-1.4.4.tar.gz
+thunderbird-15.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Jul 2012 17:08:45 -0000 1.20
+++ sources 28 Aug 2012 06:20:10 -0000 1.21
@@ -1,2 +1,2 @@
-4a253db11436a32ef81d5917c4ee6e25 enigmail-1.4.3.tar.gz
-64dcfaa0aa47aa5fd8588090503fac9d thunderbird-14.0.source.tar.bz2
+1bc36b5077f6b01b6acf0f75565dddc8 enigmail-1.4.4.tar.gz
+e41f88ca2fd0c9bc608aa2c145b3bc2c thunderbird-15.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/thunderbird-enigmail.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- thunderbird-enigmail.spec 21 Jul 2012 17:08:45 -0000 1.22
+++ thunderbird-enigmail.spec 28 Aug 2012 06:20:10 -0000 1.23
@@ -16,8 +16,8 @@
%global libvpx_version 1.0.0
%global _default_patch_fuzz 2
-%global thunver 14.0
-%global thunmax 15.0
+%global thunver 15.0
+%global thunmax 16.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -35,11 +35,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4.3
+Version: 1.4.4
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -63,7 +63,6 @@
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
-Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
@@ -144,7 +143,6 @@
%patch0 -p2 -b .dir
# Mozilla (XULRunner) patches
cd mozilla
-%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
%patch104 -p1 -b .gcc47
cd ..
@@ -202,7 +200,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
+# sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -278,6 +276,12 @@
#===============================================================================
%changelog
+* Mon Aug 27 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-2
+- Enigmail 1.4.4 for Thunderbird 15.0
+
+* Wed Aug 21 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-1
+- Enigmail 1.4.4 for Thunderbird 14.0
+
* Sat Jul 21 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.3-1
- Enigmail 1.4.3 for Thunderbird 14.0
--- crashreporter-remove-static.patch DELETED ---
11 years, 8 months
rpms/thunderbird-enigmail/F-18 .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 thunderbird-enigmail.spec, 1.25, 1.26 crashreporter-remove-static.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24871
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Removed Files:
crashreporter-remove-static.patch
Log Message:
Enigmail 1.4.4 for Thunderbird 15.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 21 Jul 2012 17:17:28 -0000 1.19
+++ .cvsignore 27 Aug 2012 18:13:07 -0000 1.20
@@ -1,2 +1,2 @@
-enigmail-1.4.3.tar.gz
-thunderbird-14.0.source.tar.bz2
+enigmail-1.4.4.tar.gz
+thunderbird-15.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Jul 2012 17:17:28 -0000 1.20
+++ sources 27 Aug 2012 18:13:08 -0000 1.21
@@ -1,2 +1,2 @@
-4a253db11436a32ef81d5917c4ee6e25 enigmail-1.4.3.tar.gz
-64dcfaa0aa47aa5fd8588090503fac9d thunderbird-14.0.source.tar.bz2
+1bc36b5077f6b01b6acf0f75565dddc8 enigmail-1.4.4.tar.gz
+e41f88ca2fd0c9bc608aa2c145b3bc2c thunderbird-15.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/thunderbird-enigmail.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- thunderbird-enigmail.spec 21 Jul 2012 17:17:28 -0000 1.25
+++ thunderbird-enigmail.spec 27 Aug 2012 18:13:08 -0000 1.26
@@ -16,8 +16,8 @@
%global libvpx_version 1.0.0
%global _default_patch_fuzz 2
-%global thunver 14.0
-%global thunmax 15.0
+%global thunver 15.0
+%global thunmax 16.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -35,11 +35,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4.3
+Version: 1.4.4
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -63,7 +63,6 @@
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
-Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
@@ -144,7 +143,6 @@
%patch0 -p2 -b .dir
# Mozilla (XULRunner) patches
cd mozilla
-%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
%patch104 -p1 -b .gcc47
cd ..
@@ -202,7 +200,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
+# sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -278,6 +276,12 @@
#===============================================================================
%changelog
+* Mon Aug 27 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-2
+- Enigmail 1.4.4 for Thunderbird 15.0
+
+* Wed Aug 21 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-1
+- Enigmail 1.4.4 for Thunderbird 14.0
+
* Sat Jul 21 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.3-1
- Enigmail 1.4.3 for Thunderbird 14.0
--- crashreporter-remove-static.patch DELETED ---
11 years, 8 months
rpms/thunderbird-enigmail/devel .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 thunderbird-enigmail.spec, 1.26, 1.27 crashreporter-remove-static.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24461
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Removed Files:
crashreporter-remove-static.patch
Log Message:
Enigmail 1.4.4 for Thunderbird 15.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 22 Aug 2012 07:24:10 -0000 1.20
+++ .cvsignore 27 Aug 2012 18:09:46 -0000 1.21
@@ -1,2 +1,2 @@
enigmail-1.4.4.tar.gz
-thunderbird-14.0.source.tar.bz2
+thunderbird-15.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 22 Aug 2012 07:24:11 -0000 1.21
+++ sources 27 Aug 2012 18:09:46 -0000 1.22
@@ -1,2 +1,2 @@
1bc36b5077f6b01b6acf0f75565dddc8 enigmail-1.4.4.tar.gz
-64dcfaa0aa47aa5fd8588090503fac9d thunderbird-14.0.source.tar.bz2
+e41f88ca2fd0c9bc608aa2c145b3bc2c thunderbird-15.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- thunderbird-enigmail.spec 22 Aug 2012 07:24:11 -0000 1.26
+++ thunderbird-enigmail.spec 27 Aug 2012 18:09:46 -0000 1.27
@@ -16,8 +16,8 @@
%global libvpx_version 1.0.0
%global _default_patch_fuzz 2
-%global thunver 14.0
-%global thunmax 15.0
+%global thunver 15.0
+%global thunmax 16.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -39,7 +39,7 @@
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -63,7 +63,6 @@
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
-Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
@@ -144,7 +143,6 @@
%patch0 -p2 -b .dir
# Mozilla (XULRunner) patches
cd mozilla
-%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
%patch104 -p1 -b .gcc47
cd ..
@@ -278,6 +276,9 @@
#===============================================================================
%changelog
+* Mon Aug 27 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-2
+- Enigmail 1.4.4 for Thunderbird 15.0
+
* Wed Aug 21 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-1
- Enigmail 1.4.4 for Thunderbird 14.0
--- crashreporter-remove-static.patch DELETED ---
11 years, 8 months
rpms/audacity-freeworld/F-17 .cvsignore, 1.15, 1.16 audacity-freeworld.spec, 1.27, 1.28 sources, 1.15, 1.16
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6098
Modified Files:
.cvsignore audacity-freeworld.spec sources
Log Message:
update to 2.0.2 final
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/audacity-freeworld.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- audacity-freeworld.spec 21 Aug 2012 13:11:03 -0000 1.27
+++ audacity-freeworld.spec 27 Aug 2012 12:36:58 -0000 1.28
@@ -4,7 +4,7 @@
Name: audacity-freeworld
Version: 2.0.2
-Release: 0.2.rc4%{?dist}
+Release: 1%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -15,7 +15,7 @@
# use for upstream source releases:
#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-...
-Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}rc4.tar.bz2
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2
%define tartopdir audacity-src-%{version}
Patch1: audacity-2.0.1-libmp3lame-default.patch
@@ -156,6 +156,9 @@
%changelog
+* Mon Aug 27 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-1
+- update to 2.0.2 final
+
* Tue Aug 21 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-0.3.rc4
- update to 2.0.2 release candidate 4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 21 Aug 2012 13:11:03 -0000 1.15
+++ sources 27 Aug 2012 12:36:58 -0000 1.16
@@ -1 +1 @@
-c838bc4485b0af104a7f6d9c6955a284 audacity-minsrc-2.0.2rc4.tar.bz2
+c838bc4485b0af104a7f6d9c6955a284 audacity-minsrc-2.0.2.tar.bz2
11 years, 8 months
rpms/audacity-freeworld/F-16 .cvsignore, 1.15, 1.16 audacity-freeworld.spec, 1.25, 1.26 sources, 1.15, 1.16
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5534
Modified Files:
.cvsignore audacity-freeworld.spec sources
Log Message:
update to 2.0.2 final
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-16/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 21 Aug 2012 13:17:45 -0000 1.15
+++ .cvsignore 27 Aug 2012 12:31:27 -0000 1.16
@@ -1 +1 @@
-audacity-minsrc-2.0.2rc4.tar.bz2
+audacity-minsrc-2.0.2.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-16/audacity-freeworld.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- audacity-freeworld.spec 21 Aug 2012 13:19:37 -0000 1.25
+++ audacity-freeworld.spec 27 Aug 2012 12:31:27 -0000 1.26
@@ -4,7 +4,7 @@
Name: audacity-freeworld
Version: 2.0.2
-Release: 0.2.rc4%{?dist}
+Release: 1%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -15,7 +15,7 @@
# use for upstream source releases:
#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-...
-Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}rc4.tar.bz2
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2
%define tartopdir audacity-src-%{version}
Patch1: audacity-2.0.1-libmp3lame-default.patch
@@ -156,6 +156,9 @@
%changelog
+* Mon Aug 27 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-1
+- update to 2.0.2 final
+
* Tue Aug 21 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-0.3.rc4
- update to 2.0.2 release candidate 4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-16/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 21 Aug 2012 13:17:45 -0000 1.15
+++ sources 27 Aug 2012 12:31:27 -0000 1.16
@@ -1 +1 @@
-c838bc4485b0af104a7f6d9c6955a284 audacity-minsrc-2.0.2rc4.tar.bz2
+c838bc4485b0af104a7f6d9c6955a284 audacity-minsrc-2.0.2.tar.bz2
11 years, 8 months