[game-data-packager] fix FTBFS
by Alexandre Detiste
commit ef5bc4ad65d3ec929d4c000615ffea467acf34a0
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun Nov 6 11:46:28 2016 +0100
fix FTBFS
game-data-packager.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index fe4ded1..de70cef 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -88,8 +88,8 @@ find $RPM_BUILD_ROOT/etc/game-data-packager -empty -exec sh -c "echo '# we need
rm -rvf $RPM_BUILD_ROOT/etc/apparmor.d
rm -v $RPM_BUILD_ROOT/usr/bin/etqw*
rm -v $RPM_BUILD_ROOT/usr/bin/quake*
-rm -vrf $RPM_BUILD_ROOT/usr/lib32
-rm -vrf $RPM_BUILD_ROOT/usr/lib64
+# 'lib64' in local build, 'lib' on buildd
+rm -vrf $RPM_BUILD_ROOT/usr/lib*
rm -v $RPM_BUILD_ROOT/usr/share/applications/etqw.desktop
rm -v $RPM_BUILD_ROOT/usr/share/applications/quake*.desktop
rm -rv $RPM_BUILD_ROOT/usr/share/game-data-packager-runtime/
7 years, 5 months
[game-data-packager] rpmlint "W: unversioned-explicit-provides"
by Alexandre Detiste
commit 9ee773b9d8323dce38d4e464f8fc845440b20b65
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun Nov 6 10:40:11 2016 +0100
rpmlint "W: unversioned-explicit-provides"
game-data-packager.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index d66d37d..fe4ded1 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -58,7 +58,7 @@ data which cannot be distributed (such as commercial game data).
Summary: "Master Levels for Doom II" launcher
Requires: python3-gobject-base
Requires: gobject-introspection
-Provides: game-data-packager-runtime
+Provides: game-data-packager-runtime = %{version}
%description -n doom2-masterlevels
This GUI let you select a WAD to play &
show it's description.
7 years, 5 months
[game-data-packager] remove remaining "/games" references
by Alexandre Detiste
commit 2bcbd46c84bec0101085ef2060e17b442b65d1c8
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun Nov 6 10:34:29 2016 +0100
remove remaining "/games" references
game-data-packager.spec | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index 491f24e..d66d37d 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -79,24 +79,21 @@ make check
%install
make DESTDIR=$RPM_BUILD_ROOT install
-find $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager -name '*.py' -exec chmod 755 {} \;
+find $RPM_BUILD_ROOT/usr/share/game-data-packager/game_data_packager -name '*.py' -exec chmod 755 {} \;
#E: python-bytecode-inconsistent-mtime
-python3 -m compileall $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/version.py
+python3 -m compileall $RPM_BUILD_ROOT/usr/share/game-data-packager/game_data_packager/version.py
find $RPM_BUILD_ROOT/etc/game-data-packager -empty -exec sh -c "echo '# we need more mirrors' > {}" \;
-rm -rvf $RPM_BUILD_ROOT/etc/apparmor.d
-
-# why does these end there ???
-# also configure.mk got wrong contents
-mv $RPM_BUILD_ROOT/usr/games $RPM_BUILD_ROOT/usr/bin
# throw away src:quake stuff for now
+rm -rvf $RPM_BUILD_ROOT/etc/apparmor.d
rm -v $RPM_BUILD_ROOT/usr/bin/etqw*
rm -v $RPM_BUILD_ROOT/usr/bin/quake*
-rm -vr $RPM_BUILD_ROOT/usr/lib
+rm -vrf $RPM_BUILD_ROOT/usr/lib32
+rm -vrf $RPM_BUILD_ROOT/usr/lib64
rm -v $RPM_BUILD_ROOT/usr/share/applications/etqw.desktop
rm -v $RPM_BUILD_ROOT/usr/share/applications/quake*.desktop
-rm -rv $RPM_BUILD_ROOT/usr/share/games/game-data-packager-runtime/
-rm -rv $RPM_BUILD_ROOT/usr/share/games/quake*
+rm -rv $RPM_BUILD_ROOT/usr/share/game-data-packager-runtime/
+rm -rv $RPM_BUILD_ROOT/usr/share/quake*
rm -rv $RPM_BUILD_ROOT/usr/share/icons
rm -v $RPM_BUILD_ROOT/usr/share/man/man6/etqw*.6
rm -v $RPM_BUILD_ROOT/usr/share/man/man6/quake*.6
@@ -109,7 +106,7 @@ rm -v $RPM_BUILD_ROOT/usr/share/man/man6/quake*.6
%config(noreplace) %attr(644, root, root) /etc/game-data-packager/*
/usr/bin/game-data-packager
/usr/share/bash-completion/completions/game-data-packager
-/usr/share/games/game-data-packager
+/usr/share/game-data-packager
%license COPYING
%files -n doom2-masterlevels
7 years, 5 months
[game-data-packager] changelog
by Alexandre Detiste
commit 940472fdbd157f5a17dd2d7f7aca367810ecdf19
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun Nov 6 10:17:17 2016 +0100
changelog
game-data-packager.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index 303043f..491f24e 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -120,6 +120,9 @@ rm -v $RPM_BUILD_ROOT/usr/share/man/man6/quake*.6
%license COPYING
%changelog
+* Sun Nov 06 2016 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 47-1
+- new upstream release
+
* Tue Oct 18 2016 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 46-1
- new experimental upstream release, don't push to F25/F24 etc...
7 years, 5 months
[game-data-packager] new upstream release
by Alexandre Detiste
commit 35e4ee51b9684eace29346b9ca15e0a854c885f5
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun Nov 6 10:15:45 2016 +0100
new upstream release
.gitignore | 1 +
game-data-packager.spec | 3 ++-
sources | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0466510..0d2573e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/game-data-packager_45.tar.xz
/game-data-packager_46.tar.xz
+/game-data-packager_47.tar.xz
diff --git a/game-data-packager.spec b/game-data-packager.spec
index da5c260..303043f 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -7,7 +7,7 @@
%endif
Name: game-data-packager
-Version: 46
+Version: 47
Release: 1%{?gver}%{?dist}
Summary: Installer for game data files
License: GPLv2 and GPLv2+
@@ -71,6 +71,7 @@ sed -i '/wolf3d/d' tests/integration.py
sed -i '/spear/d' tests/integration.py
%build
+%configure
make %{?_smp_mflags}
%check
diff --git a/sources b/sources
index 0cfdec3..6491879 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9249c68d9aedf9366b6cc9ea5292bf1f game-data-packager_46.tar.xz
+8dd20bdf3844593a5aea15e338ea9ec9 game-data-packager_47.tar.xz
7 years, 5 months
[smplayer] Weak deps is not working in RPMFusion packages
by Sérgio M. Basto
commit 70014e7ccd13a0fdd52fb69ab5312f52cf40f8fb
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Nov 6 09:06:13 2016 +0000
Weak deps is not working in RPMFusion packages
smplayer.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/smplayer.spec b/smplayer.spec
index deb3860..d15eac1 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -3,7 +3,7 @@ Version: 16.11.0
%global smtube_ver 16.7.2
%global smplayer_themes_ver 16.8.0
%global smplayer_skins_ver 15.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
@@ -43,7 +43,7 @@ BuildRequires: pkgconfig(Qt5WebKit)
# smplayer without mplayer is quite useless
Requires: mplayer-backend
Requires: hicolor-icon-theme
-Recommends: smtube
+Requires: smtube
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -63,7 +63,7 @@ Summary: YouTube browser for SMPlayer
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.smtube.org
-Recommends: smplayer
+Requires: smplayer
%description -n smtube
This is a YouTube browser for SMPlayer. You can browse, search
@@ -196,6 +196,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Sun Nov 06 2016 Sérgio Basto <sergio(a)serjux.com> - 16.11.0-2
+- Weak deps is not working in RPMFusion packages
+
* Sun Nov 06 2016 Sérgio Basto <sergio(a)serjux.com> - 16.11.0-1
- Update smplayer to 16.11.0 and themes to 16.8.0
7 years, 5 months
[moc] rebuild for libtimidity .so bump
by Leigh Scott
commit 09feacb594f3776542f04caf35fb782766e78ff3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Nov 6 08:18:57 2016 +0000
rebuild for libtimidity .so bump
moc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/moc.spec b/moc.spec
index 0b0f395..eebf8fc 100644
--- a/moc.spec
+++ b/moc.spec
@@ -10,7 +10,7 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.6
-Release: 0.13.alpha2%{?dist}
+Release: 0.14.alpha2%{?dist}
License: GPLv2+ and GPLv3+
URL: http://moc.daper.net
@@ -86,6 +86,9 @@ rm -f $RPM_BUILD_ROOT%_libdir/moc/decoder_plugins/*.la
%{_libdir}/%{name}/
%changelog
+* Sun Nov 06 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6-0.14.alpha2
+- rebuild for libtimidity .so bump
+
* Fri Aug 12 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 2.6-0.13.alpha2
- Filtering of private libraries
7 years, 5 months
[xorg-x11-drv-nvidia/f23] Improve previous workaround
by Nicolas Chauvet
commit e4897dd9b9bee1279a7684005c26ee8add7851cf
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Nov 6 08:45:09 2016 +0100
Improve previous workaround
xorg-x11-drv-nvidia.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 298e31e..b9a1411 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 367.57
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -126,6 +126,8 @@ Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
Requires: libglvnd%{_isa}
+# Try to avoid a race when the symlink is created before the target is present
+Requires(post): libglvnd%{_isa}
%description libs
This package provides the shared libraries for %{name}.
@@ -189,6 +191,7 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libGL.so*
#https://bugzilla.rpmfusion.org/show_bug.cgi?id=4303
#rm libEGL.so*
ln -s ../libglvnd/libGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libGL.so.1
+ln -s ../libglvnd/libGL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libGL.so.1.0.0
ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0
@@ -548,6 +551,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Sun Nov 06 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1:367.57-4
+- Improve previous workaround
+
* Tue Oct 25 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1:367.57-3
- Add workaround for EGL issue - rfbz#4303
7 years, 5 months
[smplayer] Clean trailing white spaces.
by Sérgio M. Basto
commit b164a6694c787f8af613a957fbc0131a102bdc38
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Nov 6 03:50:37 2016 +0000
Clean trailing white spaces.
smplayer.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/smplayer.spec b/smplayer.spec
index 343ce64..deb3860 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -1,6 +1,6 @@
Name: smplayer
Version: 16.11.0
-%global smtube_ver 16.7.2
+%global smtube_ver 16.7.2
%global smplayer_themes_ver 16.8.0
%global smplayer_skins_ver 15.2.0
Release: 1%{?dist}
@@ -58,7 +58,7 @@ 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 -n smtube
+%package -n smtube
Summary: YouTube browser for SMPlayer
Group: Applications/Multimedia
License: GPLv2+
@@ -97,8 +97,8 @@ popd
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
-# fix files which are not UTF-8
-iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog
+# fix files which are not UTF-8
+iconv -f Latin1 -t UTF-8 -o Changelog.utf8 Changelog
mv Changelog.utf8 Changelog
# change rcc binary
7 years, 5 months
