On Tuesday 24 April 2001 08:37, Geoffrey Lee wrote:
> Yo, can you make it unified diff?
>
Foobar :p. *unified* diff, ok, here it is. should have RTFI (read the ...
info), mea culpa
Michel
--- licq.spec.old Tue Apr 24 02:28:17 2001
+++ licq.spec Tue Apr 24 06:18:04 2001
@@ -1,7 +1,7 @@
%define version 1.0.3
%define name licq
%define prefix %{_prefix}
-%define release 4mdk
+%define release 5mdk
Name: %{name}
Summary: ICQ clone written in C++, and the default plugin in Qt
@@ -19,8 +19,9 @@
Group: Networking/Instant messaging
URL: http://www.licq.org/
BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: qt2-devel >= 2.3.0 ncurses-devel openssl-devel XFree86-devel
libjpeg-devel libpng-devel zlib-devel gpm-devel
+BuildRequires: qt2-devel >= 2.3.0 kdelibs-devel >= 2.1.1 ncurses-devel openssl-devel
+XFree86-devel libjpeg-devel libpng-devel zlib-devel gpm-devel
License: GPL
+Requires: licq-plugin = %{version}
%package update-hosts
Summary: An auto update hosts plugin for Licq
@@ -28,11 +29,17 @@
Requires: licq = %version-%release
Provides: licq-plugin
-#%package qt
-#Summary: qt based GUI plugin for Licq
-#Group: Networking/ICQ
-#Provides: licq-plugin
-#Requires: licq qt2 >= 2.2
+%package qt
+Summary: qt based GUI plugin for Licq
+Group: Networking/ICQ
+Provides: licq-plugin
+Requires: licq = %{version} qt2 >= 2.3.0
+
+%package kde
+Summary: KDE2-based GUI plugin for Licq
+Group: Networking/ICQ
+Provides: licq-plugin
+Requires: licq = %{version} qt2 >= 2.3.0 kdelibs >= 2.1.1
%package console
Summary: Console based plugin for Licq that uses ncurses
@@ -97,10 +104,15 @@
implemented through basic username and password authentication.
-#%description qt
-#This is the qt based GUI plugin for Licq.
-#
-#Install this if you want a qt-based GUI for Licq.
+%description qt
+This is the qt based GUI plugin for Licq.
+
+Install this if you want a qt-based GUI for Licq.
+
+%description kde
+This is the KDE2-based GUI plugin for Licq.
+
+Install this if you want KDE2 integration with Licq.
%description console
This is a console based plugin for Licq that uses ncurses that came in the
@@ -183,6 +195,14 @@
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
--disable-rpath %{_target_platform}
%make
+# kde gui
+cd ..
+cp -rap qt-gui* kde-gui
+cd kde-gui
+autoconf
+QTDIR="/usr/lib/qt2" ./configure --prefix=%{prefix} \
+ --disable-rpath --with-kde %{_target_platform}
+%make
# qt gui
cd ../qt-gui*
@@ -192,6 +212,7 @@
--disable-rpath %{_target_platform}
%make
+
#main licq stuff
cd ../..
@@ -238,8 +259,14 @@
EOF
+#kde gui
+cd plugins/kde-gui
+make install prefix=$RPM_BUILD_ROOT/%{prefix}
+mv $RPM_BUILD_ROOT/%{_libdir}/licq/licq_qt-gui.la
+$RPM_BUILD_ROOT/%{_libdir}/licq/licq_kde-gui.la
+mv $RPM_BUILD_ROOT/%{_libdir}/licq/licq_qt-gui.so
+$RPM_BUILD_ROOT/%{_libdir}/licq/licq_kde-gui.so
+
#qt gui
-cd plugins/qt-gui*
+cd ../qt-gui*
make install prefix=$RPM_BUILD_ROOT/%{prefix}
# console ui
@@ -295,22 +322,28 @@
%{_datadir}/licq/sounds
%{_datadir}/icons/%{name}.xpm
%{_datadir}/icons/mini/%{name}.xpm
-%{_libdir}/licq/licq*qt*
+#{_libdir}/licq/licq*qt*
%attr(0755,root,root) %{_bindir}/viewurl*
%doc doc/ upgrade/ README*
# qt
-#files qt
-#defattr(-,root,root)
+%files qt
+%defattr(-,root,root)
#{prefix}/share/licq/qt-gui
#{prefix}/share/licq/translations
#{prefix}/share/licq/utilities
#{prefix}/share/licq/sounds
#{prefix}/share/licq/licq*qt*
+%{_libdir}/licq/licq*qt*
#{prefix}/share/icons/%{name}.xpm
#{prefix}/share/icons/mini/%{name}.xpm
#doc plugins/qt-gui/README*
+# kde
+%files kde
+%defattr(-,root,root)
+%{_libdir}/licq/licq*kde*
+
# devel
%files devel
%defattr(-,root,root)
@@ -353,6 +386,10 @@
%doc plugins/rms*/COPYING plugins/rms*/README
%changelog
+* Tue Apr 24 2001 Michel Alexandre Salim <[EMAIL PROTECTED]> 1.0.3-5mdk
+- Separate Qt plugin from Licq
+- Compile KDE plugin
+
* Mon Apr 9 2001 Frederic Crozat <[EMAIL PROTECTED]> 1.0.3-4mdk
- Correct menu entry for GNOME (disable xalf)
