rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.21,1.22

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
* Mon Jul 20 2009 Adam Jackson <ajax at redhat.com> 1.0.2-10
- Fix FTBFS due to Xaw xprint macro disappearing. (#511614)



Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xorg-x11-xsm.spec	26 Feb 2009 11:43:30 -0000	1.21
+++ xorg-x11-xsm.spec	20 Jul 2009 21:53:22 -0000	1.22
@@ -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: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -24,7 +24,6 @@ Patch10: xsm-1.0.1-xsm-installation-loca
 # Patches for rstart (30-39)
 Patch30: rstart-1.0.2-rstart-installation-location-fixes.patch
 
-# FIXME: Temporary dependency on automake/autoconf while they're still needed.
 BuildRequires: automake autoconf
 
 BuildRequires: pkgconfig
@@ -54,23 +53,17 @@ X.Org X11 X Session Manager
 
 %build
 # Build everything
-{
-   for pkg in xsm smproxy rstart ; do
-      pushd $pkg-*
 
-      case $pkg in
-         # FIXME: Required for rstart-0.99.1-installation-location-fixes.patch
-         #        and xsm-0.99.2-xsm-installation-location-fixes.patch
-         xsm|rstart)
-            aclocal ; automake ; autoconf
-            ;;
-      esac
+for pkg in xsm smproxy rstart ; do
+    pushd $pkg-*
 
-      %configure --disable-xprint
-      make
-      popd
-   done
-}
+    sed -i '/XAW_/ s/)/, xaw7)/; /XAW_/ s/XAW_CHECK_XPRINT_SUPPORT/PKG_CHECK_MODULES/' configure.ac
+    aclocal ; automake ; autoconf
+
+    %configure --disable-xprint
+    make
+    popd
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -132,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Mon Jul 20 2009 Adam Jackson <ajax at redhat.com> 1.0.2-10
+- Fix FTBFS due to Xaw xprint macro disappearing. (#511614)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild