- there is no /dev on builders

- rel 2

diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index e0292ab27414067e2ff463ab4929ea62045ec865..f4aac2b7d6a50af2ccf58d6c8edfe5ecb588073c 100644 (file)
--- 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 (file)
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