[xorg-x11-drv-nvidia] Move nvidia-uvm.conf and 60-nvidia-uvm.rules to cuda-libs, nvdec shouldn't need the cuda package to
by Leigh Scott
commit 47967b600eb9fe9bafa45a30ea3c074b284d295b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Dec 8 13:52:54 2018 +0000
Move nvidia-uvm.conf and 60-nvidia-uvm.rules to cuda-libs, nvdec shouldn't need the cuda package to function.
xorg-x11-drv-nvidia.spec | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index e918d89..b88ee4c 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -21,7 +21,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 415.22
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -454,8 +454,6 @@ fi ||:
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
-%{_modprobe_d}/nvidia-uvm.conf
-%{_udevrulesdir}/60-nvidia-uvm.rules
%endif
%files cuda-libs
@@ -474,12 +472,20 @@ fi ||:
%{_libdir}/libnvidia-compiler.so.%{version}
%{_libdir}/libnvidia-opencl.so.1
%{_libdir}/libnvidia-opencl.so.%{version}
+%ifarch x86_64
+%{_modprobe_d}/nvidia-uvm.conf
+%{_udevrulesdir}/60-nvidia-uvm.rules
+%endif
%files devel
%{_libdir}/libnvcuvid.so
%{_libdir}/libnvidia-encode.so
%changelog
+* Sat Dec 08 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-3
+- Move nvidia-uvm.conf and 60-nvidia-uvm.rules to cuda-libs,
+ nvdec shouldn't need the cuda package to function.
+
* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.22-2
- Update to 415.22 release
- Fix some rpmlint warnings
5 years, 11 months
[ffmpegthumbnailer] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit 640eae14866c24bea7e956b8883e71f5c9b2e340
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Dec 8 12:47:21 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
ffmpegthumbnailer.spec | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec
index 3c493b8..f05defb 100644
--- a/ffmpegthumbnailer.spec
+++ b/ffmpegthumbnailer.spec
@@ -1,22 +1,22 @@
Name: ffmpegthumbnailer
Version: 2.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Lightweight video thumbnailer that can be used by file managers
-Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/ffmpegthumbnailer/
Source0: https://github.com/dirkvdb/%{name}/archive/%{version}/%{name}-%{version}....
BuildRequires: ffmpeg-devel, libpng-devel, libjpeg-devel
-BuildRequires: chrpath, cmake, gcc-c++
+BuildRequires: chrpath, cmake3, gcc-c++
+%{?el7:BuildRequires: epel-rpm-macros}
+
%description
This video thumbnailer can be used to create thumbnails for your video files.
%package devel
Summary: Headers and libraries for building apps that use ffmpegthumbnailer
-Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -28,7 +28,7 @@ development package.
chmod -x README INSTALL COPYING AUTHORS
%build
-%cmake -DENABLE_GIO=ON -DENABLE_THUMBNAILER=ON .
+%cmake3 -DENABLE_GIO=ON -DENABLE_THUMBNAILER=ON .
%make_build
@@ -38,8 +38,7 @@ chmod -x README INSTALL COPYING AUTHORS
#chrpath --delete $RPM_BUILD_ROOT%%{_bindir}/ffmpegthumbnailer
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
%doc README AUTHORS
@@ -58,6 +57,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Sat Dec 08 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.2.0-7
+- Rebuild for ffmpeg-3.4.5 on el7
+- Use ldconfig_scriptlets
+- Use CMake3
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 11 months
[motion/el7: 23/23] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit 1c76b5b20152eef364fdc5cf1981ede9d042cd8e
Merge: 1d9e9a4 7fe8837
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Dec 8 00:14:47 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
.gitignore | 3 +
ffmpeg35_buildfix.patch | 21 +++
...mit-asm-emms-only-on-x86-and-amd64-arches.patch | 28 ---
...is-no-bin-service-in-Fedora-use-systemctl.patch | 24 ---
motion.service | 2 +-
motion.spec | 189 +++++++++++++++------
sources | 2 +-
7 files changed, 159 insertions(+), 110 deletions(-)
---
diff --cc motion.spec
index 7f1c92c,a2c41be..d7701e1
--- a/motion.spec
+++ b/motion.spec
@@@ -32,42 -63,37 +63,39 @@@ with a rather small footprint. This ver
without MySQL and PostgreSQL support.
%prep
- %setup -q
- %patch0 -p1
- %patch1 -p1
+ %autosetup -p1 -n %{name}-release-%{nextver}
+ autoreconf -v
%build
- export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
- %configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
- make %{?_smp_mflags}
+ %configure \
+ --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
+
+ %make_build V=1
%install
- rm -rf %{buildroot}
- make install DESTDIR=%{buildroot}
- #We rename the configuration file
+ %make_install
+
+ #We rename the configuration files
mv %{buildroot}%{_sysconfdir}/%{name}/motion-dist.conf %{buildroot}%{_sysconfdir}/%{name}/motion.conf
- #We move the logrotate configuration
- mkdir %{buildroot}%{_sysconfdir}/logrotate.d
- mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion
- #We run as motion:video user, reflect that in logrotate config
- sed -i 's|create 0600 root root|create 0600 motion video|g' %{buildroot}%{_sysconfdir}/logrotate.d/motion
+ mv %{buildroot}%{_sysconfdir}/%{name}/camera1-dist.conf %{buildroot}%{_sysconfdir}/%{name}/camera1.conf
+ mv %{buildroot}%{_sysconfdir}/%{name}/camera2-dist.conf %{buildroot}%{_sysconfdir}/%{name}/camera2.conf
+ mv %{buildroot}%{_sysconfdir}/%{name}/camera3-dist.conf %{buildroot}%{_sysconfdir}/%{name}/camera3.conf
+ mv %{buildroot}%{_sysconfdir}/%{name}/camera4-dist.conf %{buildroot}%{_sysconfdir}/%{name}/camera4.conf
+ #Delete doc directory
+ rm -rf %{buildroot}%{_datadir}/doc
+ #Remove init files
+ rm %{buildroot}%{_datadir}/%{name}/examples/motion.init-*
#We change the PID file path to match the one in the startup script
sed -i 's|/var/run/motion/motion.pid|/var/run/motion.pid|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
- #We remove SQL directives in the configuration file, as we don't use them
- sed -i 's|sql_log_image|; sql_log_image|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
- sed -i 's|sql_log_snapshot|; sql_log_snapshot|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
- sed -i 's|sql_log_mpeg|; sql_log_mpeg|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
- sed -i 's|sql_log_timelapse|; sql_log_timelapse|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
- sed -i 's|sql_query|; sql_query|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We set the log file and target directory - logging is for 3.3 branch
sed -i 's|;logfile /tmp/motion.log|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
- sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+ sed -i 's|target_dir /tmp/motion|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We install our startup script
- install -D -m 0755 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+ install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
#We install tmpfiles configuration
install -D -m 0755 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+#We remove versioned docs
+rm -rf %{buildroot}%{_docdir}/%{name}-%{version}
%pre
getent passwd motion >/dev/null || \
5 years, 11 months
[motion/el7] (23 commits) ...Rebuild for ffmpeg-3.4.5 on el7
by Antonio
Summary of changes:
e2f4669... * Sat Apr 20 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - (*)
540532e... * Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 3.3.0 (*)
a5137b2... * Sun Dec 14 2014 Tomasz Torcz <ttorcz(a)fedoraproject.org> - (*)
10e4db7... add notes for the hypothetical successor (*)
be2b4b7... * Wed Nov 18 2015 Sérgio Basto <sergio(a)serjux.com> - 3.3.0 (*)
8f16e67... patch for ffmpeg-3 (*)
86057db... Rebuilt for ffmpeg-3.1.1 (*)
d545e3e... Update to 4.0.1 release (*)
b628176... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
2fc7595... Rebuild for ffmpeg update (*)
7c7c847... Patch from rfbz#4321 applied (*)
1494c86... Rebuild for ffmpeg update (*)
8b13739... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
69d41e4... Update to 4.1 release (*)
037e98a... Update to 4.1.1 release (*)
95a3b02... Rebuilt for ffmpeg-3.5 git (*)
2d9898f... fix build with ffmpeg-3.5 (*)
c031e72... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
f5ad3a8... - Rebuilt for new ffmpeg snapshot (*)
021ebbb... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
e324ae9... Rebuild for ffmpeg-3.4.5 on el7 (*)
7fe8837... Remove pre-created doc directory (*)
1c76b5b... Rebuild for ffmpeg-3.4.5 on el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[motion] Remove pre-created doc directory
by Antonio
commit 7fe883746a7933b304fd40a664544ebe003a9949
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Dec 8 00:12:35 2018 +0100
Remove pre-created doc directory
motion.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/motion.spec b/motion.spec
index 93d7798..a2c41be 100644
--- a/motion.spec
+++ b/motion.spec
@@ -81,8 +81,8 @@ mv %{buildroot}%{_sysconfdir}/%{name}/camera1-dist.conf %{buildroot}%{_sysconfdi
mv %{buildroot}%{_sysconfdir}/%{name}/camera2-dist.conf %{buildroot}%{_sysconfdir}/%{name}/camera2.conf
mv %{buildroot}%{_sysconfdir}/%{name}/camera3-dist.conf %{buildroot}%{_sysconfdir}/%{name}/camera3.conf
mv %{buildroot}%{_sysconfdir}/%{name}/camera4-dist.conf %{buildroot}%{_sysconfdir}/%{name}/camera4.conf
-#Delete COPYING from doc directory
-rm %{buildroot}%{_datadir}/doc/motion/COPYING
+#Delete doc directory
+rm -rf %{buildroot}%{_datadir}/doc
#Remove init files
rm %{buildroot}%{_datadir}/%{name}/examples/motion.init-*
#We change the PID file path to match the one in the startup script
5 years, 11 months
[motion] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit e324ae9382396f1c73ddb751161eb1dd75012f91
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Dec 7 23:49:27 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
motion.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/motion.spec b/motion.spec
index a136172..93d7798 100644
--- a/motion.spec
+++ b/motion.spec
@@ -24,10 +24,9 @@
%global nextver 4.1.1
Name: motion
Version: %{nextver}
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A motion detection system
-Group: Applications/Multimedia
License: GPLv2+
URL: https://motion-project.github.io/
Source0: https://github.com/Motion-Project/motion/archive/release-%{nextver}.tar.g...
@@ -65,7 +64,7 @@ without MySQL and PostgreSQL support.
%prep
%autosetup -p1 -n %{name}-release-%{nextver}
-autoreconf
+autoreconf -v
%build
%configure \
@@ -130,6 +129,9 @@ find /var/motion -user root -group root -exec chown motion:video '{}' ';'
%{_tmpfilesdir}/%{name}.conf
%changelog
+* Tue Nov 13 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 4.1.1-6
+- Rebuild for ffmpeg-3.4.5 on el7
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 11 months
[simplescreenrecorder/el7: 4/4] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit a2818c842fa48f692f32cd467e49a2e172c7ddbc
Merge: 6f2252a 127796e
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Dec 7 23:26:19 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
simplescreenrecorder.spec | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
---
5 years, 11 months
[simplescreenrecorder] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit 127796e2d5089af3406318f9677835a185f2e29e
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Dec 7 23:19:47 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
simplescreenrecorder.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/simplescreenrecorder.spec b/simplescreenrecorder.spec
index e63fd7c..febbe25 100644
--- a/simplescreenrecorder.spec
+++ b/simplescreenrecorder.spec
@@ -1,7 +1,7 @@
%define shortname ssr
Name: simplescreenrecorder
Version: 0.3.11
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Simple Screen Recorder is a screen recorder for Linux
License: GPLv3
@@ -69,8 +69,8 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
%endif
%check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -98,6 +98,9 @@ fi
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Wed Nov 14 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 0.3.11-4
+- Rebuild for ffmpeg-3.4.5 on el7
+
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.3.11-3
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
5 years, 11 months