[rfpkg] Fix python2 shebang in python3 build
by Leigh Scott
commit 435b2065830c36785d60ff828f348d5368ddd301
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 26 20:15:20 2019 +0000
Fix python2 shebang in python3 build
rfpkg.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index 674e70d..2c66da4 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -5,7 +5,7 @@
Name: rfpkg
Version: 1.25.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: RPM Fusion utility for working with dist-git
License: GPLv2+
Group: Applications/System
@@ -103,7 +103,6 @@ RPM Fusion utility for working with dist-git.
%py2_install
sed -e 's|^#!python|#!%{__python2}|g' -i $RPM_BUILD_ROOT%{_bindir}/rfpkg
-sed -e 's|^#!python|#!%{__python2}|g' -i $RPM_BUILD_ROOT%{python2_sitelib}/rfpkg/__main__.py
chmod a+x $RPM_BUILD_ROOT%{python2_sitelib}/rfpkg/__main__.py
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -116,7 +115,7 @@ mv $RPM_BUILD_ROOT%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
%py3_install
sed -e 's|^#!python|#!%{__python3}|g' -i $RPM_BUILD_ROOT%{_bindir}/rfpkg
-sed -e 's|^#!python|#!%{__python3}|g' -i $RPM_BUILD_ROOT%{python3_sitelib}/rfpkg/__main__.py
+sed -e 's|^#!/usr/bin/python2|#!%{__python3}|g' -i $RPM_BUILD_ROOT%{python3_sitelib}/rfpkg/__main__.py
chmod a+x $RPM_BUILD_ROOT%{python3_sitelib}/rfpkg/__main__.py
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -144,6 +143,9 @@ install -p -m 0644 rfpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
%changelog
+* Tue Mar 26 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.25.6-3
+- Fix python2 shebang in python3 build
+
* Tue Mar 26 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.25.6-2
- Switch to python3 for f30
5 years, 8 months
[rfpkg] Add requires and Buildrequires python3-future
by Leigh Scott
commit 095081948c34ec7b7ae3bead6c6f5d4936003e6c
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 26 19:52:15 2019 +0000
Add requires and Buildrequires python3-future
rfpkg.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index 2d438fb..674e70d 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -56,6 +56,7 @@ Requires: packagedb-cli > 2.2
%global __python %{__python3}
BuildRequires: python3-devel
+BuildRequires: python3-future
BuildRequires: python3-setuptools
BuildRequires: python3-setuptools pkgconfig
@@ -72,6 +73,7 @@ Requires: python3-rpkg
Requires: redhat-rpm-config
Requires: python3-pycurl
Requires: python3-fedora
+Requires: python3-future
Requires: python3-rpmfusion-cert
Requires: rpmfusion-packager >= 0.6.3-2
Requires: bodhi-client
5 years, 8 months
[rfpkg/f29] Patch F30 to use python3
by Leigh Scott
Summary of changes:
b17af39... Patch F30 to use python3 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months
[rfpkg] Patch F30 to use python3
by Leigh Scott
commit b17af3977507b0cb03266d4b5af6b38dce61b69d
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 26 19:22:46 2019 +0000
Patch F30 to use python3
py3.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
rfpkg.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 160 insertions(+), 13 deletions(-)
---
diff --git a/py3.patch b/py3.patch
new file mode 100644
index 0000000..2a2f45c
--- /dev/null
+++ b/py3.patch
@@ -0,0 +1,84 @@
+--- a/src/rfpkg/__init__.py
++++ b/src/rfpkg/__init__.py
+@@ -1,3 +1,4 @@
++from __future__ import absolute_import
+ # rfpkg - a Python library for RPM Packagers
+ #
+ # Copyright (C) 2011 Red Hat Inc.
+@@ -10,15 +11,17 @@
+ # option) any later version. See http://www.gnu.org/copyleft/gpl.html for
+ # the full text of the license.
+
++from future import standard_library
++standard_library.install_aliases()
+ import pyrpkg
+ import os
+-import cli
++from . import cli
+ import git
+ import re
+ import rpmfusion_cert
+ import platform
+ import subprocess
+-import urlparse
++import urllib.parse
+ import koji
+
+
+@@ -97,7 +100,7 @@
+ except:
+ self._kojiprofile = self._orig_kojiprofile
+ return
+- for arch in self.secondary_arch.keys():
++ for arch in list(self.secondary_arch.keys()):
+ if self.repo_name in self.secondary_arch[arch]:
+ self._kojiprofile = arch
+ return
+@@ -125,7 +128,7 @@
+ """Loads a RPM Fusion package repository."""
+
+ if self.push_url:
+- parts = urlparse.urlparse(self.push_url)
++ parts = urllib.parse.urlparse(self.push_url)
+
+ if self.distgit_namespaced:
+ path_parts = [p for p in parts.path.split("/") if p]
+--- a/src/rfpkg/__main__.py
++++ b/src/rfpkg/__main__.py
+@@ -10,6 +10,7 @@
+ # option) any later version. See http://www.gnu.org/copyleft/gpl.html for
+ # the full text of the license.
+
++from __future__ import print_function
+ import os
+ import sys
+ import logging
+--- a/src/rfpkg/cli.py
++++ b/src/rfpkg/cli.py
+@@ -1,3 +1,4 @@
++from __future__ import print_function
+ # cli.py - a cli client class module for rfpkg
+ #
+ # Copyright (C) 2011 Red Hat Inc.
+@@ -19,7 +19,7 @@
+ import textwrap
+ import hashlib
+
+-import pkgdb2client
++import rfpkgdb2client
+
+
+ class rfpkgClient(cliClient):
+@@ -78,8 +78,8 @@
+ self.push()
+
+ branch = self.cmd.branch_merge
+- pkgdb = pkgdb2client.PkgDB(
+- login_callback=pkgdb2client.ask_password, url="https://admin.rpmfusion.org/pkgdb")
++ pkgdb = rfpkgdb2client.PkgDB(
++ login_callback=rfpkgdb2client.ask_password, url="https://admin.rpmfusion.org/pkgdb")
+ pkgdb.retire_packages(repo_name, branch, namespace=namespace)
+ except Exception as e:
+ self.log.error('Could not retire package: %s' % e)
+
+
diff --git a/rfpkg.spec b/rfpkg.spec
index 10f131d..2d438fb 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -5,55 +5,100 @@
Name: rfpkg
Version: 1.25.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: RPM Fusion utility for working with dist-git
License: GPLv2+
Group: Applications/System
URL: https://github.com/rpmfusion-infra/rfpkg
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: py3.patch
BuildArch: noarch
+
+# fedpkg command switched to python3 on Fedora 30 and RHEL > 8:
+%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
+BuildRequires: bash-completion
+BuildRequires: git
+
+Requires: bodhi-client
+Requires: redhat-rpm-config
+Requires: koji
+
+%if %{with python2}
+# This package redefines __python and can use the python_ macros
+%global __python %{__python2}
+
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-setuptools pkgconfig
-
# We br these things for man page generation due to imports
BuildRequires: rpmfusion-cert
BuildRequires: packagedb-cli > 2.2
BuildRequires: pyrpkg >= 1.44
-BuildRequires: bash-completion
-
# For testing
BuildRequires: python-nose
BuildRequires: python-mock
-BuildRequires: git
Requires: pyrpkg >= 1.45
-Requires: redhat-rpm-config
Requires: python-pycurl
-requires: koji
Requires: python-fedora
Requires: rpmfusion-cert
Requires: rpmfusion-packager >= 0.6.1
-Requires: bodhi-client
Requires: packagedb-cli > 2.2
-%if 0%{?rhel} == 5 || 0%{?rhel} == 4
-Requires: python-kitchen
-%endif
+%else # python3
+# This package redefines __python and can use the python_ macros
+%global __python %{__python3}
+
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-setuptools pkgconfig
+
+# We br these things for man page generation due to imports
+BuildRequires: python3-rpmfusion-cert
+BuildRequires: rfpkgdb-cli
+BuildRequires: python3-rpkg
+
+# For testing
+BuildRequires: python3-nose
+BuildRequires: python3-mock
+
+Requires: python3-rpkg
+Requires: redhat-rpm-config
+Requires: python3-pycurl
+Requires: python3-fedora
+Requires: python3-rpmfusion-cert
+Requires: rpmfusion-packager >= 0.6.3-2
+Requires: bodhi-client
+Requires: rfpkgdb-cli
+%endif
%description
RPM Fusion utility for working with dist-git.
%prep
%setup -q
+%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+%patch0 -p1
+%endif
%build
-%{__python2} setup.py build
+%if %{with python2}
+%py2_build
%{__python2} src/rfpkg_man_page.py > rfpkg.1
+%else
+%py3_build
+%{__python3} src/rfpkg_man_page.py > rfpkg.1
+%endif
%install
-%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%if %{with python2}
+%py2_install
sed -e 's|^#!python|#!%{__python2}|g' -i $RPM_BUILD_ROOT%{_bindir}/rfpkg
sed -e 's|^#!python|#!%{__python2}|g' -i $RPM_BUILD_ROOT%{python2_sitelib}/rfpkg/__main__.py
@@ -65,14 +110,29 @@ install -p -m 0644 rfpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
# The completion file must be named similarly to the command.
mv $RPM_BUILD_ROOT%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
%endif
+%else
+%py3_install
+
+sed -e 's|^#!python|#!%{__python3}|g' -i $RPM_BUILD_ROOT%{_bindir}/rfpkg
+sed -e 's|^#!python|#!%{__python3}|g' -i $RPM_BUILD_ROOT%{python3_sitelib}/rfpkg/__main__.py
+chmod a+x $RPM_BUILD_ROOT%{python3_sitelib}/rfpkg/__main__.py
+
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 0644 rfpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%endif
%files
%doc README
%license COPYING
%{_bindir}/rfpkg
+%if %{with python2}
%{python2_sitelib}/rfpkg/
%{python2_sitelib}/rfpkg-%{version}-py%{python2_version}.egg-info/
+%else
+%{python3_sitelib}/rfpkg/
+%{python3_sitelib}/rfpkg-%{version}-py%{python3_version}.egg-info/
+%endif
%{_mandir}/man1/rfpkg.1*
%(dirname %{compdir})
%dir %{_sysconfdir}/rpkg
@@ -82,6 +142,9 @@ mv $RPM_BUILD_ROOT%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
%changelog
+* Tue Mar 26 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.25.6-2
+- Switch to python3 for f30
+
* Mon Sep 03 2018 Sérgio Basto <sergio(a)serjux.com> - 1.25.6-1
- Update to 1.25.6 Fix new warnings of rpkg modules are deprecated
5 years, 8 months
[vlc] Drop projectm support
by Nicolas Chauvet
commit e59a2b2857e7271216fa3c58cd588da050b19f6e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Mar 26 18:30:41 2019 +0100
Drop projectm support
vlc.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 73d30c2..3bb1ac3 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -31,7 +31,6 @@
%global _with_aom 1
%global _with_dav1d 1
%global _with_freerdp 1
-%global _with_projectm 1
%global _with_schroedinger 1
%global _with_wayland 1
%endif
@@ -44,7 +43,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.6
-Release: 23%{?dist}
+Release: 24%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -545,6 +544,9 @@ fi || :
%changelog
+* Tue Mar 26 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.6-24
+- Drop projectm until fixed
+
* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com> - 1:3.0.6-23
- Mass rebuild for x264
5 years, 8 months
[rfpkgdb-cli] Initial Package
by Leigh Scott
commit 03ff7a1209c2810011fc2825bce44444395f478b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 26 15:08:46 2019 +0000
Initial Package
.gitignore | 1 +
py3.patch | 29 +++++++++++++++++++++++++++
rfpkgdb-cli.spec | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 91 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..914b788 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/rfpkgdb-cli-2.15.0rc2.tar.gz
diff --git a/py3.patch b/py3.patch
new file mode 100644
index 0000000..f3e052d
--- /dev/null
+++ b/py3.patch
@@ -0,0 +1,29 @@
+--- a/rfpkgdb2client/utils.py
++++ b/rfpkgdb2client/utils.py
+@@ -26,7 +29,7 @@
+
+ import requests
+ import rpmfusion_cert
+-import xmlrpclib
++import xmlrpc.client
+
+ from bugzilla import Bugzilla
+ from fedora.client import AccountSystem, AuthError
+@@ -53,7 +56,7 @@
+
+ try:
+ BZCLIENT.logged_in
+- except xmlrpclib.Error:
++ except xmlrpc.client.Error:
+ bz_login()
+
+ return BZCLIENT
+@@ -76,7 +79,7 @@
+ print('To keep going, we need to authenticate against bugzilla'
+ ' at {0}'.format(BZCLIENT.url))
+
+- username = raw_input("Bugzilla user: ")
++ username = input("Bugzilla user: ")
+ password = getpass.getpass("Bugzilla password: ")
+ BZCLIENT.login(username, password)
+
diff --git a/rfpkgdb-cli.spec b/rfpkgdb-cli.spec
new file mode 100644
index 0000000..9b5ad97
--- /dev/null
+++ b/rfpkgdb-cli.spec
@@ -0,0 +1,60 @@
+Name: rfpkgdb-cli
+Version: 2.15.0
+Release: 0.1rc2%{?dist}
+Summary: A CLI for pkgdb
+
+License: GPLv2+
+URL: https://github.com/ferdnyc/rfpkgdb-cli
+Source0: %{url}/archive/v%{version}rc2/%{name}-%{version}rc2.tar.gz
+Patch0: py3.patch
+
+BuildArch: noarch
+
+
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-fedora
+BuildRequires: python3-bugzilla
+BuildRequires: koji
+
+
+Requires(post): python3-fedora
+Requires(post): python3-requests
+Requires: python3-bugzilla
+Requires: python3-koji
+Requires: python3-beautifulsoup4
+Requires: python3-setuptools
+Requires: python3-rpmfusion-cert
+
+%description
+rfpkgdb-cli is a command line interface for the
+packagedb of the Rpmfusion project.
+
+It allows you to manage the ACL for your packages as well
+as requesting new ACL for new packages.
+It also allows you to orphan and/or retire your package(s).
+
+%prep
+%autosetup -p1 -n %{name}-%{version}rc2
+
+
+%build
+%py3_build
+
+
+%install
+%py3_install
+
+
+%files
+%doc README.rst LICENSE
+%{python3_sitelib}/rfpkgdb2client/
+%{python3_sitelib}/rfpkgdb_cli*.egg-info
+%{_bindir}/rfpkgdb-cli
+%{_bindir}/rfpkgdb-admin
+
+
+%changelog
+* Tue Mar 26 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 2.15.0-0.1rc2
+- Initial Package
+
diff --git a/sources b/sources
index e69de29..3a26550 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+834abe731a42b6bfb886b754f4756de1 rfpkgdb-cli-2.15.0rc2.tar.gz
5 years, 8 months
[chromium-vaapi] Fix date in changelog.
by Akarshan Biswas
commit e95373046d12c8ab7097a9b96ac7ed643fd78ca4
Author: vmuser <vmuser(a)vmfedora.biswasab.org>
Date: Tue Mar 26 18:36:57 2019 +0530
Fix date in changelog.
chromium-vaapi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index f4f286f..70226a0 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -691,7 +691,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
-* Fri Mar 26 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> - 73.0.3683.86-2
+* Tue Mar 26 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> - 73.0.3683.86-2
- Switched to GNU ar and nm to work around a bug in the current llvm in f30 #rhbz 1685029
- Pipewire flag added to enable it by default on Fedora
5 years, 8 months
[chromium-vaapi] Switched to GNU ar and nm to work around a bug in the current llvm in f30 #rhbz 1685029 Pipewire fla
by Akarshan Biswas
commit 27d814154739af17034354b1052b5af9c184ca42
Author: vmuser <vmuser(a)vmfedora.biswasab.org>
Date: Tue Mar 26 18:12:20 2019 +0530
Switched to GNU ar and nm to work around a bug in the current llvm in f30 #rhbz 1685029
Pipewire flag added to enable it by default on Fedora
chromium-vaapi.sh | 1 +
chromium-vaapi.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/chromium-vaapi.sh b/chromium-vaapi.sh
index eb017a5..12770d7 100644
--- a/chromium-vaapi.sh
+++ b/chromium-vaapi.sh
@@ -56,6 +56,7 @@ exec 2> >(exec cat >&2)
CHROMIUM_DISTRO_FLAGS+=" --enable-plugins \
--enable-extensions \
--enable-user-scripts \
+ --enable-features=WebRTCPipeWireCapturer \
--enable-printing \
--enable-gpu-rasterization \
--enable-sync"
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 9e37c54..f4f286f 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -68,7 +68,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 73.0.3683.86
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -489,7 +489,11 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{name}"/' $FILE
#####################################BUILD#############################################
%build
#export compilar variables
+%if 0%{?fedora} > 29
+export AR=ar NM=nm
+%else
export AR=llvm-ar NM=llvm-nm AS=llvm-as
+%endif
export CC=clang CXX=clang++
%if %{fedora_compilation_flags}
#Build flags to make hardened binaries
@@ -687,6 +691,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Fri Mar 26 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> - 73.0.3683.86-2
+- Switched to GNU ar and nm to work around a bug in the current llvm in f30 #rhbz 1685029
+- Pipewire flag added to enable it by default on Fedora
+
* Fri Mar 22 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 73.0.3683.86-1
- Update to 73.0.3683.86
5 years, 8 months
