rpms/xorg-x11-xsm/devel xsm-1.0.1-add-needed.patch, NONE, 1.1 xorg-x11-xsm.spec, 1.24, 1.25

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xsm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32261

Modified Files:
	xorg-x11-xsm.spec 
Added Files:
	xsm-1.0.1-add-needed.patch 
Log Message:
* Tue Feb 09 2010 Adam Jackson <ajax at redhat.com> 1.0.2-13
- xsm-1.0.1-add-needed.patch: Fix FTBFS for --no-add-needed


xsm-1.0.1-add-needed.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xsm-1.0.1-add-needed.patch ---
diff -up xsm-1.0.1/configure.ac.jx xsm-1.0.1/configure.ac
--- xsm-1.0.1/configure.ac.jx	2005-12-20 21:29:54.000000000 -0500
+++ xsm-1.0.1/configure.ac	2010-02-09 17:15:09.000000000 -0500
@@ -63,7 +63,7 @@ AC_CHECK_FUNC([putenv], [],
    AC_DEFINE(NOPUTENV,1,[Define to 1 if you DO NOT have the `putenv' function.]))
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XSM)
+PKG_CHECK_MODULES(XSM, xaw7 sm)
 
 AC_SUBST(XSM_CFLAGS)
 AC_SUBST(XSM_LIBS)


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-xsm.spec	3 Aug 2009 18:44:08 -0000	1.24
+++ xorg-x11-xsm.spec	9 Feb 2010 22:16:45 -0000	1.25
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
 # Bump the release on rebuilds/bugfixes/etc.
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -17,6 +17,7 @@ Source2: ftp://ftp.x.org/pub/individual/
 
 # Patches for xsm (10-19)
 Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch
+Patch11: xsm-1.0.1-add-needed.patch
 
 # Patches for smproxy (20-29)
 #Patch20:
@@ -46,6 +47,7 @@ X.Org X11 X Session Manager
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2
 %patch10 -p0 -b .xsm-installation-location-fixes
+%patch11 -p0 -b .add-needed
 %patch30 -p0 -b .rstart-installation-location-fixes
 
 %build
@@ -122,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Tue Feb 09 2010 Adam Jackson <ajax at redhat.com> 1.0.2-13
+- xsm-1.0.1-add-needed.patch: Fix FTBFS for --no-add-needed
+
 * Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.2-12
 - Un-Requires xorg-x11-filesystem