[chromium-freeworld: 1/4] Be explicit about the Python version used
by Miro Hrončok
commit cdad6219176a761555ddcc13017f3e5d88fc16de
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Thu Mar 29 14:45:36 2018 +0200
Be explicit about the Python version used
chromium.spec | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 8bbca8a..6484099 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -416,13 +416,21 @@ BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtk+-2.0)
%endif
BuildRequires: pulseaudio-libs-devel
-BuildRequires: python2
+BuildRequires: python2-devel
+%if 0%{?fedora} > 27
+BuildRequires: python2-beautifulsoup4
+BuildRequires: python2-beautifulsoup
+BuildRequires: python2-html5lib
+BuildRequires: python2-markupsafe
+BuildRequires: python2-ply
+%else
BuildRequires: python-beautifulsoup4
BuildRequires: python-BeautifulSoup
BuildRequires: python-html5lib
BuildRequires: python-markupsafe
BuildRequires: python-ply
-BuildRequires: python-simplejson
+%endif
+BuildRequires: python2-simplejson
%if 0%{?bundlere2}
# Using bundled bits, do nothing.
%else
@@ -740,6 +748,10 @@ udev.
%patch87 -p1 -b .epel7
%endif
+# Change shebang in all relevant files in this directory and all subdirectories
+# See `man find` for how the `-exec command {} +` syntax works
+find -type f -exec sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
+
%if 0%{?asan}
export CC="clang"
export CXX="clang++"
@@ -1069,8 +1081,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
# Look, I don't know. This package is spit and chewing gum. Sorry.
rm -rf third_party/markupsafe
-ln -s %{python_sitearch}/markupsafe third_party/markupsafe
-# We should look on removing other python packages as well i.e. ply
+ln -s %{python2_sitearch}/markupsafe third_party/markupsafe
+# We should look on removing other python2 packages as well i.e. ply
# Fix hardcoded path in remoting code
sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/daemon_controller_delegate_linux.cc
@@ -1145,8 +1157,8 @@ sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|
%endif
# Check that there is no system 'google' module, shadowing bundled ones:
-if python -c 'import google ; print google.__path__' 2> /dev/null ; then \
- echo "Python 'google' module is defined, this will shadow modules of this build"; \
+if python2 -c 'import google ; print google.__path__' 2> /dev/null ; then \
+ echo "Python 2 'google' module is defined, this will shadow modules of this build"; \
exit 1 ; \
fi
6 years
[chromium-freeworld: 3/3] Merge Fedora, chromium-65.0.3325.181-2
by Miro Hrončok
commit 0476e61328541de35e675fba3e8296052a2c39da
Merge: 963e034 11492d0
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Apr 24 11:11:42 2018 +0200
Merge Fedora, chromium-65.0.3325.181-2
chromium-freeworld.spec | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
---
6 years
[chromium-freeworld: 2/3] add explicit dependency on minizip (bz 1534282)
by Miro Hrončok
commit 11492d003030b34ed8a8dd57b3845d97ee051c7d
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Apr 4 11:22:06 2018 -0400
add explicit dependency on minizip (bz 1534282)
chromium.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 4f76103..8bbca8a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -134,7 +134,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3325.181
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -584,6 +584,9 @@ Chromium is an open-source web browser, powered by WebKit (Blink).
%package common
Summary: Files needed for both the headless_shell and full Chromium
+# Chromium needs an explicit Requires: minizip
+# We put it here to cover headless too.
+Requires: minizip%{_isa}
%description common
%{summary}.
@@ -1614,6 +1617,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Apr 4 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.181-2
+- add explicit dependency on minizip (bz 1534282)
+
* Wed Mar 28 2018 Tom Callaway <spot(a)fedoraproject.org>
- check that there is no system 'google' module, shadowing bundled ones
- conditionalize api keys (on by default)
6 years
[chromium-freeworld: 1/3] check that there is no system google module, shadowing bundled ones :: conditionalize api keys (on b
by Miro Hrončok
commit 6588e7bdd3acbad84209cd63daa4fe7738d2858a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Mar 28 10:01:28 2018 -0400
check that there is no system google module, shadowing bundled ones :: conditionalize api keys (on by default)
chromium.spec | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
---
diff --git a/chromium.spec b/chromium.spec
index 845e712..4f76103 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -6,6 +6,10 @@
%global lsuffix fedora
%endif
+# Some people wish not to use the Fedora Google API keys. Mmkay.
+# Expect stuff to break in weird ways if you disable.
+%global useapikeys 1
+
# Leave this alone, please.
%global target out/Release
%global headlesstarget out/Headless
@@ -110,10 +114,17 @@ BuildRequires: libicu-devel >= 5.4
### Note: These are for Fedora use ONLY.
### For your own distribution, please get your own set of keys.
### http://lists.debian.org/debian-legal/2013/11/msg00006.html
+%if %{useapikeys}
%global api_key AIzaSyDUIXvzVrt5OkVsgXhQ6NFfvWlA44by-aw
%global default_client_id 449907151817.apps.googleusercontent.com
%global default_client_secret miEreAep8nuvTdvLums6qyLK
%global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com
+%else
+%global api_key %nil
+%global default_client_id %nil
+%global default_client_secret %nil
+%global chromoting_client_id %nil
+%endif
%global majorversion 65
@@ -1130,6 +1141,12 @@ sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|
. /opt/rh/devtoolset-7/enable
%endif
+# Check that there is no system 'google' module, shadowing bundled ones:
+if python -c 'import google ; print google.__path__' 2> /dev/null ; then \
+ echo "Python 'google' module is defined, this will shadow modules of this build"; \
+ exit 1 ; \
+fi
+
tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
%{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}
@@ -1597,6 +1614,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Mar 28 2018 Tom Callaway <spot(a)fedoraproject.org>
+- check that there is no system 'google' module, shadowing bundled ones
+- conditionalize api keys (on by default)
+
* Wed Mar 21 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.181-1
- update to 65.0.3325.181
6 years
[mplayer/f28] Update to latest svn
by Leigh Scott
Summary of changes:
8f319e0... Update to latest svn (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[mplayer] Update to latest svn
by Leigh Scott
commit 8f319e09b344038b4dc48dfbe1f7759827c5bd92
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Apr 24 08:45:35 2018 +0100
Update to latest svn
.gitignore | 1 +
mplayer-snapshot.sh | 2 +-
mplayer.spec | 11 +++++++----
sources | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58f1b5e..76e5778 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
Blue-1.11.tar.bz2
MPlayer-1.3.0.tar.xz
/mplayer-export-2018-01-19.tar.bz2
+/mplayer-export-2018-04-24.tar.bz2
diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh
index f7fc3f8..7155246 100755
--- a/mplayer-snapshot.sh
+++ b/mplayer-snapshot.sh
@@ -13,7 +13,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-svn=2018-01-19
+svn=2018-04-24
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
diff --git a/mplayer.spec b/mplayer.spec
index 8dce242..9c0c8ce 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -1,15 +1,15 @@
%define codecdir %{_libdir}/codecs
-%define pre 20180119svn
+%define pre 20180424svn
%define svn 1
-%define svnbuild 2018-01-19
+%define svnbuild 2018-04-24
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 21.%{?pre}%{?dist}
+Release: 22.%{?pre}%{?dist}
%else
-Release: 21%{?dist}
+Release: 22%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -372,6 +372,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir}
%{_datadir}/mplayer/*.fp
%changelog
+* Tue Apr 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-22.20180424svn
+- Update to latest svn
+
* Tue Apr 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-21.20180119svn
- Rebuild for ffmpeg-4.0 release
diff --git a/sources b/sources
index 535cb24..810cf36 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2
-72d9ed506f0273a8943d5d02d5e79a82 mplayer-export-2018-01-19.tar.bz2
+5d7574ce1eb48775ae652bcd9d0677b0 mplayer-export-2018-04-24.tar.bz2
6 years
[pithos] Fix missing requires (rfbz#4854)
by Leigh Scott
commit 773b4481b4413c9c0c7e8dc75167b9bba1acee96
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Apr 24 08:17:06 2018 +0100
Fix missing requires (rfbz#4854)
pithos.spec | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/pithos.spec b/pithos.spec
index fe3fb0c..3ee9b89 100644
--- a/pithos.spec
+++ b/pithos.spec
@@ -4,7 +4,7 @@
Name: pithos
Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A Pandora client for the GNOME Desktop
Group: Applications/Multimedia
@@ -16,10 +16,15 @@ Source0: https://github.com/pithos/pithos/releases/download/%{version}/pi
BuildArch: noarch
BuildRequires: python3-devel >= 3.4
BuildRequires: meson >= 0.40.0
-BuildRequires: glib2-devel gdk-pixbuf2-devel libappstream-glib gettext
-
-Requires: gtk3 libsecret
-Requires: python3-gobject python3-cairo
+BuildRequires: glib2-devel
+BuildRequires: gdk-pixbuf2-devel
+BuildRequires: libappstream-glib
+BuildRequires: gettext
+
+Requires: gtk3
+Requires: libsecret
+Requires: python3-gobject-base
+Requires: python3-cairo
Requires: hicolor-icon-theme
# HTTP support
Requires: gstreamer1-plugins-good
@@ -58,18 +63,6 @@ rm -rf %{buildroot}%{_datadir}/icons/ubuntu*
%check
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc README.md
%license license
@@ -85,6 +78,11 @@ fi
%{_mandir}/man1/%{name}.1.gz
%changelog
+* Tue Apr 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.4.1-3
+- Fix missing requires (rfbz#4854)
+- Remove obsolete scriptlets
+- Cleanup spec file
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years