SPECS (for-AC): avahi.spec, mono.spec, dbus.spec - for-AC branch (...

[freetz]

Author: freetz                       Date: Sat Apr  1 14:06:11 2006 GMT
Module: SPECS                         Tag: for-AC
---- Log message:
- for-AC branch (unofficial AC upgrade)

---- Files affected:
SPECS:
   avahi.spec (1.42 -> 1.42.2.1) , mono.spec (1.171 -> 1.171.2.1) , dbus.spec (1.128 -> 1.128.2.1) 

---- Diffs:

================================================================
Index: SPECS/avahi.spec
diff -u SPECS/avahi.spec:1.42 SPECS/avahi.spec:1.42.2.1
--- SPECS/avahi.spec:1.42	Sun Mar 26 20:08:53 2006
+++ SPECS/avahi.spec	Sat Apr  1 16:06:06 2006
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without	dotnet		# build with dotnet bindings
-%bcond_without	qt		# build with qt bindings
+%bcond_with	qt		# build with qt bindings
 #
 %include /usr/lib/rpm/macros.mono
 #
@@ -642,6 +642,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.1  2006/04/01 14:06:06  freetz
+- for-AC branch (unofficial AC upgrade)
+
 Revision 1.42  2006/03/26 18:08:53  arekm
 - rel 5; deps fixes
 

================================================================
Index: SPECS/mono.spec
diff -u SPECS/mono.spec:1.171 SPECS/mono.spec:1.171.2.1
--- SPECS/mono.spec:1.171	Thu Mar 30 13:31:28 2006
+++ SPECS/mono.spec	Sat Apr  1 16:06:06 2006
@@ -38,7 +38,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	rpmbuild(monoautodeps)
-BuildRequires:	xorg-lib-libX11
+BuildRequires:	X11-libs
 ExclusiveArch:	%{ix86} %{x8664} arm hppa ia64 ppc s390 s390x
 # sparc sparcv9 sparc64 not ported to linux (only solaris(?))
 # alpha still broken, mips disabled in configure
@@ -456,6 +456,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.171.2.1  2006/04/01 14:06:06  freetz
+- for-AC branch (unofficial AC upgrade)
+
 Revision 1.171  2006/03/30 11:31:28  qboosh
 - whatever (in mono-find-* scripts)
 

================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.128 SPECS/dbus.spec:1.128.2.1
--- SPECS/dbus.spec:1.128	Mon Mar 20 21:44:32 2006
+++ SPECS/dbus.spec	Sat Apr  1 16:06:06 2006
@@ -4,29 +4,30 @@
 # - qt4 bindings
 #
 # Conditional build:
+#
+%bcond_with	gcj	# without Java support
+%bcond_with	qt4	# with Qt 4.x support (broken)
 %bcond_without	dotnet	# without .NET support
-%bcond_without	gcj	# without Java support
 %bcond_without	glib	# without glib support
 %bcond_without	gtk	# without GTK+ programs
 %bcond_without	python	# without Python support
 %bcond_without	qt	# without Qt 3.x support
-%bcond_with	qt4	# with Qt 4.x support (broken)
 #
 %{?with_dotnet:%include	/usr/lib/rpm/macros.mono}
-
+#
 %if %{without glib}
 %undefine	with_gtk
 %endif
-
+#
 %ifarch i386 alpha sparc sparc64
 %undefine with_dotnet
 %endif
-
+#
 %define		expat_version	1:1.95.5
 %define		glib2_version	1:2.2.0
 %define		gtk2_version	2:2.4.0
 %define		qt_version	6:3.1.0
-
+#
 Summary:	D-BUS message bus
 Summary(pl):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
@@ -55,7 +56,7 @@
 %{?with_gcj:BuildRequires:	gcc-java >= 5:4.0}
 %{?with_glib:BuildRequires:	glib2-devel >= %{glib2_version}}
 %{?with_gtk:BuildRequires:	gtk+2-devel >= %{gtk2_version}}
-BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	X11-devel
 %if %{with dotnet}
 BuildRequires:	mono-csharp >= 1.1.7
 BuildRequires:	monodoc >= 1.0.7-2
@@ -574,6 +575,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128.2.1  2006/04/01 14:06:06  freetz
+- for-AC branch (unofficial AC upgrade)
+
 Revision 1.128  2006/03/20 20:44:32  freetz
 - rel.3 for rebuild with fixed rpm
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/avahi.spec?r1=1.42&r2=1.42.2.1&f=u
    http://cvs.pld-linux.org/SPECS/mono.spec?r1=1.171&r2=1.171.2.1&f=u
    http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.128&r2=1.128.2.1&f=u