summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-03-24 19:54:23 +0000
committerB. Stack <bgstack15@gmail.com>2022-03-24 19:54:23 +0000
commitd2efb457619abec5b4c5f732403fcb6a2c553d32 (patch)
treed927e4aa4bf22cc04731b16f19da2e6637b9267b
parentfix LICENSE for el7 (diff)
parentmakemkv: conform to negativo17 better (diff)
downloadstackrpms-d2efb457619abec5b4c5f732403fcb6a2c553d32.tar.gz
stackrpms-d2efb457619abec5b4c5f732403fcb6a2c553d32.tar.bz2
stackrpms-d2efb457619abec5b4c5f732403fcb6a2c553d32.zip
Merge branch 'makemkv-bump' into 'master'
makemkv: conform to negativo17 better See merge request bgstack15/stackrpms!287
-rw-r--r--makemkv/makemkv.spec78
-rw-r--r--makemkv/stackrpms-makemkv.spec.diff53
2 files changed, 89 insertions, 42 deletions
diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec
index e42ee38..3ea0968 100644
--- a/makemkv/makemkv.spec
+++ b/makemkv/makemkv.spec
@@ -10,20 +10,23 @@
# on x86_64.
%global _missing_build_ids_terminate_build 0
+# stackrpms, 2 disable debug package
%define debug_package %{nil}
Summary: DVD and Blu-ray to MKV converter and network streamer
Name: makemkv
-Version: 1.16.5
+Version: 1.16.7
Release: 10%{?dist}
License: GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+
URL: http://www.%{name}.com/
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 aarch64 armv7hl
+# stackrpms,3 because copr likes https
Source0: https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz
Source1: https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz
Source2: changelog.txt
Source3: %{name}.appdata.xml
+# stackrpms,4 https and my value add
Source4: https://www.%{name}.com/developers/usage.txt#/%{name}con.txt
Source5: %{name}-wrapper
Source6: settings.conf.example
@@ -45,15 +48,20 @@ BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: zlib-devel
-Requires: ccextractor
+%if 0%{?rhel} == 7
+BuildRequires: devtoolset-8-gcc-c++
+%else
+BuildRequires: gcc-c++
+%endif
+
Requires: hicolor-icon-theme
# This makes sure you can open AACS and BD+ encrypted BluRays transparently.
# See below in the install section.
-Provides: libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release}
-Provides: libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release}
-Obsoletes: libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release}
-Obsoletes: libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release}
+Provides: libaacs%{?_isa} = %{version}-%{release}
+Provides: libbdplus%{?_isa} = %{version}-%{release}
+Obsoletes: libaacs < %{version}-%{release}
+Obsoletes: libbdplus < %{version}-%{release}
%description
MakeMKV is your one-click solution to convert video that you own into free and
@@ -70,9 +78,14 @@ your favorite player on your favorite OS or on your favorite device.
%prep
%setup -q -T -c -n %{name}-%{version} -a 0 -a 1
cp %{SOURCE2} %{SOURCE4} .
+# stackrpms,2 my value add
cp %{SOURCE5} %{SOURCE6} .
%build
+%if 0%{?rhel} == 7
+. /opt/rh/devtoolset-8/enable
+%endif
+
# Accept eula
mkdir -p %{name}-bin-%{version}/tmp
echo "accepted" > %{name}-bin-%{version}/tmp/eula_accepted
@@ -106,6 +119,7 @@ EOF
mkdir -p %{buildroot}%{_datadir}/appdata
install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/
%endif
+# stackrpms,2 install my script
%{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/
%check
@@ -136,12 +150,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%license %{name}-bin-%{version}/src/eula_en_linux.txt
%license %{name}-oss-%{version}/License.txt
+# stackrpms,2 add my conf file
%doc changelog.txt makemkvcon.txt settings.conf.example
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%{_bindir}/makemkv
%{_bindir}/makemkvcon
-%{_bindir}/sdftool
%{_bindir}/mmccextr
+%{_bindir}/sdftool
+# stackrpms,2 my script
%{_bindir}/%{name}-wrapper
%{_datadir}/MakeMKV
%if 0%{?fedora}
@@ -154,33 +170,43 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libmmbd.so.0
%changelog
-* Fri Nov 05 2021 B. Stack <bgstack15@gmail.com> - 1.16.5-10
-- Update
+* Fri Mar 11 2022 B. Stack <bgstack15@gmail.com> - 1.16.7-10
+- Add stackrpms customization
- Remove debug package
-* Thu Jul 08 2021 B. Stack <bgstack15@gmail.com> - 1.16.4-10
-- Update
+* Tue Mar 01 2022 Simone Caronni <negativo17@gmail.com> - 1.16.7-1
+- Update to 1.16.7.
+
+* Tue Nov 02 2021 Simone Caronni <negativo17@gmail.com> - 1.16.5-1
+- Update to 1.16.5.
+
+* Tue Jul 20 2021 Simone Caronni <negativo17@gmail.com> - 1.16.4-1
+- Update to 1.16.4.
+
+* Fri Mar 26 2021 Simone Caronni <negativo17@gmail.com> - 1.16.3-1
+- Update to 1.16.3.
+- Remove ccextractor dependency, mmccextr is a bundled stripped down version.
-* Thu Apr 01 2021 B. Stack <bgstack15@gmail.com> - 1.16.3-10
-- Update
+* Mon Mar 15 2021 Simone Caronni <negativo17@gmail.com> - 1.16.1-1
+- Update to 1.16.1.
-* Tue Dec 15 2020 B. Stack <bgstack15@gmail.com> - 1.15.4-10
-- Update
+* Thu Dec 17 2020 Simone Caronni <negativo17@gmail.com> - 1.15.4-1
+- Update to 1.15.4.
-* Mon Oct 05 2020 B. Stack <bgstack15@gmail.com> - 1.15.3-10
-- Update
+* Mon Oct 12 2020 Simone Caronni <negativo17@gmail.com> - 1.15.3-1
+- Update to 1.15.3.
-* Thu Jul 23 2020 B. Stack <bgstack15@gmail.com> - 1.15.2-10
-- Update
+* Mon Aug 17 2020 Simone Caronni <negativo17@gmail.com> - 1.15.2-1
+- Update to 1.15.2.
-* Thu Apr 16 2020 B. Stack <bgstack15@gmail.com> - 1.15.1-10
-- Update
+* Fri Apr 24 2020 Simone Caronni <negativo17@gmail.com> - 1.15.1-1
+- Update to 1.15.1.
-* Wed Dec 04 2019 B. Stack <bgstack15@gmail.com> - 1.14.7-10
-- Update
+* Sat Mar 07 2020 Simone Caronni <negativo17@gmail.com> - 1.15.0-1
+- Update to 1.15.0.
-* Mon Nov 11 2019 B. Stack <bgstack15@gmail.com> - 1.14.5-10
-- Add stackrpms customizations
+* Tue Dec 17 2019 Simone Caronni <negativo17@gmail.com> - 1.14.7-1
+- Update to 1.14.7.
* Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1
- Update to 1.14.5.
diff --git a/makemkv/stackrpms-makemkv.spec.diff b/makemkv/stackrpms-makemkv.spec.diff
index 528f652..32b791b 100644
--- a/makemkv/stackrpms-makemkv.spec.diff
+++ b/makemkv/stackrpms-makemkv.spec.diff
@@ -1,60 +1,81 @@
---- 1.14.5-1/makemkv.spec 2019-09-12 12:36:18.000000000 -0400
-+++ 1.14.5-10/makemkv.spec 2019-11-11 08:21:09.541158055 -0500
-@@ -14,7 +14,7 @@
+
+--- negativo17/makemkv/makemkv.spec 2022-03-11 09:09:19.698330344 -0500
++++ stackrpms/makemkv/makemkv.spec 2022-03-11 09:20:23.416023295 -0500
+@@ -10,20 +10,27 @@
+ # on x86_64.
+
+ %global _missing_build_ids_terminate_build 0
++# stackrpms, 2 disable debug package
++%define debug_package %{nil}
+
Summary: DVD and Blu-ray to MKV converter and network streamer
Name: makemkv
- Version: 1.14.5
+ Version: 1.16.7
-Release: 1%{?dist}
+Release: 10%{?dist}
License: GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+
URL: http://www.%{name}.com/
- ExclusiveArch: %{ix86} x86_64
-@@ -24,6 +24,9 @@
+ ExclusiveArch: %{ix86} x86_64 aarch64 armv7hl
+
+-Source0: http://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz
+-Source1: http://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz
++# stackrpms,3 because copr likes https
++Source0: https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz
++Source1: https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz
Source2: changelog.txt
Source3: %{name}.appdata.xml
- Source4: http://www.%{name}.com/developers/usage.txt#/%{name}con.txt
+-Source4: http://www.%{name}.com/developers/usage.txt#/%{name}con.txt
++# stackrpms,4 https and my value add
++Source4: https://www.%{name}.com/developers/usage.txt#/%{name}con.txt
+Source5: %{name}-wrapper
+Source6: settings.conf.example
+
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
-@@ -66,6 +69,7 @@
+@@ -71,6 +78,8 @@
%prep
%setup -q -T -c -n %{name}-%{version} -a 0 -a 1
cp %{SOURCE2} %{SOURCE4} .
++# stackrpms,2 my value add
+cp %{SOURCE5} %{SOURCE6} .
%build
- # Accept eula
-@@ -101,6 +105,7 @@
+ %if 0%{?rhel} == 7
+@@ -110,6 +119,8 @@
mkdir -p %{buildroot}%{_datadir}/appdata
install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/
%endif
++# stackrpms,2 install my script
+%{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/
%check
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-@@ -130,10 +135,11 @@
+@@ -139,12 +150,15 @@
%files
%license %{name}-bin-%{version}/src/eula_en_linux.txt
%license %{name}-oss-%{version}/License.txt
-%doc changelog.txt makemkvcon.txt
++# stackrpms,2 add my conf file
+%doc changelog.txt makemkvcon.txt settings.conf.example
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%{_bindir}/makemkv
%{_bindir}/makemkvcon
+ %{_bindir}/mmccextr
+ %{_bindir}/sdftool
++# stackrpms,2 my script
+%{_bindir}/%{name}-wrapper
%{_datadir}/MakeMKV
%if 0%{?fedora}
%{_datadir}/appdata/%{name}.appdata.xml
-@@ -145,6 +151,9 @@
+@@ -156,6 +170,10 @@
%{_libdir}/libmmbd.so.0
%changelog
-+* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.14.5-10
-+- Add stackrpms customizations
++* Fri Mar 11 2022 B. Stack <bgstack15@gmail.com> - 1.16.7-10
++- Add stackrpms customization
++- Remove debug package
+
- * Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1
- - Update to 1.14.5.
+ * Tue Mar 01 2022 Simone Caronni <negativo17@gmail.com> - 1.16.7-1
+ - Update to 1.16.7.
bgstack15