[rtmpdump/el7: 9/9] Merge branch 'master' into el7
by Orion Poplawski
commit 46035d61c3601a61b2a17ab686a1fb5498aee772
Merge: a33a0d5 acc2433
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue Aug 23 12:04:11 2016 -0600
Merge branch 'master' into el7
Conflicts:
rtmpdump.spec
sources
.gitignore | 3 ++-
rtmpdump.spec | 42 +++++++++++++++++++++++++++++++++---------
sources | 2 +-
3 files changed, 36 insertions(+), 11 deletions(-)
---
8 years, 3 months
[rtmpdump/el7] (9 commits) ...Merge branch 'master' into el7
by Orion Poplawski
Summary of changes:
c797e68... * Sun Jan 5 2014 Susi Lehtola <jussilehtola(a)fedoraproject.o (*)
f707876... Didn't notice additional BuildRequire. (*)
c455557... Bump (*)
e6aa661... Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mas (*)
3b7b8d0... * Fri Sep 25 2015 Sérgio Basto <sergio(a)serjux.com> - 2.4-4 (*)
23c8db1... * Fri Nov 27 2015 Susi Lehtola <jussilehtola@fedoraproject. (*)
f5c1911... Update last git version (as usual) (*)
acc2433... Force the exact EVR (*)
46035d6... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
8 years, 3 months
[openshot/f25] Install locale files.
by Richard Shaw
Summary of changes:
9442c10... Install locale files. (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 3 months
[mpg123] Conditionalize Recommends/Enhances
by Orion Poplawski
commit 767d92afbfa5ab77475166c7455643166d123c26
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue Aug 23 11:17:13 2016 -0600
Conditionalize Recommends/Enhances
mpg123.spec | 8 ++++++++
1 file changed, 8 insertions(+)
---
diff --git a/mpg123.spec b/mpg123.spec
index 556e5b1..4da1a86 100644
--- a/mpg123.spec
+++ b/mpg123.spec
@@ -20,9 +20,11 @@ BuildRequires: pkgconfig(alsa)
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Recommends: (%{name}-plugins-pulseaudio%{?_isa} if pulseaudio%{?_isa})
Recommends: (%{name}-plugins-jack%{?_isa} if jack-audio-connection-kit%{?_isa})
Recommends: (%{name}-plugins-portaudio%{?_isa} if portaudio%{?_isa})
+%endif
%global _description \
Real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (most\
@@ -35,7 +37,9 @@ libraries.
Summary: Plulseaudio output plug-in for %{name}
BuildRequires: pkgconfig(libpulse-simple)
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Enhances: %{name}%{?_isa}
+%endif
%description plugins-pulseaudio %{_description}
@@ -45,7 +49,9 @@ Pulseaudio output plug-in.
Summary: JACK output plug-in for %{name}
BuildRequires: pkgconfig(jack)
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Enhances: %{name}%{?_isa}
+%endif
Obsoletes: %{name}-plugins-extras < 1.23.4-1
%description plugins-jack %{_description}
@@ -56,7 +62,9 @@ JACK output plug-in.
Summary: PortAudio output plug-in for %{name}
BuildRequires: pkgconfig(portaudio-2.0)
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Enhances: %{name}%{?_isa}
+%endif
%description plugins-portaudio %{_description}
8 years, 3 months
[mpg123/el7: 15/15] Conditionalize Recommends/Enhances
by Orion Poplawski
commit 3a3d01da9287c2ee29fe9df92cacd2f6cd069f4f
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue Aug 23 11:17:13 2016 -0600
Conditionalize Recommends/Enhances
mpg123.spec | 8 ++++++++
1 file changed, 8 insertions(+)
---
diff --git a/mpg123.spec b/mpg123.spec
index 556e5b1..4da1a86 100644
--- a/mpg123.spec
+++ b/mpg123.spec
@@ -20,9 +20,11 @@ BuildRequires: pkgconfig(alsa)
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Recommends: (%{name}-plugins-pulseaudio%{?_isa} if pulseaudio%{?_isa})
Recommends: (%{name}-plugins-jack%{?_isa} if jack-audio-connection-kit%{?_isa})
Recommends: (%{name}-plugins-portaudio%{?_isa} if portaudio%{?_isa})
+%endif
%global _description \
Real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (most\
@@ -35,7 +37,9 @@ libraries.
Summary: Plulseaudio output plug-in for %{name}
BuildRequires: pkgconfig(libpulse-simple)
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Enhances: %{name}%{?_isa}
+%endif
%description plugins-pulseaudio %{_description}
@@ -45,7 +49,9 @@ Pulseaudio output plug-in.
Summary: JACK output plug-in for %{name}
BuildRequires: pkgconfig(jack)
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Enhances: %{name}%{?_isa}
+%endif
Obsoletes: %{name}-plugins-extras < 1.23.4-1
%description plugins-jack %{_description}
@@ -56,7 +62,9 @@ JACK output plug-in.
Summary: PortAudio output plug-in for %{name}
BuildRequires: pkgconfig(portaudio-2.0)
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Enhances: %{name}%{?_isa}
+%endif
%description plugins-portaudio %{_description}
8 years, 3 months
[mpg123/el7: 14/15] Merge branch 'master' into el7
by Orion Poplawski
commit 5f0605dc99dc6afb87b66d2fee97d6c8634909c1
Merge: 365c3ec 7016149
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue Aug 23 11:12:49 2016 -0600
Merge branch 'master' into el7
Conflicts:
.gitignore
mpg123.spec
sources
.gitignore | 4 +-
mpg123-1.19.0-armv7hl.patch | 12 --
mpg123.spec | 259 ++++++++++++++++++++++----------------------
sources | 2 +-
4 files changed, 131 insertions(+), 146 deletions(-)
---
8 years, 3 months
[mpg123/el7] (15 commits) ...Conditionalize Recommends/Enhances
by Orion Poplawski
Summary of changes:
53bf649... * Sat Mar 01 2014 Michael Kuhn <suraia(a)ikkoku.de> - 1.18.1- (*)
6b64f2e... * Sat Mar 01 2014 Michael Kuhn <suraia(a)ikkoku.de> - 1.18.1- (*)
544c934... * Sun Apr 6 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - (*)
0f675f0... Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mas (*)
dc8b67b... * Sun Jun 21 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - (*)
d3600d8... * Mon Jun 22 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - (*)
7dd2367... * Sat Oct 31 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - (*)
2c1d777... Update to 1.23.4; fixes in packaging (*)
6932f43... Update to 1.23.6 (*)
1578071... Update to 1.23.6 (*)
90e7d7e... make Obsoletes non-%?_isa (*)
ff48f6d... enable portaudio (*)
7016149... Provide old name for libs and libs-devel subpkgs (*)
5f0605d... Merge branch 'master' into el7
3a3d01d... Conditionalize Recommends/Enhances
(*) This commit already existed in another branch; no separate mail sent
8 years, 3 months
[ffmpeg/el6] Update to 0.10.16
by nchauvet
commit dcd326b9e57fad8f1376f03d4eb263ffc20c2be1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Aug 23 19:14:46 2016 +0200
Update to 0.10.16
.gitignore | 1 +
ffmpeg.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7e9e278..ec478c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ffmpeg-0.10.15.tar.bz2
+/ffmpeg-0.10.16.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 51394d4..1682a7b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -12,7 +12,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.10.15
+Version: 0.10.16
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -282,6 +282,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 23 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.16-1
+- Update to 0.10.16
+
* Wed Aug 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.15-1
- Update to 0.10.15
diff --git a/sources b/sources
index 7d14a50..5746705 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-884c3be830b0b775dbfbcb337e9ecd74 ffmpeg-0.10.15.tar.bz2
+b73d7b94b3bead6918ad5a3d47453c8b ffmpeg-0.10.16.tar.bz2
8 years, 3 months
