commit 6ec22fd5fef99afcfa01903c6dadc7177a906385
Author: Jacek Konieczny <[email protected]>
Date: Tue Jan 27 22:18:23 2015 +0100
Version: 0.2.8
pipelight-lib64.patch | 48 ----------------------------------------
pipelight-pld.patch | 61 ++++++++++++++++++++++++++++++---------------------
pipelight.spec | 27 ++++++++++++++---------
3 files changed, 53 insertions(+), 83 deletions(-)
---
diff --git a/pipelight.spec b/pipelight.spec
index e69cb0f..0e4e60a 100644
--- a/pipelight.spec
+++ b/pipelight.spec
@@ -1,19 +1,20 @@
-%define commit 487f8db5a03d
+%define commit b7b5e5471d52
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
+Version: 0.2.8
Release: 0.1
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
+# Source0-md5: 9fcbc7019a49eb0c2f613eaba0e96df6
Source1:
http://repos.fds-team.de/pluginloader/v%{version}/pluginloader.tar.gz
-# Source1-md5: 5931da0500aed46f875b28cec2160cfe
-Patch0: %{name}-lib64.patch
-Patch1: %{name}-pld.patch
+# Source1-md5: 71b595924b8c8d91c830c2a897362ad2
+Source2:
http://repos.fds-team.de/pluginloader/v%{version}/pluginloader.tar.gz.sig
+# Source2-md5: e0b2467752881ac2735594d4ba8fe179
+Patch0: %{name}-pld.patch
URL: https://launchpad.net/pipelight
BuildRequires: libstdc++-devel
BuildRequires: xorg-lib-libX11-devel
@@ -38,10 +39,11 @@ Silverlighta niezbędna jest załatana wersja Wine.
%prep
%setup -q -a1 -n mmueller2012-%{name}-%{commit}
-%if "%{_lib}" == "lib64"
%patch0 -p1
-%endif
-%patch1 -p1
+exit 1
+
+ln -s %{SOURCE1} pluginloader-v%{version}.tar.gz
+ln -s %{SOURCE2} pluginloader-v%{version}.tar.gz.sig
%build
# not autoconf-generated
@@ -49,7 +51,9 @@ Silverlighta niezbędna jest załatana wersja Wine.
--prefix=%{_prefix} \
--wine-path=%{_bindir}/wine \
--moz-plugin-path=%{_browserpluginsdir} \
+ --libdir=%{_libdir} \
--win32-prebuilt \
+ --downloader=/bin/false \
%ifarch %{x8664}
--with-win64 \
%endif
@@ -73,11 +77,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/libpipelight.so
%{_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
%attr(755,root,root) %{_datadir}/%{name}/pluginloader.exe
+%attr(755,root,root) %{_datadir}/%{name}/wine
+%attr(755,root,root) %{_datadir}/%{name}/winecheck.exe
%ifarch %{x8664}
%attr(755,root,root) %{_datadir}/%{name}/pluginloader64.exe
+%attr(755,root,root) %{_datadir}/%{name}/wine64
+%attr(755,root,root) %{_datadir}/%{name}/winecheck64.exe
%endif
%{_datadir}/%{name}/sig-install-dependency.gpg
%{_datadir}/%{name}/configs
diff --git a/pipelight-lib64.patch b/pipelight-lib64.patch
deleted file mode 100644
index bb5ecfd..0000000
--- a/pipelight-lib64.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -dur mmueller2012-pipelight-487f8db5a03d.orig/Makefile
mmueller2012-pipelight-487f8db5a03d/Makefile
---- mmueller2012-pipelight-487f8db5a03d.orig/Makefile 2014-04-06
04:43:13.000000000 +0200
-+++ mmueller2012-pipelight-487f8db5a03d/Makefile 2014-05-03
17:11:42.350768574 +0200
-@@ -51,7 +51,7 @@
- mkdir -p "$(DESTDIR)$(prefix)/share/pipelight/configs"
- mkdir -p "$(DESTDIR)$(prefix)/share/pipelight/licenses"
- mkdir -p "$(DESTDIR)$(prefix)/share/pipelight/scripts"
-- mkdir -p "$(DESTDIR)$(prefix)/lib/pipelight"
-+ mkdir -p "$(DESTDIR)$(prefix)/lib64/pipelight"
- mkdir -p "$(DESTDIR)$(prefix)/bin"
- mkdir -p "$(DESTDIR)$(prefix)/share/man/man1"
-
-@@ -88,10 +88,10 @@
- rm pipelight-license.tmp; \
- done
-
-- install -m 0644 src/linux/libpipelight.so
"$(DESTDIR)$(prefix)/lib/pipelight/libpipelight.so"
-+ install -m 0644 src/linux/libpipelight.so
"$(DESTDIR)$(prefix)/lib64/pipelight/libpipelight.so"
-
- sed 's|@@VERSION@@|$(version)|g' bin/pipelight-plugin >
pipelight-plugin.tmp
-- sed -i'' -e 's|@@LIBRARY_PATH@@|$(prefix)/lib/pipelight/|g'
pipelight-plugin.tmp
-+ sed -i'' -e 's|@@LIBRARY_PATH@@|$(prefix)/lib64/pipelight/|g'
pipelight-plugin.tmp
- sed -i'' -e 's|@@CONFIG_PATH@@|$(prefix)/share/pipelight/configs|g'
pipelight-plugin.tmp
- sed -i'' -e 's|@@LICENSE_PATH@@|$(prefix)/share/pipelight/licenses|g'
pipelight-plugin.tmp
- sed -i'' -e
's|@@DEPENDENCY_INSTALLER@@|$(prefix)/share/pipelight/install-dependency|g'
pipelight-plugin.tmp
-@@ -116,7 +116,7 @@
- rm -f $(DESTDIR)$(prefix)/share/pipelight/scripts/configure-*
- rm -f $(DESTDIR)$(prefix)/share/pipelight/configs/pipelight-*
- rm -f $(DESTDIR)$(prefix)/share/pipelight/licenses/license-*
-- rm -f "$(DESTDIR)$(prefix)/lib/pipelight/libpipelight.so"
-+ rm -f "$(DESTDIR)$(prefix)/lib64/pipelight/libpipelight.so"
- rm -f "$(DESTDIR)$(prefix)/bin/pipelight-plugin"
- rm -f "$(DESTDIR)$(prefix)/share/man/man1/pipelight-plugin.1"
-
-@@ -124,10 +124,10 @@
- rmdir --ignore-fail-on-non-empty
"$(DESTDIR)$(prefix)/share/pipelight/licenses"
- rmdir --ignore-fail-on-non-empty
"$(DESTDIR)$(prefix)/share/pipelight/scripts"
- rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(prefix)/share/pipelight"
-- rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(prefix)/lib/pipelight"
-+ rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(prefix)/lib64/pipelight"
-
- .PHONY: clean
- clean:
- for dir in src/linux src/windows; do \
- $(MAKE) -C $$dir $@; \
-- done
-\ No newline at end of file
-+ done
diff --git a/pipelight-pld.patch b/pipelight-pld.patch
index 5199369..3fc7622 100644
--- a/pipelight-pld.patch
+++ b/pipelight-pld.patch
@@ -1,14 +1,8 @@
-diff -dur mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin
mmueller2012-pipelight-487f8db5a03d/bin/pipelight-plugin
---- mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin
2014-04-06 04:43:13.000000000 +0200
-+++ mmueller2012-pipelight-487f8db5a03d/bin/pipelight-plugin 2014-05-03
17:21:35.797421889 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/bash
- VERSION="@@VERSION@@"
-
- # Global configuration
-@@ -101,7 +101,7 @@
- PLUGIN_PATH=$(readlink -m "$PLUGIN_PATH")
+diff -dur mmueller2012-pipelight-b7b5e5471d52.orig/bin/pipelight-plugin.in
mmueller2012-pipelight-b7b5e5471d52/bin/pipelight-plugin.in
+--- mmueller2012-pipelight-b7b5e5471d52.orig/bin/pipelight-plugin.in
2014-12-10 05:56:45.000000000 +0100
++++ mmueller2012-pipelight-b7b5e5471d52/bin/pipelight-plugin.in
2015-01-27 22:10:38.136330589 +0100
+@@ -93,7 +93,7 @@
+ PLUGIN_PATH=$(realpath "$PLUGIN_PATH")
# Global installation
- if [ $(/usr/bin/id -u) -eq 0 ]; then
@@ -16,7 +10,16 @@ diff -dur
mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin mmueller
INSTALLDIR="$PLUGIN_PATH"
# Use environment variable (only if it doesn't point to the global
directory)
-@@ -436,6 +436,10 @@
+@@ -421,7 +421,7 @@
+ local retval=0
+
+ # 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
+ return 1
+ fi
+@@ -545,6 +545,10 @@
return 1
fi
done
@@ -27,7 +30,7 @@ diff -dur
mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin mmueller
return 0
}
-@@ -460,6 +464,10 @@
+@@ -569,6 +573,10 @@
done
@@ -38,19 +41,20 @@ diff -dur
mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin mmueller
return 0
}
---- 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
+diff -dur mmueller2012-pipelight-b7b5e5471d52.orig/share/install-dependency
mmueller2012-pipelight-b7b5e5471d52/share/install-dependency
+--- mmueller2012-pipelight-b7b5e5471d52.orig/share/install-dependency
2014-12-10 05:56:45.000000000 +0100
++++ mmueller2012-pipelight-b7b5e5471d52/share/install-dependency
2015-01-27 22:10:18.286240248 +0100
@@ -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
+diff -dur
mmueller2012-pipelight-b7b5e5471d52.orig/share/scripts/configure-flash.in
mmueller2012-pipelight-b7b5e5471d52/share/scripts/configure-flash.in
+--- mmueller2012-pipelight-b7b5e5471d52.orig/share/scripts/configure-flash.in
2014-12-10 05:56:45.000000000 +0100
++++ mmueller2012-pipelight-b7b5e5471d52/share/scripts/configure-flash.in
2015-01-27 22:10:18.286240248 +0100
+@@ -2,7 +2,7 @@
+ PIPELIGHT_SHARE_PATH="@@PIPELIGHT_SHARE_PATH@@"
# Don't run this as root
-if [ $(/usr/bin/id -u) -eq 0 ]; then
@@ -58,11 +62,11 @@ diff -dur
mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin mmueller
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
+diff -dur
mmueller2012-pipelight-b7b5e5471d52.orig/share/scripts/configure-silverlight.in
mmueller2012-pipelight-b7b5e5471d52/share/scripts/configure-silverlight.in
+---
mmueller2012-pipelight-b7b5e5471d52.orig/share/scripts/configure-silverlight.in
2014-12-10 05:56:45.000000000 +0100
++++ mmueller2012-pipelight-b7b5e5471d52/share/scripts/configure-silverlight.in
2015-01-27 22:10:18.289573597 +0100
+@@ -2,7 +2,7 @@
+ PIPELIGHT_SHARE_PATH="@@PIPELIGHT_SHARE_PATH@@"
# Don't run this as root
-if [ $(/usr/bin/id -u) -eq 0 ]; then
@@ -70,3 +74,10 @@ diff -dur
mmueller2012-pipelight-487f8db5a03d.orig/bin/pipelight-plugin mmueller
echo "ERROR: You should not run this as root!" >&2
exit 1
fi
+@@ -68,4 +68,4 @@
+ # Cleanup
+ rm "$tmpfile"
+
+-exit 0
+\ No newline at end of file
++exit 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pipelight.git/commitdiff/6ec22fd5fef99afcfa01903c6dadc7177a906385
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
