[smplayer] Update smplayer to 16.7.0 and smtube to 16.7.2
by Sérgio M. Basto
commit 22f65fa8b06b996bbca9cf0dea1f6fef22d99ce4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jul 17 22:07:56 2016 +0100
Update smplayer to 16.7.0 and smtube to 16.7.2
- Install smplayer-themes and smplayer-skins
- Few more cleanup, especially in docs and licenses.
.gitignore | 4 +++
smplayer.spec | 86 ++++++++++++++++++++++++++++++++++++++++++++++-------------
sources | 6 +++--
3 files changed, 75 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d2aeca..655db46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,7 @@ smplayer-16.4.0.tar.bz2
smtube-16.3.0.tar.bz2
/smplayer-16.6.0.tar.bz2
/smtube-16.6.0.tar.bz2
+/smplayer-themes-16.6.0.tar.bz2
+/smplayer-skins-15.2.0.tar.bz2
+/smtube-16.7.2.tar.bz2
+/smplayer-16.7.0.tar.bz2
diff --git a/smplayer.spec b/smplayer.spec
index 43b1c56..eb978fe 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -1,17 +1,18 @@
Name: smplayer
-Version: 16.6.0
-%global smtube_ver 16.6.0
-Release: 2%{?dist}
+Version: 16.7.0
+%global smtube_ver 16.7.2
+%global smplayer_themes_ver 16.6.0
+%global smplayer_skins_ver 15.2.0
+Release: 1%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
License: GPLv2+
URL: http://smplayer.sourceforge.net/
Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
-# Add a servicemenu to enqeue files in smplayer's playlist.
-# see also:
-# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
-Source3: http://downloads.sourceforge.net/smtube/smtube-%{smtube_ver}.tar.bz2
+Source2: http://downloads.sourceforge.net/smtube/smtube-%{smtube_ver}.tar.bz2
+Source3: http://downloads.sourceforge.net/smplayer/smplayer-themes-%{smplayer_them...
+Source4: http://downloads.sourceforge.net/smplayer/smplayer-skins-%{smplayer_skins...
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
Patch0: smplayer-0.8.3-desktop-files.patch
@@ -19,12 +20,16 @@ Patch2: smplayer-14.9.0.6966-system-qtsingleapplication.patch
Patch3: smtube-16.3.0-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
-BuildRequires: qt5-qttools
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qttools-devel
+BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Script)
+BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: qt5-linguist
@@ -46,8 +51,16 @@ remember the state of a played file, so when you play it later it will resume
at the same point and with the same settings. smplayer is developed with
the Qt toolkit, so it's multi-platform.
+%package themes
+Summary: Themes and Skins for SMPlayer
+Group: Video/Players
+Requires: smplayer
+
+%description themes
+A set of themes for SMPlayer and a set of skins for SMPlayer.
+
%prep
-%setup -a3 -qn %{name}-%{version}
+%setup -qa2 -qa3 -qa4 -qn %{name}-%{version}
#remove some bundle sources
rm -rf zlib
rm -rf src/qtsingleapplication/
@@ -59,6 +72,8 @@ rm -rf smtube-%{smtube_ver}/src/qtsingleapplication/
%patch2 -p1 -b .qtsingleapplication
pushd smtube-%{smtube_ver}
%patch3 -p1 -b .qtsingleapplication
+# correction for wrong-file-end-of-line-encoding on smtube
+%{__sed} -i 's/\r//' *.txt
popd
# correction for wrong-file-end-of-line-encoding
@@ -67,27 +82,45 @@ popd
iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog
mv Changelog.utf8 Changelog
-# fix path of docs
-sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
-
-# use %{?_smp_mflags}
-sed -i '/cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make/s!$! %{?_smp_mflags}!' Makefile
+# change rcc binary
+%{__sed} -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-themes-%{smplayer_themes_ver}/themes/Makefile
+%{__sed} -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-skins-%{smplayer_skins_ver}/themes/Makefile
%build
-make QMAKE=%{_qt5_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt5
+%make_build QMAKE=%{_qt5_qmake} LRELEASE=%{_bindir}/lrelease-qt5
pushd smtube-%{smtube_ver}
-sed -i 's|doc/smtube|doc/%{name}/smtube|' Makefile
sed -i 's|smtube/translations|smplayer/translations|' Makefile
-make QMAKE=%{_qt5_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt5
+%make_build QMAKE=%{_qt5_qmake} LRELEASE=%{_bindir}/lrelease-qt5
popd
+pushd smplayer-themes-%{smplayer_themes_ver}
+%make_build
+popd
+
+pushd smplayer-skins-%{smplayer_skins_ver}
+mv README.txt README-skins.txt
+mv Changelog Changelog-skins.txt
+%make_build
+popd
%install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} DOC_PATH=%{_docdir}/%{name}
+
+# remove all License docs
+rm -r %{buildroot}%{_docdir}/%{name}/Copying*
+
pushd smtube-%{smtube_ver}
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} DOC_PATH=%{_docdir}/%{name}/smtube
+popd
+
+pushd smplayer-themes-%{smplayer_themes_ver}
+make install PREFIX=%{_prefix} DESTDIR=%{buildroot}
+popd
+
+pushd smplayer-skins-%{smplayer_skins_ver}
+make install PREFIX=%{_prefix} DESTDIR=%{buildroot}
popd
desktop-file-install --delete-original \
@@ -116,6 +149,7 @@ fi
update-desktop-database &> /dev/null || :
%files
+%license Copying*
%{_bindir}/smplayer
%{_bindir}/smtube
%{_datadir}/applications/smplayer*.desktop
@@ -124,10 +158,24 @@ update-desktop-database &> /dev/null || :
%{_datadir}/icons/hicolor/*/apps/smplayer.svg
%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
+%exclude %{_datadir}/smplayer/themes/
%{_mandir}/man1/smplayer.1.gz
%{_docdir}/%{name}/
+%files themes
+%doc smplayer-themes-%{smplayer_themes_ver}/README.txt
+%doc smplayer-themes-%{smplayer_themes_ver}/Changelog
+%doc smplayer-skins-%{smplayer_skins_ver}/README-skins.txt
+%doc smplayer-skins-%{smplayer_skins_ver}/Changelog-skins.txt
+%license smplayer-themes-%{smplayer_themes_ver}/COPYING*
+%{_datadir}/smplayer/themes/
+
%changelog
+* Sun Jul 17 2016 Sérgio Basto <sergio(a)serjux.com> - 16.7.0-1
+- Update smplayer to 16.7.0 and smtube to 16.7.2
+- Install smplayer-themes and smplayer-skins
+- Few more cleanup, especially in docs and licenses.
+
* Sun Jul 17 2016 Sérgio Basto <sergio(a)serjux.com> - 16.6.0-2
- Switch builds to Qt5
- Do not apply a vendor tag to .desktop files (using --vendor).
diff --git a/sources b/sources
index 0308dd8..1f108db 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
-61d6fc855d13b33eccb3f5d2a1472220 smplayer-16.6.0.tar.bz2
-ae1f01e31e0dfffced0fc38c5920a304 smtube-16.6.0.tar.bz2
+7c2e475290e3edda69e52ec8682743dd smplayer-themes-16.6.0.tar.bz2
+57e165cf9a95808fafd179e5322b7f15 smplayer-skins-15.2.0.tar.bz2
+318369359ae36a2fce92939f56291f3e smtube-16.7.2.tar.bz2
+b6177835a07c6b269fb2bab15d70a87a smplayer-16.7.0.tar.bz2
8 years, 4 months
[smplayer] Switch builds to Qt5
by Sérgio M. Basto
commit e7664fa464b1e90c32f377870dec5a5ef080be99
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jul 17 18:17:31 2016 +0100
Switch builds to Qt5
- Do not apply a vendor tag to .desktop files (using --vendor).
- Drop old smplayer_enqueue.desktop
smplayer.spec | 53 +++++++++++++++++++++++--------------------
smplayer_enqueue_kde4.desktop | 17 --------------
2 files changed, 28 insertions(+), 42 deletions(-)
---
diff --git a/smplayer.spec b/smplayer.spec
index 2040a10..43b1c56 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -1,7 +1,7 @@
Name: smplayer
Version: 16.6.0
%global smtube_ver 16.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
@@ -11,7 +11,6 @@ Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.ta
# Add a servicemenu to enqeue files in smplayer's playlist.
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
-Source1: smplayer_enqueue_kde4.desktop
Source3: http://downloads.sourceforge.net/smtube/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
@@ -20,14 +19,24 @@ Patch2: smplayer-14.9.0.6966-system-qtsingleapplication.patch
Patch3: smtube-16.3.0-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
-BuildRequires: qt4-devel
-BuildRequires: quazip-devel
-BuildRequires: qtsingleapplication-devel
-BuildRequires: qtwebkit-devel
+BuildRequires: qt5-qttools
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Script)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: qt5-linguist
+BuildRequires: qtsingleapplication-qt5-devel
+BuildRequires: quazip-qt5-devel
+BuildRequires: zlib-devel
+# for smtube only
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
# smplayer without mplayer is quite useless
Requires: mplayer
-Requires: kde-filesystem
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
%description
smplayer intends to be a complete front-end for Mplayer, from basic features
@@ -64,43 +73,34 @@ sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/shar
# use %{?_smp_mflags}
sed -i '/cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make/s!$! %{?_smp_mflags}!' Makefile
-# don't show smplayer_enqueue.desktop in KDE and use servicemenus instead
-echo "NotShowIn=KDE;" >> smplayer_enqueue.desktop
-
%build
-make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt4
+make QMAKE=%{_qt5_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt5
pushd smtube-%{smtube_ver}
-sed -i 's|/usr/local|%{_prefix}|' Makefile
sed -i 's|doc/smtube|doc/%{name}/smtube|' Makefile
sed -i 's|smtube/translations|smplayer/translations|' Makefile
-make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt4
+make QMAKE=%{_qt5_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt5
popd
+
%install
-make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
pushd smtube-%{smtube_ver}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
popd
desktop-file-install --delete-original \
- --vendor "rpmfusion" \
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-install --delete-original \
- --vendor "rpmfusion" \
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/smtube.desktop
-# Add servicemenus dependend on the version of KDE:
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&group_i...
-install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -118,18 +118,21 @@ update-desktop-database &> /dev/null || :
%files
%{_bindir}/smplayer
%{_bindir}/smtube
-%{_datadir}/applications/rpmfusion-smplayer*.desktop
+%{_datadir}/applications/smplayer*.desktop
%{_datadir}/applications/smtube.desktop
%{_datadir}/icons/hicolor/*/apps/smplayer.png
%{_datadir}/icons/hicolor/*/apps/smplayer.svg
%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
-%dir %{_datadir}/kde4/services/ServiceMenus/
-%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%{_mandir}/man1/smplayer.1.gz
%{_docdir}/%{name}/
%changelog
+* Sun Jul 17 2016 Sérgio Basto <sergio(a)serjux.com> - 16.6.0-2
+- Switch builds to Qt5
+- Do not apply a vendor tag to .desktop files (using --vendor).
+- Drop old smplayer_enqueue.desktop
+
* Wed Jun 22 2016 Sérgio Basto <sergio(a)serjux.com> - 16.6.0-1
- Update to 16.6.0
8 years, 4 months
[mac/f23] (4 commits) ...add patch
by Leigh Scott
Summary of changes:
ff7fd31... Add WIP patch - please anyone finish the gcc patch (*)
0b88c78... patch for gcc-6 (*)
df7dcf8... fix bz4123 (*)
3231123... add patch (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[xcpc] Built against libXaw because lesstif has been retired for F24
by Andrea Musuruane
commit a0cdaee43b67a890b569ca6043f73183f9474134
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sun Jul 17 17:01:36 2016 +0200
Built against libXaw because lesstif has been retired for F24
- Updated URL
- Updated Source0
- Dropped cleaning at the beginning of %install
xcpc.spec | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/xcpc.spec b/xcpc.spec
index 2b81419..0bb0c5c 100644
--- a/xcpc.spec
+++ b/xcpc.spec
@@ -2,17 +2,17 @@
Name: xcpc
Version: 0.0
-Release: 0.14.%{date}wip%{?dist}
+Release: 0.15.%{date}wip%{?dist}
Summary: A portable Amstrad CPC464/CPC664/CPC6128 Emulator written in C
License: GPLv2+
-URL: http://xcpc.sourceforge.net/
-Source0: http://dl.sf.net/%{name}/%{name}-%{date}.tar.gz
+URL: http://www.xcpc-emulator.net/
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{date}.tar.gz
-BuildRequires: lesstif-devel
BuildRequires: glib2-devel
BuildRequires: libdsk-devel
BuildRequires: libXmu-devel
+BuildRequires: libXaw-devel
BuildRequires: libICE-devel
BuildRequires: libtool
BuildRequires: desktop-file-utils
@@ -33,12 +33,11 @@ sed -i -e 's/^Icon=%{name}.xpm$/Icon=%{name}/g' src/%{name}.desktop
%build
-%configure --with-motif1
+%configure --with-athena
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# install desktop file and fix categories
@@ -81,6 +80,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jul 17 2016 Andrea Musuruane <musuruan(a)gmail.com> - 0.0-0.15.20070122wip
+- Built against libXaw because lesstif has been retired for F24
+- Updated URL
+- Updated Source0
+- Dropped cleaning at the beginning of %%install
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.0-0.14.20070122wip
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
8 years, 4 months
[nvidia-kmod/f23] Update to 367.35
by Leigh Scott
Summary of changes:
9613f98... Update to 367.35 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[nvidia-kmod/f24: 2/2] Merge branch 'master' into f24
by Leigh Scott
commit fda966e3bee9e14be81a61b010a333a82daee391
Merge: fdf267f 9613f98
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jul 17 14:50:42 2016 +0100
Merge branch 'master' into f24
nvidia-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
8 years, 4 months
[nvidia-kmod] Update to 367.35
by Leigh Scott
commit 9613f98ecf0201e5578a7723247998bee51fff6d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jul 17 14:50:04 2016 +0100
Update to 367.35
nvidia-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index fb3e343..f1fa5bd 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-kmod
Epoch: 1
-Version: 367.27
+Version: 367.35
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jul 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.35-1
+- Update to 367.35
+
* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.27-2
- patch for 4.7rc kernel
8 years, 4 months
