rpms/dbus-qt/devel dbus-qt.spec,1.3,1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/dbus-qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1779

Modified Files:
	dbus-qt.spec 
Log Message:
* Tue Jun 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.62-2
- enable qt4 bindings
- BR: gettext



Index: dbus-qt.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-qt/devel/dbus-qt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dbus-qt.spec	14 Jun 2006 14:14:37 -0000	1.3
+++ dbus-qt.spec	20 Jun 2006 18:28:58 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: Qt-based library for using D-BUS
 Name:	 dbus-qt
 Version: 0.62
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: AFL/GPL
 URL: 	 http://www.freedesktop.org/software/dbus/
@@ -10,8 +10,12 @@
 Group: 	 System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: qt-devel
+BuildRequires: gettext
 BuildRequires: libxml2-devel
+# qt(3) bindings
+BuildRequires: qt-devel
+# qt(4) bindings
+BuildRequires: qt4-devel
 
 Provides: dbus-qt3 = %{version}-%{release}
 
@@ -22,8 +26,8 @@
 the Qt3 thread abstraction and main loop.
 
 %package devel
-Summary: Libraries and headers for D-BUS
-Group: Development/Libraries
+Summary: Libraries and headers for %{name} 
+Group:	 Development/Libraries
 Provides: dbus-qt3-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel
@@ -31,6 +35,21 @@
 %description devel
 %{summary}.
 
+%package -n dbus-qt4
+Summary: Qt4-based library for using DBus
+Group:	 System Environment/Libraries
+Requires: dbus = %{version}
+%description -n dbus-qt4 
+%{summary}.
+
+%package -n dbus-qt4-devel
+Summary: Libraries and headers for dbus-qt4 
+Group:	 Development/Libraries
+Requires: dbus-qt4 = %{version}-%{release}
+Requires: dbus-devel
+Requires: qt4-devel
+%description -n dbus-qt4-devel
+%{summary}.
 
 
 %prep
@@ -45,12 +64,13 @@
   --disable-tests --disable-verbose-mode --disable-asserts \
   --disable-static \
   --enable-qt3 \
-  --disable-qt \
+  --enable-qt \
   --disable-libaudit --enable-selinux=no \
   --disable-glib --disable-gtk
 
 make %{?_smp_mflags} -C dbus
 make %{?_smp_mflags} -C qt3
+make %{?_smp_mflags} -C qt
 
 
 %install
@@ -58,6 +78,7 @@
 
 make -C dbus install DESTDIR=$RPM_BUILD_ROOT
 make -C qt3  install DESTDIR=$RPM_BUILD_ROOT
+make -C qt   install DESTDIR=$RPM_BUILD_ROOT
 make -C dbus uninstall DESTDIR=$RPM_BUILD_ROOT
 
 # Unpackaged files
@@ -80,11 +101,32 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/dbus-1.0/dbus/*
+%{_includedir}/dbus-1.0/dbus/connection.h
+%{_includedir}/dbus-1.0/dbus/message.h
+%{_includedir}/dbus-1.0/dbus/server.h
+%{_includedir}/dbus-1.0/dbus/dbus-qt.h
 %{_libdir}/libdbus-qt-*.so
 
+%files -n dbus-qt4
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/dbus
+%{_libdir}/libdbus-qt4-*.so.*
+
+%files -n dbus-qt4-devel
+%defattr(-,root,root,-)
+%{_bindir}/dbusidl2cpp
+%{_bindir}/dbuscpp2xml
+%{_includedir}/dbus-1.0/dbus/qdbus*.h
+%{_libdir}/libdbus-qt4-*.so
+
+
 
 %changelog
+* Tue Jun 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.62-2
+- enable qt4 bindings
+- BR: gettext
+
 * Wed Jun 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.62-1
 - 0.62