commit 851d32220624869a508aefa36b7159597b089ee5 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Aug 11 03:05:02 2019 +0100 Update to git20161101.9899d9c32689 .gitignore | 1 + pipelight.spec | 27 +++++++++++++++------------ sources | 2 +- update_silverlight_url.patch | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 13 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8e24064..ff5f6b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pipelight-0.2.8.tar.gz pipelight-0.2.8.2.tar.gz pipelight-selinux-0.3.1.tar.gz +/pipelight-0.2.8.2-git20161101-9899d9c32689.tar.gz diff --git a/pipelight.spec b/pipelight.spec index 684db22..2d69879 100644 --- a/pipelight.spec +++ b/pipelight.spec @@ -1,13 +1,14 @@ # Conditional for release and snapshot builds. Uncomment for release-builds. -%global rel_build 1 +#global rel_build 1 # General needed defines. -%global commit 792e7a4885a6311172f1c876fbe5e9b5b76aace7 +%global bburl https://bitbucket.org/mmueller2012/%{name}/ +%global commit 9899d9c32689643d6a2ce5bb4491c9f12ee3d988 %global install_dep_com 1e47c45d70972c111634cc2af7c577bf5eb20b2d %global shortcommit %(c=%{commit};echo ${c:0:12}) # Settings used for build from snapshots. -%{!?rel_build:%global commit_date 20140714} +%{!?rel_build:%global commit_date 20161101} %{!?rel_build:%global gitver git%{commit_date}-%{shortcommit}} %{!?rel_build:%global gitrel .git%{commit_date}.%{shortcommit}} %{?rel_build:%global gittar %{name}-%{version}.tar.gz} @@ -24,15 +25,15 @@ Name: pipelight Version: 0.2.8.2 -Release: 14%{?gitrel}%{?dist} +Release: 15%{?gitrel}%{?dist} Summary: NPAPI Wrapper Plugin for using Windows plugins in Linux browsers License: GPLv2+ or LGPLv2+ or MPLv1.1 -URL: https://bitbucket.org/mmueller2012/pipelight/ -%{?rel_build:Source0: %{url}get/v%{version}.tar.gz#/%{?gittar}} -%{!?rel_build:Source0: %{url}get/%{shortcommit}.tar.gz#/%{?gittar}} +URL: http://%{name}.net/ +%{?rel_build:Source0: %{bburl}get/v%{version}.tar.gz#/%{?gittar}} +%{!?rel_build:Source0: %{bburl}get/%{shortcommit}.tar.gz#/%{?gittar}} Source1: https://github.com/besser82/pipelight-selinux/archive/v0.3.1.tar.gz#/pipe... -Source2: https://bitbucket.org/mmueller2012/pipelight/raw/%{install_dep_com}/share... +Patch1: update_silverlight_url.patch # Wine is available on these arches, only. ExclusiveArch: %{arm} %{ix86} x86_64 @@ -109,7 +110,7 @@ BuildArch: noarch BuildRequires: %{_bindir}/checkmodule BuildRequires: selinux-policy-doc -BuildRequires: %{_sbindir}/hardlink +BuildRequires: hardlink BuildRequires: selinux-policy-devel Requires: %{name} == %{version}-%{release} @@ -137,8 +138,7 @@ This package contains the SELinux-policy-module for %{name}. %prep -%setup -qn mmueller2012-%{name}-%{shortcommit} -a 1 -cat %{SOURCE2} > share/install-dependency +%autosetup -p1 -n mmueller2012-%{name}-%{shortcommit} -a 1 %build @@ -183,7 +183,7 @@ pushd pipelight-selinux-0.3.1 %{__install} -pm 644 %{name}.pp.${_selinuxvariant} \ %{buildroot}%{_datadir}/selinux/${_selinuxvariant}/%{name}.pp done - %{_sbindir}/hardlink -cv %{buildroot}%{_datadir}/selinux + hardlink -cv %{buildroot}%{_datadir}/selinux popd @@ -257,6 +257,9 @@ fi %changelog +* Sun Aug 11 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 0.2.8.2-15.git20161101.9899d9c32689 +- Update to git20161101.9899d9c32689 + * Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.2.8.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2ccc03a..64ed945 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -741de28588536db082c40b6f6162d623 pipelight-0.2.8.2.tar.gz +7bc6192427abe1f21e38b537305c8077 pipelight-0.2.8.2-git20161101-9899d9c32689.tar.gz 823f468b079e7d904c0b1d5319989da8 pipelight-selinux-0.3.1.tar.gz diff --git a/update_silverlight_url.patch b/update_silverlight_url.patch new file mode 100644 index 0000000..ac560f1 --- /dev/null +++ b/update_silverlight_url.patch @@ -0,0 +1,17 @@ +diff --git a/share/install-dependency b/share/install-dependency +index ab36ee4..072feb2 100755 +--- a/share/install-dependency ++++ b/share/install-dependency +@@ -910,9 +910,9 @@ while [ $# -gt 0 ] ; do + SHA="dd45a55419026c592f8b6fc848dceface7e1ce98720bf13848a2e8ae366b29e8" + ;; + wine-silverlight5.1-installer) # http://www.microsoft.com/getsilverlight/locale/en-us/html/Microsoft%20Sil... +- INS=(install_silverlight "5.1.41212.0" "latest") +- URL="http://download.microsoft.com/download/5/3/D/53D3880B-25F8-4714... +- SHA="af2d435a034e03c2940a648291013ebd9de20d855447dbdb93416e7e03c3e91b" ++ INS=(install_silverlight "5.1.50907.0" "latest") ++ URL="https://download.microsoft.com/download/F/D/0/FD0B0093-DE8A-4C4... ++ SHA="88e1b76bdf799478a72fa27db0bfe7bc5d02cc7e53675967399300448f0e266f" + ;; + wine-flash-installer) # http://www.adobe.com/de/software/flash/about/ + INS=(install_flash "23_0_0_205")