[pipelight] update to new snapshot git20140711.035fa4908b63 license-change --> upstream dropped file (src/npapi-

Björn Esser besser82 at fedoraproject.org
Fri Jul 11 14:59:45 UTC 2014


commit 8fd36f7a68e334e38fbf1307e2f3f7e7bceb0fd2
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Fri Jul 11 16:53:57 2014 +0200

    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

 pipelight.spec |   22 ++++++++++------------
 sources        |    2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/pipelight.spec b/pipelight.spec
index 651cb6d..d133571 100644
--- a/pipelight.spec
+++ b/pipelight.spec
@@ -3,7 +3,7 @@
 
 # General needed defines.
 %global bburl		https://bitbucket.org/mmueller2012/%{name}/
-%global commit		8b41e9505f7a8710b3817ae93ac46b3be5f96f1f
+%global commit		035fa4908b638e00f1bf84e17db3f83e0f0f7e86
 %global shortcommit	%(c=%{commit};echo ${c:0:12})
 
 # Settings used for build from snapshots.
@@ -22,12 +22,10 @@
 
 Name:			pipelight
 Version:		0.2.7.1.1
-Release:		0.5%{?gitrel}%{?dist}
+Release:		0.6%{?gitrel}%{?dist}
 Summary:		NPAPI Wrapper Plugin for using Windows plugins in Linux browsers
 
-# No license-files in src-tarball.  Upstream is informed, see:
-# https://bitbucket.org/mmueller2012/pipelight/pull-request/11
-License:		BSD and (GPLv2+ or LGPLv2+ or MPLv1.1)
+License:		GPLv2+ or LGPLv2+ or MPLv1.1
 URL:			http://%{name}.net/
 %{?rel_build:Source0:	%{bburl}get/v%{version}.tar.gz#/%{?gittar}}
 %{!?rel_build:Source0:	%{bburl}get/%{shortcommit}.tar.gz#/%{?gittar}}
@@ -102,12 +100,6 @@ This package contains common files needed by %{name}.
 %{__cp} -a debian/changelog ChangeLog
 %{__cp} -a debian/copyright COPYRIGHT
 
-# Extract BSD-3-license from source-file.
-%{_bindir}/head -n 30 src/npapi-headers/npruntime.h |			\
-	%{__sed} -e 's!^[ \t]*\*[ \t]*!!g' -e 's![ \t]*$!!g' -e '1,2d'	\
-	> bsd-3.txt &&							\
-%{_bindir}/touch -r src/npapi-headers/npruntime.h bsd-3.txt
-
 # Replace the install-dependency-script with a more recent version
 # from upstream's scm and fix it's hashbang.
 _file="share/install-dependency"
@@ -146,7 +138,7 @@ _file="share/install-dependency"
 
 # Install %%doc to %%{pkgdocdir}.
 %{__mkdir} -p %{buildroot}%{pkgdocdir}
-cp -af bsd-3.txt ChangeLog COPYRIGHT LICENSE %{buildroot}%{pkgdocdir}
+cp -af ChangeLog COPYRIGHT LICENSE licenses %{buildroot}%{pkgdocdir}
 
 
 %post
@@ -195,6 +187,12 @@ fi
 
 
 %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
+
 * 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 52d0386..91747c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7326dbaa6e56ae0fac4233c9fc1119d  pipelight-0.2.7.1.1-git20140711-8b41e9505f7a.tar.gz
+db00f2ac992eef99068e03e92f1ab345  pipelight-0.2.7.1.1-git20140711-035fa4908b63.tar.gz


More information about the scm-commits mailing list