[normalize] Revert mpg123 and use libmad
by Leigh Scott
commit e341f3a98b51b394f8612212f8d122d8011b4ced
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 24 00:03:57 2020 +0100
Revert mpg123 and use libmad
normalize.spec | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/normalize.spec b/normalize.spec
index 7f70983..88c3e06 100644
--- a/normalize.spec
+++ b/normalize.spec
@@ -3,7 +3,7 @@
Summary: Tool for adjusting the volume of audio files to a standard level
Name: normalize
Version: 0.7.7
-Release: 21%{?dist}
+Release: 22%{?dist}
URL: http://normalize.nongnu.org/
License: GPLv2+
Source: http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.bz2
@@ -15,12 +15,13 @@ BuildRequires: audiofile-devel >= 1:0.2.1-2
BuildRequires: gettext
BuildRequires: gcc
BuildRequires: libtool perl(Carp)
+BuildRequires: libmad-devel
# For dependency generation
BuildRequires: perl-generators
# Binaries from the following are required.
-BuildRequires: lame vorbis-tools flac mpg123
+BuildRequires: lame vorbis-tools flac
# Explicit, because won't be detected automatically.
-Requires: lame vorbis-tools flac mpg123
+Requires: lame vorbis-tools flac
%description
normalize is a tool for adjusting the volume of audio files to a
@@ -40,9 +41,7 @@ Plugin for XMMS to honour relative volume adjustment (RVA2) ID3 tag frames.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
touch AUTHORS ChangeLog
autoreconf -fi
for i in THANKS doc/normalize-mp3.1; do
@@ -78,6 +77,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/xmms/Effect/librva.la
%changelog
+* Sun Aug 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.7.7-22
+- Revert mpg123 and use libmad
+
* Sun Aug 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.7.7-21
- Add mpg123
- Clean up spec file
4 years, 3 months
[zoneminder/el7: 3/3] Merge branch 'master' into el7
by Andrew Bauer
commit 136f78c793d4a55acc8f7c497373c6e6f33549fb
Merge: c5be34d 02581e4
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Aug 23 11:54:37 2020 -0500
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 19 ++++++++++++++++---
3 files changed, 18 insertions(+), 4 deletions(-)
---
4 years, 3 months
[zoneminder] 1.34.20 Release Buildrequire epel-rpm-macros on rhel Update license references for js libraries
by Andrew Bauer
commit 02581e4fae7546426f92c7f1fa72c1fb07522688
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Aug 23 11:53:13 2020 -0500
1.34.20 Release
Buildrequire epel-rpm-macros on rhel
Update license references for js libraries
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 14 ++++++++++++--
3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b4af51..b4e137e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/zoneminder-1.34.16.tar.gz
/zoneminder-1.34.17.tar.gz
/zoneminder-1.34.18.tar.gz
+/zoneminder-1.34.20.tar.gz
diff --git a/sources b/sources
index cde0cae..8a11dca 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (cakephp-enum-behavior-1.0-zm.tar.gz) = 26b4fa4e4b53b6add69df506d68cee06c7c153ddb6facb76ff1156c5f558b9a7704e99b54361771195092ae7ab4f493c24135fa5a3f59fae84b6dc33ff3e0bd1
SHA512 (crud-3.1.0-zm.tar.gz) = 03b641454ad070a729e45f592c6c01bf2c80c53f00e085eb48380ba96e88d8c1410b2a0c58607f85d6536375d789b022b9e6b7de5bda8886ec17c3bdb07a68fc
-SHA512 (zoneminder-1.34.18.tar.gz) = 2513a9e811557c8bac738dc8118d1274532ab27a90013f3ad6d87013670e52f7d56c3f8bc477dfe24a83c31f4ca7fceeab340e9872a76efa77b1f826504450a3
+SHA512 (zoneminder-1.34.20.tar.gz) = 98f659d943ad9542eb06f56c2c154a4f48bacd942d513fe1c108bf7f8249c6ac03a516b30610d89b570d86907e1597e58c7d136987b938c93d425cc85a79ca2b
diff --git a/zoneminder.spec b/zoneminder.spec
index 778a93f..1d532e8 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -28,14 +28,18 @@
%global _hardened_build 1
Name: zoneminder
-Version: 1.34.18
+Version: 1.34.20
Release: 2%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
-# Mootools is inder the MIT license: http://mootools.net/
+# Mootools is under the MIT license: http://mootools.net/
+# jQuery is under the MIT license: https://jquery.org/license/
# CakePHP is under the MIT license: https://github.com/cakephp/cakephp
# Crud is under the MIT license: https://github.com/FriendsOfCake/crud
# CakePHP-Enum-Behavior is under the MIT license: https://github.com/asper/CakePHP-Enum-Behavior
+# Bootstrap is under the MIT license: https://getbootstrap.com/docs/4.5/about/license/
+# Bootstrap-table is under the MIT license: https://bootstrap-table.com/docs/about/license/
+# font-awesome is under CC-BY license: https://fontawesome.com/license/free
License: GPLv2+ and LGPLv2+ and MIT
URL: http://www.zoneminder.com/
@@ -43,6 +47,7 @@ Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zon
Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-...
Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version...
+%{?rhel:BuildRequires: epel-rpm-macros}
BuildRequires: systemd-devel
BuildRequires: mariadb-devel
BuildRequires: perl-podlators
@@ -420,6 +425,11 @@ EOF
%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
%changelog
+* Sun Aug 23 2020 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.20-1
+- 1.34.20 Release
+- Buildrequire epel-rpm-macros on rhel
+- Update license references for js libraries
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.34.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
4 years, 3 months
[deepin-movie] Improve compatibility with new CMake macro
by Leigh Scott
commit 17d41828522bd331db5d867de063c020039a5440
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 23 15:58:22 2020 +0100
Improve compatibility with new CMake macro
deepin-movie.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/deepin-movie.spec b/deepin-movie.spec
index f908feb..8f4df82 100644
--- a/deepin-movie.spec
+++ b/deepin-movie.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
Name: deepin-movie
Version: 3.2.24.3
Release: 4%{?dist}
@@ -54,11 +56,11 @@ Header files and libraries for %{name}.
sed -i '/dtk2/s|lib|libexec|' src/CMakeLists.txt
%build
-%cmake -DCMAKE_BUILD_TYPE=Release
-%make_build
+%cmake3 -DCMAKE_BUILD_TYPE=Release
+%cmake3_build
%install
-%make_install
+%cmake3_install
install -Dm644 %SOURCE1 %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
4 years, 3 months