- pl

- enhanced pld patch to cover other "/usr/bin/env bash" or "/usr/bin/id" occurences

diff --git a/pipelight-pld.patch b/pipelight-pld.patch
index 21bd75604cb506fa73dd80d81c09617968474595..5199369e32eb7343d063b8e1aa60936781d7f047 100644 (file)
--- a/pipelight-pld.patch
+++ b/pipelight-pld.patch
@@ -38,10 +38,35 @@ diff -dur mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin mmueller
        return 0
  }
  
-@@ -647,4 +655,4 @@
-       esac
- done
+--- mmueller2012-pipelight-487f8db5a03d/share/install-dependency.orig  2014-04-06 04:43:13.000000000 +0200
++++ mmueller2012-pipelight-487f8db5a03d/share/install-dependency       2014-05-17 08:13:42.342695672 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/bash
+ 
+ usage()
+ {
+--- mmueller2012-pipelight-487f8db5a03d/share/scripts/configure-flash.in.orig  2014-04-06 04:43:13.000000000 +0200
++++ mmueller2012-pipelight-487f8db5a03d/share/scripts/configure-flash.in       2014-05-17 08:14:55.152694157 +0200
+@@ -1,7 +1,7 @@
+-#!/usr/bin/env bash
++#!/bin/bash
+ 
+ # Don't run this as root
+-if [ $(/usr/bin/id -u) -eq 0 ]; then
++if [ $(/bin/id -u) -eq 0 ]; then
+       echo "ERROR: You should not run this as root!" >&2
+       exit 1
+ fi
+--- mmueller2012-pipelight-487f8db5a03d/share/scripts/configure-silverlight.in.orig    2014-04-06 04:43:13.000000000 +0200
++++ mmueller2012-pipelight-487f8db5a03d/share/scripts/configure-silverlight.in 2014-05-17 08:14:46.636027667 +0200
+@@ -1,7 +1,7 @@
+-#!/usr/bin/env bash
++#!/bin/bash
  
--exit "$RET"
-\ No newline at end of file
-+exit "$RET"
+ # Don't run this as root
+-if [ $(/usr/bin/id -u) -eq 0 ]; then
++if [ $(/bin/id -u) -eq 0 ]; then
+       echo "ERROR: You should not run this as root!" >&2
+       exit 1
+ fi

diff --git a/pipelight.spec b/pipelight.spec
index f323cdb5c6d7110e9eeb2a2f2e9c090a377dba9a..e69cb0f3d589094a2c8db818947314aec511a23a 100644 (file)
--- a/pipelight.spec
+++ b/pipelight.spec
@@ -2,11 +2,12 @@
 %define commit 487f8db5a03d
 
 Summary:       Browser plugin to load Windows browser plugins
+Summary(pl.UTF-8):     Wtyczka przeglądarki do wczytywania wtyczek przeglądarek z systemu Windows
 Name:          pipelight
 Version:       0.2.6
 Release:       0.1
-License:       MPL 1.1/GPL 2.0/LGPL 2.1
-Group:         Applications
+License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
+Group:         Applications/WWW
 Source0:       https://bitbucket.org/mmueller2012/pipelight/get/v%{version}.tar.bz2
 # Source0-md5: 265747e08a3b2dd806c47a228f03df5b
 Source1:       http://repos.fds-team.de/pluginloader/v%{version}/pluginloader.tar.gz
@@ -23,22 +24,26 @@ ExclusiveArch:      %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Pipelight is a special browser plugin which allows one to use windows
+Pipelight is a special browser plugin which allows one to use Windows
 only plugins inside Linux browsers. We are currently focusing on
 Silverlight, Flash, Shockwave and the Unity Webplayer. The project
 needs a patched version of Wine to execute the Silverlight DLL.
 
+%description -l pl.UTF-8
+Pipelight to specjalna wtyczka przeglądarki, pozwalająca na
+korzystanie z wtyczek przeznaczonych tylko dla systemu Windows w
+przeglądarce na Linuksie. Obecnie skupia się na wtyczkach Silverlight,
+Flash, Shockwave oraz Unity Webplayer. Do uruchamiania bibliotek DLL
+Silverlighta niezbędna jest załatana wersja Wine.
+
 %prep
 %setup -q -a1 -n mmueller2012-%{name}-%{commit}
-
-%ifarch %{x8664}
+%if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif
-
 %patch1 -p1
 
 %build
-
 # not autoconf-generated
 ./configure \
        --prefix=%{_prefix} \
@@ -66,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pipelight-plugin
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/libpipelight.so
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/pipelight-plugin.1*
 %dir %{_datadir}/%{name}
 %attr(755,root,root) %{_datadir}/%{name}/hw-accel-default
 %attr(755,root,root) %{_datadir}/%{name}/install-dependency