packages: xscreensaver/xscreensaver.spec, xscreensaver/xscreensaver-build.p...

[arekm]

Author: arekm                        Date: Sun Jul 26 18:40:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; builds

---- Files affected:
packages/xscreensaver:
   xscreensaver.spec (1.160 -> 1.161) , xscreensaver-build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xscreensaver/xscreensaver.spec
diff -u packages/xscreensaver/xscreensaver.spec:1.160 packages/xscreensaver/xscreensaver.spec:1.161
--- packages/xscreensaver/xscreensaver.spec:1.160	Sun Jul 12 05:28:52 2009
+++ packages/xscreensaver/xscreensaver.spec	Sun Jul 26 20:40:53 2009
@@ -13,7 +13,7 @@
 Summary(zh_CN.UTF-8):	X 窗口系统保护器
 Name:		xscreensaver
 Version:	5.06
-Release:	2
+Release:	3
 Epoch:		1
 License:	BSD
 Group:		X11/Applications
@@ -27,6 +27,7 @@
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-man.patch
 Patch3:		%{name}-degnomify.patch
+Patch4:		%{name}-build.patch
 URL:		http://www.jwz.org/xscreensaver/
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-glut-devel
@@ -157,12 +158,15 @@
 %patch1 -p1
 #%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 install -m755 %{SOURCE4} .
 
 mv po/{no,nb}.po
 
 %build
-cp -f /usr/share/automake/config.sub .
+cp -f /usr/share/automake/{config.sub,install-sh} .
+%{__libtoolize}
+%{__intltoolize}
 %{__aclocal}
 %{__autoconf}
 %configure \
@@ -198,6 +202,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	install_sh=$(pwd)/install-sh \
 	install_prefix=$RPM_BUILD_ROOT \
 	AD_DIR=%{_appdefsdir} \
 	PAM_DIR=/etc/pam.d
@@ -322,6 +327,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2009/07/26 18:40:53  arekm
+- rel 3; builds
+
 Revision 1.160  2009/07/12 03:28:52  arekm
 - release 2
 

================================================================
Index: packages/xscreensaver/xscreensaver-build.patch
diff -u /dev/null packages/xscreensaver/xscreensaver-build.patch:1.1
--- /dev/null	Sun Jul 26 20:40:59 2009
+++ packages/xscreensaver/xscreensaver-build.patch	Sun Jul 26 20:40:53 2009
@@ -0,0 +1,11 @@
+--- xscreensaver-5.06/configure.in~	2009-07-26 20:25:37.933814582 +0200
++++ xscreensaver-5.06/configure.in	2009-07-26 20:31:08.133988822 +0200
+@@ -472,6 +472,8 @@
+ #
+ ###############################################################################
+ 
++AM_PROG_INSTALL_SH
++
+ AC_DEFUN(AC_PROG_INSTALL_DIRS,
+  [AC_CACHE_CHECK([whether "\${INSTALL} -d" creates intermediate directories],
+     ac_cv_install_d_creates_dirs,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xscreensaver/xscreensaver.spec?r1=1.160&r2=1.161&f=u