[deepin-voice-recorder] Initial with deepin-voice-recorder-1.3.8-1
by Zamir SUN
commit b587ba984decb096783547e848d25a45d0fc791d
Author: Zamir SUN <sztsian(a)gmail.com>
Date: Sat Nov 17 17:31:59 2018 +0100
Initial with deepin-voice-recorder-1.3.8-1
Signed-off-by: Zamir SUN <sztsian(a)gmail.com>
.gitignore | 1 +
deepin-voice-recorder.appdata.xml | 15 +++++++
deepin-voice-recorder.spec | 84 +++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 101 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8b8e179 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/deepin-voice-recorder-1.3.8.tar.gz
diff --git a/deepin-voice-recorder.appdata.xml b/deepin-voice-recorder.appdata.xml
new file mode 100644
index 0000000..7625215
--- /dev/null
+++ b/deepin-voice-recorder.appdata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>deepin-voice-recorder.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPLv3</project_license>
+ <name>Deepin Voice Recorder</name>
+ <summary>Deepin Voice Recorder</summary>
+ <summary xml:lang="zh">深度录音</summary>
+ <description>
+ <p>
+ This is default voice recorder application for Deepin Desktop Environment.
+ </p>
+ </description>
+ <url type="homepage">https://github.com/linuxdeepin/deepin-voice-recorder</url>
+</component>
diff --git a/deepin-voice-recorder.spec b/deepin-voice-recorder.spec
new file mode 100644
index 0000000..2ed4302
--- /dev/null
+++ b/deepin-voice-recorder.spec
@@ -0,0 +1,84 @@
+Name: deepin-voice-recorder
+Version: 1.3.8
+Release: 1%{?dist}
+Summary: Deepin Voice Recorder
+License: GPLv3+
+URL: https://github.com/linuxdeepin/deepin-voice-recorder
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source1: %{name}.appdata.xml
+
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Multimedia)
+BuildRequires: pkgconfig(dtkwidget) >= 2.0.6
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavutil)
+BuildRequires: qt5-linguist
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
+BuildRequires: gcc
+Requires: hicolor-icon-theme
+Requires: deepin-manual-directory
+
+%description
+%{summary}.
+
+%prep
+%setup -q
+sed -i 's|=lupdate|=lupdate-qt5|;s|=lrelease|=lrelease-qt5|' %{name}.pro
+find manual -executable -name "*.svg" -exec chmod 0644 "{}" \;
+
+%build
+%qmake_qt5 PREFIX=%{_prefix}
+%make_build
+
+%install
+%make_install INSTALL_ROOT=%{buildroot}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+install -pDm644 %{S:1} %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
+%files
+%doc README.md
+%license LICENSE
+%{_bindir}/%{name}
+%{_datadir}/%{name}/
+%{_datadir}/dman/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/icons/hicolor/*/apps/%{name}.svg
+
+%changelog
+* Sun Oct 28 2018 Zamir SUN <sztsian(a)gmail.com> - 1.3.8-1
+- Update to 1.3.8
+
+* Fri Jul 20 2018 mosquito <sensor.wen(a)gmail.com> - 1.3.7-1
+- Update to 1.3.7
+
+* Tue Mar 20 2018 mosquito <sensor.wen(a)gmail.com> - 1.3.6.1-1
+- Update to 1.3.6.1
+
+* Sun Jan 21 2018 Zamir SUN <sztsian(a)gmail.com> - 1.3.6-3
+- Add appdata file
+
+* Fri Jan 12 2018 Zamir SUN <sztsian(a)gmail.com> - 1.3.6-2
+- Prepare for rpmfusion
+
+* Wed Nov 15 2017 mosquito <sensor.wen(a)gmail.com> - 1.3.6-1
+- Update to 1.3.6
+
+* Mon Oct 23 2017 mosquito <sensor.wen(a)gmail.com> - 1.3.5-1
+- Update to 1.3.5
+
+* Mon Aug 21 2017 mosquito <sensor.wen(a)gmail.com> - 1.3.3-1
+- Update to 1.3.3
+
+* Thu Jul 20 2017 mosquito <sensor.wen(a)gmail.com> - 1.3.1-1.git6cf1cb9
+- Update to 1.3.1
+
+* Fri Jul 14 2017 mosquito <sensor.wen(a)gmail.com> - 1.3-1.git6c05bf1
+- Update to 1.3
+
+* Fri May 19 2017 mosquito <sensor.wen(a)gmail.com> - 1.2-1.git2a95a46
+- Initial build
diff --git a/sources b/sources
index e69de29..8cd93bd 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+51243ededdbba084f0511844f950eb5c deepin-voice-recorder-1.3.8.tar.gz
6 years
[deepin-movie] Initial with deepin-movie-3.2.14-1
by Zamir SUN
commit ccddfd01de30f2c0f206f0a2d2170229cb750370
Author: Zamir SUN <sztsian(a)gmail.com>
Date: Thu Nov 22 19:10:08 2018 +0800
Initial with deepin-movie-3.2.14-1
Signed-off-by: Zamir SUN <sztsian(a)gmail.com>
.gitignore | 1 +
deepin-movie-appdata.xml | 28 +++++++++
deepin-movie.spec | 155 +++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 185 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..5443754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/deepin-movie-3.2.14.tar.gz
diff --git a/deepin-movie-appdata.xml b/deepin-movie-appdata.xml
new file mode 100644
index 0000000..a0f3116
--- /dev/null
+++ b/deepin-movie-appdata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017 mosquito -->
+<component type="desktop">
+ <id>deepin-movie.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>Deepin Movie</name>
+ <name xml:lang="zh_CN">深度影院</name>
+ <summary>Deepin Movie is a well-designed and full-featured video player with simple borderless design.</summary>
+ <summary xml:lang="zh_CN">深度影院是一款设计精良、功能全面的视频播放器。</summary>
+ <description>
+ <p>
+ Deepin Movie is a well-designed and full-featured video player with simple borderless design. It supports local and streaming media play with multiple video formats.
+ </p>
+ <p xml:lang="zh_CN">
+ 深度影院是一款设计精良、功能全面的视频播放器。
+ </p>
+ </description>
+ <url type="homepage">https://github.com/linuxdeepin/deepin-movie-reborn/</url>
+ <url type="bugtracker">https://github.com/linuxdeepin/deepin-movie-reborn/issues/</url>
+ <releases>
+ <release version="3.2.11" date="2018-10-25"></release>
+ </releases>
+ <project_license>GPL-3.0</project_license>
+ <developer_name>Linux Deepin</developer_name>
+ <screenshots>
+ <screenshot type="default">https://www.deepin.org/wp-content/uploads/2016/12/deepin-movie-3-1.png</screenshot>
+ </screenshots>
+</component>
diff --git a/deepin-movie.spec b/deepin-movie.spec
new file mode 100644
index 0000000..cfa91ab
--- /dev/null
+++ b/deepin-movie.spec
@@ -0,0 +1,155 @@
+Name: deepin-movie
+Version: 3.2.14
+Release: 1%{?dist}
+Summary: Deepin movie based on mpv
+Summary(zh_CN): 深度影音
+License: GPLv3
+URL: https://github.com/linuxdeepin/deepin-movie-reborn
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source1: %{name}-appdata.xml
+
+BuildRequires: cmake(Qt5Concurrent)
+BuildRequires: cmake(Qt5DBus)
+BuildRequires: cmake(Qt5LinguistTools)
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Sql)
+BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt5X11Extras)
+BuildRequires: pkgconfig(dtkcore)
+BuildRequires: pkgconfig(dtkwidget) >= 2.0.6
+BuildRequires: pkgconfig(dvdnav)
+BuildRequires: pkgconfig(libffmpegthumbnailer)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavresample)
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libpulse-simple)
+BuildRequires: pkgconfig(mpv)
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(xtst)
+BuildRequires: pkgconfig(xcb-aux)
+BuildRequires: pkgconfig(xcb-ewmh)
+BuildRequires: pkgconfig(xcb-proto)
+BuildRequires: pkgconfig(xcb-shape)
+BuildRequires: libappstream-glib
+BuildRequires: gcc
+BuildRequires: desktop-file-utils
+
+%description
+Deepin movie for deepin desktop environment.
+
+%description -l zh_CN
+深度影音播放器, 后端基于MPV, 支持解码大多数视频格式.
+
+%package devel
+Summary: Development package for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Header files and libraries for %{name}.
+
+%prep
+%setup -q -n %{name}-reborn-%{version}
+sed -i '/dtk2/s|lib|libexec|' src/CMakeLists.txt
+
+%build
+%cmake -DCMAKE_BUILD_TYPE=Release
+%make_build
+
+%install
+%make_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
+
+%find_lang %{name} --with-qt
+
+%files
+%doc README.md
+%license LICENSE
+%{_bindir}/%{name}
+%{_libdir}/libdmr.so.0.1
+%{_libdir}/libdmr.so.0.1.0
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/%{name}
+%{_datadir}/%{name}/translations
+%{_datadir}/%{name}/translations/%{name}*.qm
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+
+%files devel
+%{_includedir}/libdmr
+%{_includedir}/libdmr/*.h
+%{_libdir}/pkgconfig/libdmr.pc
+%{_libdir}/libdmr.so
+
+%changelog
+* Thu Nov 15 2018 Zamir SUN <zsun(a)fedoraproject.org> - 3.2.14-1
+- Update to 3.2.14
+- Add BR gcc
+
+* Sat Oct 27 2018 Zamir SUN <zsun(a)fedoraproject.org> - 3.2.11-1
+- Update to 3.2.11
+
+* Fri Aug 10 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.9-1
+- Update to 3.2.9
+
+* Fri Jul 27 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.8-1
+- Update to 3.2.8
+
+* Tue Mar 20 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.3-1
+- Update to 3.2.3
+
+* Fri Feb 16 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.0.3-1
+- Update to 3.2.0.3
+
+* Wed Jan 10 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.0.2-1
+- Update to 3.2.0.2
+
+* Thu Dec 28 2017 Zamir SUN <sztsian(a)gmail.com> - 3.2.0-1
+- Update to 3.2.0
+
+* Wed Dec 20 2017 mosquito <sensor.wen(a)gmail.com> - 3.1.1-1
+- Update to 3.1.1
+
+* Mon Nov 27 2017 mosquito <sensor.wen(a)gmail.com> - 3.0.1-1
+- Update to 3.0.1
+
+* Wed Nov 15 2017 mosquito <sensor.wen(a)gmail.com> - 2.9.96-1
+- Update to 2.9.96
+
+* Fri Oct 27 2017 mosquito <sensor.wen(a)gmail.com> - 2.9.94-1
+- Update to 2.9.94
+
+* Fri Oct 13 2017 mosquito <sensor.wen(a)gmail.com> - 2.9.16-1
+- Update to 2.9.16
+
+* Thu Sep 21 2017 mosquito <sensor.wen(a)gmail.com> - 2.9.12-1
+- Update to 2.9.12
+
+* Thu Aug 24 2017 mosquito <sensor.wen(a)gmail.com> - 2.9.10-1
+- Update to 2.9.10
+
+* Sun Aug 06 2017 Zamir SUN <sztsian(a)gmail.com> - 2.2.14-2
+- Remove group tag
+- Fix rpmlint shebang error
+
+* Fri Jul 14 2017 mosquito <sensor.wen(a)gmail.com> - 2.2.14-1.git69123ed
+- Update to 2.2.14
+
+* Fri May 19 2017 mosquito <sensor.wen(a)gmail.com> - 2.2.13-1.gita1ba8c3
+- Update to 2.2.13
+
+* Sat Jan 28 2017 mosquito <sensor.wen(a)gmail.com> - 2.2.11-2.git7896696
+- Fix cannot register existing type 'GdkDisplayManager'
+
+* Tue Jan 17 2017 mosquito <sensor.wen(a)gmail.com> - 2.2.11-1.git7896696
+- Update to 2.2.11
+
+* Thu Jul 16 2015 mosquito <sensor.wen(a)gmail.com> - 2.2.2-2.git53adfc6
+- python-peewee(>=2.3.0,<=2.4.4)
+- remove some depends
+
+* Sat Jul 4 2015 mosquito <sensor.wen(a)gmail.com> - 2.2.2-1.git53adfc6
+- Initial build
diff --git a/sources b/sources
index e69de29..f7f704a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c415bd85eb9d97c1ac964c73f2a861bb deepin-movie-3.2.14.tar.gz
6 years
[libmms] Add missing gcc
by Nicolas Chauvet
Summary of changes:
642972c... Add missing gcc (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[libmms/el8] Add missing gcc
by Nicolas Chauvet
commit 642972c434a0370db4253d6f61fb7e7272014041
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 21 12:19:46 2018 +0100
Add missing gcc
libmms.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/libmms.spec b/libmms.spec
index 10ca01f..62bc412 100644
--- a/libmms.spec
+++ b/libmms.spec
@@ -7,6 +7,8 @@ URL: http://www.sf.net/projects/libmms
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1: 0001-Remove-Requires-glib-2.0-since-libmms-no-longer-depe.patch
+BuildRequires: gcc
+
%description
MMS is a proprietary streaming protocol used in Microsoft server products,
commonly used to stream WMV data. You can encounter mms:// style URLs all over
6 years
[libmms/el8] Spec file clean-up
by Nicolas Chauvet
Summary of changes:
e62a69f... Spec file clean-up (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[libmms] Spec file clean-up
by Nicolas Chauvet
commit e62a69f52453aca63ddb37cf4c5e51eefeabd9fa
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 21 12:17:58 2018 +0100
Spec file clean-up
libmms.spec | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/libmms.spec b/libmms.spec
index 2e8004f..10ca01f 100644
--- a/libmms.spec
+++ b/libmms.spec
@@ -1,9 +1,8 @@
Name: libmms
Version: 0.6.4
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Library for Microsoft Media Server (MMS) streaming protocol
License: LGPLv2+
-Group: System Environment/Libraries
URL: http://www.sf.net/projects/libmms
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1: 0001-Remove-Requires-glib-2.0-since-libmms-no-longer-depe.patch
@@ -18,7 +17,6 @@ support to your media applications.
%package devel
Summary: Development package for %{name}
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, pkgconfig
%description devel
@@ -31,9 +29,9 @@ This package contains development files for %{name}.
%build
-export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -Werror"
+export CFLAGS="%{optflags} -Wno-pointer-sign -Werror"
%configure --disable-dependency-tracking --disable-static
-make %{?_smp_mflags}
+%make_build
%install
@@ -41,12 +39,12 @@ make %{?_smp_mflags}
rm $RPM_BUILD_ROOT%{_libdir}/%{name}.la
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
-%doc AUTHORS COPYING.LIB ChangeLog README*
+%doc AUTHORS ChangeLog README*
+%license COPYING.LIB
%{_libdir}/%{name}.so.*
%files devel
@@ -56,6 +54,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}.la
%changelog
+* Wed Nov 21 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.4-8
+- Spec file clean-up
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.6.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
6 years
[tvheadend/f27] - Use system versions of rcssmin and rjsmin during build - Install Python bindings
by Mohamed ElMorabity
commit ca695353457bd5e77b2ff8943626b808788638f6
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Wed Nov 21 11:00:56 2018 +0100
- Use system versions of rcssmin and rjsmin during build
- Install Python bindings
tvheadend-4.2.7-python3.patch | 91 ++++++++++++++++++++++++++++
tvheadend.spec | 138 +++++++++++++++++++++---------------------
2 files changed, 160 insertions(+), 69 deletions(-)
---
diff --git a/tvheadend-4.2.7-python3.patch b/tvheadend-4.2.7-python3.patch
new file mode 100644
index 0000000..752b17b
--- /dev/null
+++ b/tvheadend-4.2.7-python3.patch
@@ -0,0 +1,91 @@
+diff -up ./lib/py/tvh/tsreader.py.orig ./lib/py/tvh/tsreader.py
+--- ./lib/py/tvh/tsreader.py.orig 2018-10-08 14:37:05.000000000 +0200
++++ ./lib/py/tvh/tsreader.py 2018-10-15 11:53:53.766850060 +0200
+@@ -31,7 +31,7 @@ def encode_utf8(c):
+
+ def conv_8859(tnum, data):
+ r = u''
+- print 'TBL %d' % tnum
++ print('TBL %d' % tnum)
+ tbl = conv_8859_table[tnum]
+ for c in data:
+ if ord(c) <= 0x7f:
+@@ -46,8 +46,8 @@ def conv_8859(tnum, data):
+
+
+ def dvb_convert_string(data, conv):
+- print 'convert(%d)' % conv
+- print repr(data)
++ print('convert(%d)' % conv)
++ print(repr(data))
+ if not conv:
+ return data
+ return conv_8859(conv, data)
+@@ -83,8 +83,8 @@ class TsSection(object):
+ # print self.tid, self.len, len(data)
+
+ def process(self):
+- print 'TS Section:'
+- print self.tid, self.len, len(self.data)
++ print('TS Section:')
++ print(self.tid, self.len, len(self.data))
+ # print str2hex(self.data, 16)
+ # print self.data
+
+@@ -112,7 +112,7 @@ class TsSection(object):
+ if l + 1 > dlen:
+ return (None, -1)
+ c = ord(data[1])
+- print c
++ print(c)
+ conv = None
+ if c == 0:
+ return (None, -1)
+@@ -162,14 +162,14 @@ class TsSection(object):
+ eid = (hdr[0] << 8) + hdr[1]
+ start = dvb_convert_date(hdr[2:])
+
+- print 'process event (%d):' % dllen
+- print ' EID : %d' % eid
+- print ' START : %d' % start
++ print('process event (%d):' % dllen)
++ print(' EID : %d' % eid)
++ print(' START : %d' % start)
+
+ while dllen > 2:
+ dtag = ord(data[0])
+ dlen = ord(data[1])
+- print 'dtag = 0x%02x, dlen = %d' % (dtag, dlen)
++ print('dtag = 0x%02x, dlen = %d' % (dtag, dlen))
+
+ dllen = dllen - 2
+ data = data[2:]
+@@ -178,8 +178,8 @@ class TsSection(object):
+
+ if dtag == 0x4d:
+ (title, summary) = self.short_event(data, dlen)
+- print ' TITLE : %s' % title
+- print ' SUMMARY : %s' % summary
++ print(' TITLE : %s' % title)
++ print(' SUMMARY : %s' % summary)
+
+ dllen = dllen - dlen
+ data = data[dlen:]
+@@ -216,7 +216,7 @@ if __name__ == '__main__':
+ # Complete?
+ if cur:
+ if len(cur.data) >= cur.len:
+- print 'Process Section:'
++ print('Process Section:')
+ # try:
+ cur.process()
+ # except: pass
+@@ -224,7 +224,7 @@ if __name__ == '__main__':
+ print
+ sys.exit(0)
+ else:
+- print 'waiting for %d bytes' % (cur.len - len(cur.data))
++ print('waiting for %d bytes' % (cur.len - len(cur.data)))
+
+ # Next
+ if nxt:
diff --git a/tvheadend.spec b/tvheadend.spec
index 883812f..326f644 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -3,7 +3,7 @@
Name: tvheadend
Version: 4.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TV streaming server and digital video recorder
License: GPLv3+
@@ -22,6 +22,8 @@ Patch3: %{name}-4.2.2-dtv_scan_tables.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
Patch4: %{name}-4.2.1-crypto_policies.patch
+# Python 3 fixes for Python bindings
+Patch5: %{name}-4.2.7-python3.patch
BuildRequires: bzip2
BuildRequires: gcc
@@ -42,7 +44,12 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(liburiparser)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib)
+%if 0%{?fedora} < 30
+BuildRequires: python2-devel
+%endif
BuildRequires: python3-devel
+BuildRequires: python3-rcssmin
+BuildRequires: python3-rjsmin
BuildRequires: systemd
Requires: bzip2
Requires: dtv-scan-tables
@@ -65,17 +72,40 @@ version, the pipe:// source (in IPTV network) might be used to obtain the
MPEG-TS stream generated by ffmpeg/libav from a V4L device.
+%if 0%{?fedora} < 30
+%package -n python2-tvh
+Summary: HTSP client for Python
+BuildArch: noarch
+
+%description -n python2-tvh
+%{summary}.
+%endif
+
+
+%package -n python3-tvh
+Summary: HTSP client for Python
+BuildArch: noarch
+
+%description -n python3-tvh
+%{summary}.
+
+
%prep
-%autosetup -p 0
+%autosetup -p0
-# Delete bundled system headers
-rm -r vendor/{dvb-api,include}/
+# Delete bundled system headers and tools
+rm -r vendor/{dvb-api,include,rcssmin-*,rjsmin-*}/
+
+# Remove shebang
+for i in lib/py/tvh/*.py; do
+ sed '1{\@^#!/usr/bin/env python@d}' $i >$i.new && \
+ touch -r $i $i.new && \
+ mv $i.new $i
+done
%build
-# Use touch to be sure that configure, after being patched, is still older than
-# generated .config.mk file (otherwise the build fails)
-# touch -r Makefile configure
+echo "%{version}-%{release}" >rpm/version
# Note: --disable-lib* correspond to options to build bundled FFmpeg
%configure \
--disable-dvbscan \
@@ -95,8 +125,12 @@ rm -r vendor/{dvb-api,include}/
--disable-libx265_static \
--enable-dvbcsa \
--enable-hdhomerun_client \
- --enable-libsystemd_daemon
-%make_build V=1 PYTHON=%{__python3}
+ --enable-libsystemd_daemon \
+ --python=%{__python3}
+%make_build \
+ V=1 \
+ RUN_CSS="%{__python3} %{python3_sitearch}/rcssmin.py" \
+ RUN_JS="%{__python3} %{python3_sitearch}/rjsmin.py"
%install
@@ -107,20 +141,21 @@ install -Dpm 0644 rpm/%{name}.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
install -dm 0755 $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/
+# Install Python bindings
+%if 0%{?fedora} < 30
+install -dm 0755 $RPM_BUILD_ROOT%{python2_sitelib}/
+cp -a lib/py/tvh/ $RPM_BUILD_ROOT%{python2_sitelib}/
+%endif
+install -dm 0755 $RPM_BUILD_ROOT%{python3_sitelib}/
+cp -a lib/py/tvh/ $RPM_BUILD_ROOT%{python3_sitelib}/
+
# Fix permissions
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-# Drop bundled Ext JS resources not required by Tvheadend UI
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/src/webui/static/extjs/
-mv examples/ux/images/ examples_ux_images
-rm -r *.js adapter/ examples/ resources/images/{vista,yourtheme}/
-install -dm 0755 examples/ux/
-mv examples_ux_images/ examples/ux/images
-popd
-
%pre
-getent passwd %{tvheadend_user} >/dev/null || useradd -r -g %{tvheadend_group} -d %{_sharedstatedir}/%{name}/ -s /sbin/nologin -c "%{name} daemon account" %{name}
+getent passwd %{tvheadend_user} >/dev/null || \
+ useradd -r -g %{tvheadend_group} -d %{_sharedstatedir}/%{name}/ -s /sbin/nologin -c "%{name} daemon account" %{name}
exit 0
@@ -147,59 +182,24 @@ exit 0
%{_mandir}/man1/*.1.*
-%changelog
-* Tue Oct 09 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.7-1
-- Update to 4.2.7
-- Remove patches merges upstream
-- Use Python 3 for build
-
-* Tue Mar 27 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.6-1
-- Update to 4.2.6
-
-* Sat Mar 17 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.5-2
-- Add explicite Requires on tar and bzip2 (required by Tvheadend for
- configuration backups)
-
-* Sun Jan 07 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.5-1
-- Update to 4.2.5
-
-* Thu Oct 19 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.4-1
-- Update to 4.2.4
-
-* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 4.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 03 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.3-1
-- Update to 4.2.3
-
-* Thu Jun 01 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.2-2
-- Fix system DTV scan tables path
-
-* Tue May 23 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.2-1
-- Update to 4.2.2
-- Drop patch for GCC7 (merged upstream)
-
-* Sun Apr 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 4.2.1-2
-- Rebuild for ffmpeg update
-
-* Sun Apr 23 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.1-1
-- Update to 4.2.1
-
-* Wed Apr 12 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.10-1
-- Update to 4.0.10
+%if 0%{?fedora} < 30
+%files -n python2-tvh
+%license LICENSE.md licenses/gpl-3.0.txt
+%{python2_sitelib}/tvh/
+%endif
-* Sat Mar 25 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.9-5
-- Fix build with GCC 7
-- Enable DVBCSA support
-* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 4.0.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+%files -n python3-tvh
+%license LICENSE.md licenses/gpl-3.0.txt
+%{python3_sitelib}/tvh/
-* Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.9-3
-- Merge all FFmpeg patches into a single one
-* Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.9-2
-- Fix build with FFmpeg 3.1
+%changelog
+* Sat Nov 17 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.7-2
+- Use system versions of rcssmin and rjsmin during build
+- Install Python bindings
-* Thu Jul 28 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.9-1
-- Initial RPM release
+* Tue Oct 09 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.7-1
+- Update to 4.2.7
+- Remove patches merges upstream
+- Use Python 3 for build
6 years
[nvidia-xconfig] Update to 415.18 release
by Leigh Scott
commit 92e5e540fc1c1790aec740650a55cf8bf4afc68f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Nov 21 09:29:22 2018 +0000
Update to 415.18 release
nvidia-xconfig.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec
index 432d28a..9f85d7d 100644
--- a/nvidia-xconfig.spec
+++ b/nvidia-xconfig.spec
@@ -1,6 +1,6 @@
Name: nvidia-xconfig
Epoch: 3
-Version: 410.78
+Version: 415.18
Release: 1%{?dist}
Summary: NVIDIA X configuration file editor
@@ -49,6 +49,9 @@ mkdir -p %{buildroot}%{_sbindir}
%changelog
+* Wed Nov 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.18-1
+- Update to 415.18 release
+
* Fri Nov 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:410.78-1
- Update to 410.78 release
diff --git a/sources b/sources
index 0a36276..e5ceeca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7851eee811367e3f7206a73f5fb18e1 nvidia-xconfig-410.78.tar.bz2
+ad3a90080117f729628b545debdb71bc nvidia-xconfig-415.18.tar.bz2
6 years
