rpms/at-spi/devel at-spi-unneeded-deps.patch, 1.1, 1.2 at-spi.spec, 1.108, 1.109

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv437

Modified Files:
	at-spi-unneeded-deps.patch at-spi.spec 
Log Message:
Don't cut too deep


at-spi-unneeded-deps.patch:

Index: at-spi-unneeded-deps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi-unneeded-deps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-spi-unneeded-deps.patch	9 Dec 2008 04:58:32 -0000	1.1
+++ at-spi-unneeded-deps.patch	10 Dec 2008 16:51:28 -0000	1.2
@@ -1,6 +1,24 @@
-diff -up at-spi-1.25.2/configure.in.xtst at-spi-1.25.2/configure.in
---- at-spi-1.25.2/configure.in.xtst	2008-12-01 01:52:24.000000000 -0500
-+++ at-spi-1.25.2/configure.in	2008-12-08 23:38:31.000000000 -0500
+diff -up at-spi-1.25.2/atk-bridge/Makefile.am.unneeded-deps at-spi-1.25.2/atk-bridge/Makefile.am
+--- at-spi-1.25.2/atk-bridge/Makefile.am.unneeded-deps	2007-12-03 01:16:10.000000000 -0500
++++ at-spi-1.25.2/atk-bridge/Makefile.am	2008-12-10 11:44:34.000000000 -0500
+@@ -33,4 +33,4 @@ libatk_bridge_la_LDFLAGS =  	\
+ 
+ libatk_bridge_la_LIBADD = \
+ 	$(top_builddir)/libspi/libspi.la	\
+-	$(ATK_BRIDGE_LIBS)	
++	$(ATK_BRIDGE_LIBS) $(X_LIBS)
+diff -up at-spi-1.25.2/configure.in.unneeded-deps at-spi-1.25.2/configure.in
+--- at-spi-1.25.2/configure.in.unneeded-deps	2008-12-01 01:52:24.000000000 -0500
++++ at-spi-1.25.2/configure.in	2008-12-10 11:48:47.000000000 -0500
+@@ -77,7 +77,7 @@ AC_PATH_XTRA
+ if test x$no_x = xyes ; then
+ 	AC_MSG_ERROR([X development libraries not found])
+ else
+-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++        X_LIBS="$X_LIBS -lX11"
+ fi
+ 
+ AC_SUBST(X_LIBS)
 @@ -144,7 +144,6 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variab
  AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
  AC_SUBST(LIBBONOBO_IDL_DIR)
@@ -9,9 +27,9 @@
  dnl path to Xtst
  AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
  	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
-diff -up at-spi-1.25.2/cspi/Makefile.am.xtst at-spi-1.25.2/cspi/Makefile.am
---- at-spi-1.25.2/cspi/Makefile.am.xtst	2008-12-08 23:44:31.000000000 -0500
-+++ at-spi-1.25.2/cspi/Makefile.am	2008-12-08 23:44:43.000000000 -0500
+diff -up at-spi-1.25.2/cspi/Makefile.am.unneeded-deps at-spi-1.25.2/cspi/Makefile.am
+--- at-spi-1.25.2/cspi/Makefile.am.unneeded-deps	2007-06-05 03:16:57.000000000 -0400
++++ at-spi-1.25.2/cspi/Makefile.am	2008-12-10 11:44:34.000000000 -0500
 @@ -14,7 +14,7 @@ libcspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSI
  
  LDADD =				\
@@ -21,9 +39,9 @@
  
  libcspidir = $(includedir)/at-spi-1.0/cspi
  libcspi_HEADERS =		\
-diff -up at-spi-1.25.2/libspi/Makefile.am.xtst at-spi-1.25.2/libspi/Makefile.am
---- at-spi-1.25.2/libspi/Makefile.am.xtst	2007-11-28 01:43:23.000000000 -0500
-+++ at-spi-1.25.2/libspi/Makefile.am	2008-12-08 23:38:31.000000000 -0500
+diff -up at-spi-1.25.2/libspi/Makefile.am.unneeded-deps at-spi-1.25.2/libspi/Makefile.am
+--- at-spi-1.25.2/libspi/Makefile.am.unneeded-deps	2007-11-28 01:43:23.000000000 -0500
++++ at-spi-1.25.2/libspi/Makefile.am	2008-12-10 11:44:34.000000000 -0500
 @@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)	\
             $(X_CFLAGS)
  


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- at-spi.spec	9 Dec 2008 04:58:32 -0000	1.108
+++ at-spi.spec	10 Dec 2008 16:51:28 -0000	1.109
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.25.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.25/%{name}-%{version}.tar.bz2
 
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Wed Dec 10 2008 Matthias Clasen <mclasen at redhat.com> - 1.25.2-5
+- ...but keep all the needed deps
+
 * Mon Dec  8 2008 Matthias Clasen <mclasen at redhat.com> - 1.25.2-4
 - Reduce unused direct deps