[pipelight] update to new snapshot git20140713.d79c1202f857 obsoleted pipelight-0.2.7.1.1_improve-buildsys.patch
Björn Esser
besser82 at fedoraproject.org
Sun Jul 13 00:49:18 UTC 2014
commit 1d0e62a415c12f17260f1b992a82632f509aa255
Author: Björn Esser <bjoern.esser at gmail.com>
Date: Sun Jul 13 02:08:02 2014 +0200
update to new snapshot git20140713.d79c1202f857
obsoleted pipelight-0.2.7.1.1_improve-buildsys.patch
use signed updated install-dependency-script
exclude lib%%{name}*.so* from auto-provides
added / moved runtime-Requires between build packages,
Requires: wine(compholio), Requires(post) and Requires(preun)
fixed typo in %%changelog
.gitignore | 1 +
install-dependency | 1041 ----------------------------
pipelight-0.2.7.1.1_improve-buildsys.patch | 644 -----------------
pipelight.spec | 58 +-
sources | 3 +-
5 files changed, 37 insertions(+), 1710 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 090749b..f0b94ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
*.tar*
*.zip
results_*/
+/install-dependency.sig
diff --git a/pipelight.spec b/pipelight.spec
index d133571..35152b7 100644
--- a/pipelight.spec
+++ b/pipelight.spec
@@ -3,11 +3,11 @@
# General needed defines.
%global bburl https://bitbucket.org/mmueller2012/%{name}/
-%global commit 035fa4908b638e00f1bf84e17db3f83e0f0f7e86
+%global commit d79c1202f857c7f1990b06a670da761cb2cec41b
%global shortcommit %(c=%{commit};echo ${c:0:12})
# Settings used for build from snapshots.
-%{!?rel_build:%global commit_date 20140711}
+%{!?rel_build:%global commit_date 20140713}
%{!?rel_build:%global gitver git%{commit_date}-%{shortcommit}}
%{!?rel_build:%global gitrel .git%{commit_date}.%{shortcommit}}
%{?rel_build:%global gittar %{name}-%{version}.tar.gz}
@@ -20,9 +20,13 @@
%global pkgdocdir %{_docdir}/%{name}-%{version}
%endif # 0%{?fedora} >= 20 || 0%{?rhel} >= 8
+# lib%%{name}*.so* is a private lib in a private libdir with no headers,
+# so we should not provide that.
+%global __provides_exclude ^lib%{name}.*\\.so.*$
+
Name: pipelight
Version: 0.2.7.1.1
-Release: 0.6%{?gitrel}%{?dist}
+Release: 0.7%{?gitrel}%{?dist}
Summary: NPAPI Wrapper Plugin for using Windows plugins in Linux browsers
License: GPLv2+ or LGPLv2+ or MPLv1.1
@@ -31,14 +35,12 @@ URL: http://%{name}.net/
%{!?rel_build:Source0: %{bburl}get/%{shortcommit}.tar.gz#/%{?gittar}}
# Use the most recent dependency-installer-script provided in upstream's scm.
-Source1: %{bburl}raw/master/share/install-dependency
-
-# See: https://bitbucket.org/mmueller2012/pipelight/pull-request/12/
-Patch0: http://besser82.fedorapeople.org/patches/pipelight-0.2.7.1.1_improve-buildsys.patch
+Source1: %{bburl}raw/master/share/install-dependency.sig
# Wine is available on these arches, only.
ExclusiveArch: %{arm} %{ix86} x86_64
+BuildRequires: %{__gpg}
BuildRequires: libX11-devel
BuildRequires: mingw32-gcc-c++
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
@@ -51,9 +53,14 @@ BuildRequires: mingw64-winpthreads
%endif # 0%{?fedora} >= 20 || 0%{?rhel} >= 7
%endif # arch x86_64
+Requires: %{__gpg}
+Requires: %{_bindir}/wget
Requires: mozilla-filesystem%{?_isa}
Requires: %{name}-common == %{version}-%{release}
-Requires: wine%{?_isa}
+Requires: wine(compholio)%{?_isa}
+
+Requires(post): %{_bindir}/bash
+Requires(preun): %{_bindir}/bash
%description
Pipelight is a NPAPI wrapper plugin for using Windows plugins in Linux
@@ -82,11 +89,12 @@ configuration and usage, please visit %{url}.
Summary: Common files needed by %{name}
BuildArch: noarch
-Requires: %{_bindir}/gpg
Requires: %{_bindir}/wget
Requires: %{_bindir}/zenity
Requires: %{name} == %{version}-%{release}
-Requires: wine
+Requires: wine(compholio)
+
+Requires(post): %{__cp}
%description common
This package contains common files needed by %{name}.
@@ -94,7 +102,6 @@ This package contains common files needed by %{name}.
%prep
%setup -qn mmueller2012-%{name}-%{shortcommit}
-%patch0 -b .buildsys -p 1
# Copy changelog and licenses to toplevel.
%{__cp} -a debian/changelog ChangeLog
@@ -102,24 +109,18 @@ This package contains common files needed by %{name}.
# Replace the install-dependency-script with a more recent version
# from upstream's scm and fix it's hashbang.
-_file="share/install-dependency"
-%{__rm} -f ${_file} && \
-%{__cp} -af %{SOURCE1} ${_file} && \
-%{__sed} -e '1 s~^#!.*$~#!%{_bindir}/bash~' < ${_file} > ${_file}.new &&\
-%{_bindir}/touch -r ${_file} ${_file}.new && \
-%{_bindir}/mv -f ${_file}.new ${_file}
+%{__gpg} --batch --no-default-keyring \
+ --keyring "share/sig-install-dependency.gpg" \
+ --decrypt %{SOURCE1} > "share/sig-install-dependency"
%build
%configure \
%ifarch x86_64
- --with-win64 \
- --wine64-path=%{_bindir}/wine64 \
- --win64-static \
+ --with-win64 --win64-static \
%endif # arch x86_64
- --wine-path=%{_bindir}/wine \
- --win32-static \
- --moz-plugin-path=%{_libdir}/mozilla/plugins
+ --win32-static --wine-path=%{_bindir}/wine \
+ --so-mode=0755 --gpg-exec=%{__gpg}
%{__make} %{?_smp_mflags}
@@ -187,11 +188,20 @@ fi
%changelog
+* Sun Jul 13 2014 Björn Esser <bjoern.esser at gmail.com> - 0.2.7.1.1-0.7.git20140713.d79c1202f857
+- update to new snapshot git20140713.d79c1202f857
+- obsoleted pipelight-0.2.7.1.1_improve-buildsys.patch
+- use signed updated install-dependency-script
+- exclude lib%%{name}*.so* from auto-provides
+- added / moved runtime-Requires between build packages,
+ Requires: wine(compholio), Requires(post) and Requires(preun)
+- fixed typo in %%changelog
+
* Fri Jul 11 2014 Björn Esser <bjoern.esser at gmail.com> - 0.2.7.1.1-0.6.git20140711.035fa4908b63
- update to new snapshot git20140711.035fa4908b63
- license-change --> upstream dropped file (src/npapi-headers/npruntime.h)
covered by BSD-license
-- upstream now ships proper licese-test-files in src-tarball
+- upstream now ships proper licese-text-files in src-tarball
* Fri Jul 11 2014 Björn Esser <bjoern.esser at gmail.com> - 0.2.7.1.1-0.5.git20140711.8b41e9505f7a
- split files in %%{pkgdocdir} between main- and common-package
diff --git a/sources b/sources
index 91747c2..f8a38c0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-db00f2ac992eef99068e03e92f1ab345 pipelight-0.2.7.1.1-git20140711-035fa4908b63.tar.gz
+313c0fe781900c51bb6e94da80d3eb5a pipelight-0.2.7.1.1-git20140713-d79c1202f857.tar.gz
+6df7c86f23d63fc61522fcf42e80b6c0 install-dependency.sig
More information about the scm-commits
mailing list