- fix problems with autoconf 2.60 which creates configure that runs in POSIX mode

[packages/dbus-qt3.git] / dbus-qt3.spec

diff --git a/dbus-qt3.spec b/dbus-qt3.spec
index 16857bb747dc017372e4438b38274413b5c198a2..605190ceb705583698df26b441ff4b6b6379cb8c 100644 (file)
--- a/dbus-qt3.spec
+++ b/dbus-qt3.spec
@@ -6,17 +6,18 @@ Summary(pl):  Biblioteka do u
 Name:          dbus-qt3
 Version:       0.2
 Release:       2.2
-License:       AFL v2.1 or GPL v2
+# AFL v2.1 or GPL v2+, but Qt license enforces GPL
+License:       GPL v2+
 Group:         Libraries
 Source0:       http://www.sbox.tugraz.at/home/v/voyager/%{rname}-%{version}.tar.bz2
 # Source0-md5: 574ec7c8e0c227498a4fbbd6b2255853
 Patch0:                %{name}-configure.patch
+Patch1:                kde-ac260.patch
 URL:           http://www.freedesktop.org/Software/dbus
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dbus-devel >= 0.91
 BuildRequires: qt-devel >= 6:3.1.0
-Obsoletes:     dbus-qt
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,7 +34,6 @@ Summary(pl):  Pliki nag
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      dbus-devel >= 0.91
-Obsoletes:     dbus-qt-devel
 
 %description devel
 Header files for Qt-based library for using D-BUS.
@@ -46,7 +46,6 @@ Summary:      Static Qt-based library for using D-BUS
 Summary(pl):   Statyczna biblioteka do u¿ywania D-BUS oparta o Qt
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
-Obsoletes:     dbus-qt-static
 
 %description static
 Static Qt-based library for using D-BUS.
@@ -57,10 +56,11 @@ Statyczna biblioteka do u
 %prep
 %setup -qn %{rname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
-%{__autoconf}
+cp -f /usr/share/automake/config.sub admin
+%{__make} -f admin/Makefile.common cvs
 %configure
 %{__make}
 
@@ -78,13 +78,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdbus-1-qt3.so.*
+%doc AUTHORS ChangeLog README TODO
+%attr(755,root,root) %{_libdir}/libdbus-1-qt3.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdbus-1-qt3.so
 %{_libdir}/libdbus-1-qt3.la
-
 %{_includedir}/dbus-1.0/qt3
 
 %files static