[packages/apache-mod_pagespeed] - there is no /dev on builders - rel 2
baggins
baggins at pld-linux.org
Tue Dec 3 11:47:29 CET 2013
commit cad452c89550cdcbf1991780e7c1c5d5d8ec2453
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Dec 3 11:47:16 2013 +0100
- there is no /dev on builders
- rel 2
apache-mod_pagespeed.spec | 6 ++++--
no-dev-stdout.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index e0292ab..f4aac2b 100644
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -21,11 +21,11 @@
%endif
%define mod_name pagespeed
-%define apxs %{_sbindir}/apxs
+%define apxs %{_sbindir}/apxs
Summary: Apache module for rewriting web pages to reduce latency and bandwidth
Name: apache-mod_%{mod_name}
Version: 1.5.27.2
-Release: 1
+Release: 2
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: modpagespeed-%{version}.tar.xz
@@ -36,6 +36,7 @@ Patch0: system-libs.patch
Patch1: gcc-headers.patch
Patch2: bug-632.patch
Patch3: opencv.patch
+Patch4: no-dev-stdout.patch
URL: https://developers.google.com/speed/pagespeed/
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.2
@@ -85,6 +86,7 @@ site is maintained.
%patch1 -p2
%patch2 -p1
%patch3 -p3
+%patch4 -p3
%build
# re-gen makefiles
diff --git a/no-dev-stdout.patch b/no-dev-stdout.patch
new file mode 100644
index 0000000..3bb0b18
--- /dev/null
+++ b/no-dev-stdout.patch
@@ -0,0 +1,29 @@
+--- modpagespeed-1.5.27.2/build/lastchange.sh~ 2013-05-03 20:30:46.000000000 +0200
++++ modpagespeed-1.5.27.2/build/lastchange.sh 2013-12-03 11:46:18.047904200 +0100
+@@ -24,7 +24,7 @@
+ SVN_PATH=$1
+ shift 1
+ DEFAULT_FILE=
+-OUT_FILE=/dev/stdout
++OUT_FILE=
+
+ while [ $# -ge 2 ]; do
+ case $1 in
+@@ -49,7 +49,15 @@
+ if [ -z $DEFAULT_FILE ]; then
+ KEY='Last Changed Rev: '
+ REVISION=`svn info $SVN_PATH | grep "$KEY" | sed "s#$KEY##"`
+- echo LASTCHANGE=$REVISION > $OUT_FILE
++ if [ -z "$OUT_FILE" ]; then
++ echo LASTCHANGE=$REVISION
++ else
++ echo LASTCHANGE=$REVISION > $OUT_FILE
++ fi
+ else
+- cat $DEFAULT_FILE > $OUT_FILE
++ if [ -z "$OUT_FILE" ]; then
++ cat $DEFAULT_FILE
++ else
++ cat $DEFAULT_FILE > $OUT_FILE
++ fi
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_pagespeed.git/commitdiff/cad452c89550cdcbf1991780e7c1c5d5d8ec2453
More information about the pld-cvs-commit
mailing list