commit c617ad765307e61493af4e11d8824480d4f932ec Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Mar 3 16:14:17 2024 +0000 epel8 can't have libayatana-appindicator epel8 is not possible: https://github.com/AyatanaIndicators/ayatana-ido/blob/main/CMakeLists.txt... set(DEPS glib-2.0>=2.58 gtk+-3.0>=3.24) README | 2 +- check_new_version.py | 40 +++++++++++++--------------------------- lpf-spotify-client.spec | 48 +----------------------------------------------- spotify-client.spec.in | 49 +++---------------------------------------------- 4 files changed, 18 insertions(+), 121 deletions(-) --- diff --git a/README b/README index 37aad35..fd3ee93 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ lpf-spotify-client README ========================= -This is an lpf package. Its only use is to install another package, +This is a lpf package. It's only use is to install another package, called the target package. For lpf-spotify-client, the target package is spotify-client. diff --git a/check_new_version.py b/check_new_version.py index cb7df8b..d9af164 100755 --- a/check_new_version.py +++ b/check_new_version.py @@ -14,24 +14,12 @@ def runme(cmd, env, cwd='.'): being operated on, env is the environment dict, and cwd is where the script should be executed from.""" try: - subprocess.check_call(cmd, env=env, cwd=cwd, stderr=subprocess.PIPE) + subprocess.check_call(cmd, env=env, cwd=cwd) #, stderr=None except subprocess.CalledProcessError as e: sys.stderr.write('%s failed: %s\n' % (cmd, e)) return 1 return 0 -text = "cat spotify-client.spec.in | grep ^Version" -texts = text.split('|') -text0 = texts[0].strip().split(' ') -#print(text0) -text1 = texts[1].strip().split(' ') -#print(text1) - -ps1 = subprocess.run(text0, check=True, capture_output=True) -#print("Current %s" % ps1.stdout.decode()) -ps2 = subprocess.run(text1, input=ps1.stdout, capture_output=True) -print("Current %s" % ps2.stdout.decode().replace(" ", "").replace(":", ": ")) - html = requests.get('http://repository.spotify.com/pool/non-free/s/spotify-c... #print (html.text) @@ -41,12 +29,11 @@ res = str_mx.findall(html.text) res2 = str_mx2.findall(html.text) deb32 = res[-1] deb64 = res2[-1] -regexp = re.compile('spotify-client_(\d{1,2}[.]\d{1,2}[.]\d{1,3}[.]\d{1,4})([.].*)') -(version64, minor64) = regexp.findall(deb64)[0] -#print ("deb64 = %s\nVersions: %s %s" % (deb64, version64, minor64)) +regexp = re.compile('spotify-client_(\d{1,2}[.]\d{1,2}[.]\d{1,3}[.]\d{1,3})([.].*)') (version32, minor32) = regexp.findall(deb32)[0] -#print ("Versions: %s %s %s\n" % (deb32, version32, minor32)) -print ("Latest Versions: %s and i686 version %s \n" % (version64, version32)) +(version64, minor64) = regexp.findall(deb64)[0] +print ("deb64 = %s\nVersions: %s %s" % (deb64, version64, minor64)) +print ("deb32 = %s\nVersions: %s %s" % (deb32, version32, minor32)) spec = open('spotify-client.spec.in').read() #print (spec) @@ -70,14 +57,13 @@ if spec != spec3: if runme(pkgcmd, enviro): print('error running runme') - print("New version available! ACTION REQUIRED !!!\n\n") - print('rfpkg mockbuild -N --default-mock-resultdir --root fedora-38-x86_64-rpmfusion_nonfree') + print('rfpkg ci -c && git show') + print('rfpkg srpm && mock -r fedora-31-x86_64-rpmfusion_nonfree --no-clean --rebuild lpf-spotify-client-%s-1.fc33.src.rpm' + % version64) else: - print("Already updated ! no Action required\n\n") + print("Already updated !") -print('rfpkg ci -c && git show && echo Press enter to push and build; read dummy; rfpkg push && rfpkg build --nowait') -print('git checkout f39 && git merge master && git push && rfpkg build --nowait; git checkout master') -print('git checkout f38 && git merge master && git push && rfpkg build --nowait; git checkout master') -print('git checkout f37 && git merge master && git push && rfpkg build --nowait; git checkout master') -print('git checkout el9 && git merge master && git push && rfpkg build --nowait; git checkout master') -print('git checkout el8 && git merge master && git push && rfpkg build --nowait; git checkout master') +print('git show && echo Press enter to push and build; read dummy; rfpkg push && rfpkg build --nowait') +print('git checkout f32 && git merge master && git push && rfpkg build --nowait; git checkout master') +print('git checkout f31 && git merge master && git push && rfpkg build --nowait; git checkout master') +print('git checkout f30 && git merge master && git push && rfpkg build --nowait; git checkout master') diff --git a/lpf-spotify-client.spec b/lpf-spotify-client.spec index 1e935a1..d4403bf 100644 --- a/lpf-spotify-client.spec +++ b/lpf-spotify-client.spec @@ -11,7 +11,7 @@ Name: lpf-spotify-client # Upstream spotify version, verbatim. -Version: 1.2.26.1187 +Version: 1.1.26.501 Release: 1%{?dist} Summary: Spotify music player native client package bootstrap @@ -79,52 +79,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog -* Mon Dec 18 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.26.1187-1 -- Update to 1.2.26.1187.g36b715a1 - -* Mon Oct 30 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.22.982-1 -- Update to 1.2.22.982.g794acc0a - -* Thu Aug 31 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.18.999-1 -- Update to 1.2.18.999.g9b38fc27 - -* Tue Jun 20 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.13.661-1 -- Update to 1.2.13.661.ga588f749 - -* Mon May 29 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.9.743-1 -- Update to 1.2.9.743.g85d9593d - -* Mon Apr 03 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.8.923-1 -- Update to 1.2.8.923.g4f94bf0d - -* Tue May 03 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.84.716-2 -- Update to 1.1.84.716.gc5f8b819-2 -- Exclude from provides all internal shared libraries - -* Tue May 03 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.84.716-1 -- Update to 1.1.84.716.gc5f8b819 - -* Sat Mar 26 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.80.699-1 -- Update to 1.1.80.699.gc3dac750 - -* Wed Nov 24 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.72.439-1 -- Update to 1.1.72.439.gc253025e - -* Sun Sep 26 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.68.632-1 -- Update to 1.1.68.632.g2b11de83 - -* Thu Sep 02 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.67.586-1 -- Update to 1.1.67.586.gbb5ef64e - -* Thu Apr 29 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.1.56.595-1 -- Update to 1.1.56.595.g2d2da0de - -* Tue Mar 23 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.55.498-1 -- Update to 1.1.55.498.gf9a83c60 - -* Fri Sep 18 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.42.622-1 -- Update to 1.1.42.622.gbd112320 - * Mon Apr 27 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.26.501-1 - Update to 1.1.26.501.gbe11e53b diff --git a/spotify-client.spec.in b/spotify-client.spec.in index 6f15311..ac4983a 100644 --- a/spotify-client.spec.in +++ b/spotify-client.spec.in @@ -13,7 +13,7 @@ Name: spotify-client -Version: 1.2.26.1187 +Version: 1.1.26.501 Release: 1%{?dist} Summary: Spotify music player native client @@ -27,7 +27,7 @@ ExclusiveArch: %{ix86} x86_64 Source0: spotify-make-%{shortcommit}.tar.gz %ifarch x86_64 -Source1: %{repo}/spotify-client_%{version}.g36b715a1_amd64.deb +Source1: %{repo}/spotify-client_%{version}.gbe11e53b-15_amd64.deb %global spotify_pkg %{SOURCE1} %global req_64 ()(64bit) %else @@ -49,7 +49,6 @@ Requires: libnssutil3.so%{?req_64} Requires: libnss3.so%{?req_64} Requires: python2 Requires: zenity -Requires: glibc-langpack-en Provides: spotify = %{version}-%{release} # https://lists.rpmfusion.org/pipermail/rpmfusion-developers/2012-November/... @@ -66,7 +65,7 @@ hard drive. # Bundled, we should not Provide these. Cannot use %%filter # due to BZ 873847. Instead, use builtin filtering: # http://rpm.org/wiki/PackagerDocs/DependencyGenerator -%global __provides_exclude_from ^%{_libdir}/spotify-client/.*[.]so|%{_datadir}/spotify-client/.*[.]so +%global __provides_exclude_from ^%{_libdir}/spotify-client/.*[.]so # Filter away the deps om bundled libs and those substituted # by symlinks and explicit Requires:. @@ -110,48 +109,6 @@ ln -s ../libcurl.so.4 libcurl-gnutls.so.4 %changelog -* Mon Dec 18 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.26.1187-1 -- Update to 1.2.26.1187.g36b715a1 - -* Mon Oct 30 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.22.982-1 -- Update to 1.2.22.982.g794acc0a - -* Thu Aug 31 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.18.999-1 -- Update to 1.2.18.999.g9b38fc27 - -* Tue Jun 20 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.13.661-1 -- Update to 1.2.13.661.ga588f749 - -* Mon May 29 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.9.743-1 -- Update to 1.2.9.743.g85d9593d - -* Mon Apr 03 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.8.923-1 -- Update to 1.2.8.923.g4f94bf0d - -* Tue May 03 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.84.716-1 -- Update to 1.1.84.716.gc5f8b819 - -* Sat Mar 26 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.80.699-1 -- Update to 1.1.80.699.gc3dac750 - -* Wed Nov 24 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.72.439-1 -- Update to 1.1.72.439.gc253025e - -* Sun Sep 26 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.68.632-1 -- Update to 1.1.68.632.g2b11de83 - -* Thu Sep 02 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.67.586-1 -- Update to 1.1.67.586.gbb5ef64e - -* Thu Apr 29 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.1.56.595-1 -- Update to 1.1.56.595.g2d2da0de - -* Tue Mar 23 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.55.498-1 -- Update to 1.1.55.498.gf9a83c60 - -* Fri Sep 18 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.42.622-1 -- Update to 1.1.42.622.gbd112320 - * Mon Apr 27 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.26.501-1 - Update to 1.1.26.501.gbe11e53b