Author: qboosh                       Date: Sat Feb 25 16:47:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
SPECS:
   kopete.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/kopete.spec
diff -u SPECS/kopete.spec:1.37 SPECS/kopete.spec:1.38
--- SPECS/kopete.spec:1.37      Tue Feb 21 01:05:52 2006
+++ SPECS/kopete.spec   Sat Feb 25 17:47:35 2006
@@ -1,9 +1,12 @@
 # $Revision$, $Date$
+#
+# Conditional build:
 %bcond_without xmms
 %bcond_without noatun
 %bcond_without meanwhile
 %bcond_without smpppd
 %bcond_without winpopup
+#
 %define                _snap   alpha1
 Summary:       Multi-protocol plugin-based instant messenger
 Summary(pl):   Komunikator obsługujący wiele protokołów
@@ -13,34 +16,43 @@
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Networking
-Source0:       
http://dl.sourceforge.net/sourceforge/kopete/%{name}-%{version}-%{_snap}.tar.bz2
+Source0:       
http://dl.sourceforge.net/kopete/%{name}-%{version}-%{_snap}.tar.bz2
 # Source0-md5: d478259d8be070b1e2d7ce728dfa7269
-#Patch0:               %{name}-includehints.patch
 URL:           http://kopete.kde.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: fam-devel
-#BuildRequires:        libpsi-devel >= 20021108
-BuildRequires: libgadu-devel >= 1.0
-BuildRequires: libxml2-devel >= 2.4.8
-BuildRequires: libxslt-devel >= 1.0.7
+BuildRequires: glib-devel
 BuildRequires: kdemultimedia-devel >= 3.1
 BuildRequires: kdemultimedia-kscd >= 3.1
 %{?with_noatun:BuildRequires:  kdemultimedia-noatun >= 3.1}
+BuildRequires: libgadu-devel >= 1.0
+BuildRequires: libgsm-devel
+#BuildRequires:        libpsi-devel >= 20021108
+BuildRequires: libxml2-devel >= 2.4.8
+BuildRequires: libxslt-devel >= 1.0.7
+%{?with_meanwhile:BuildRequires:       meanwhile-devel}
 BuildRequires: openssl-devel
 BuildRequires: perl-devel
 BuildRequires: qt-devel >= 3.1
 BuildRequires: rpmbuild(macros) >= 1.129
-BuildRequires: glib-devel
-BuildRequires: libgsm-devel
-%{?with_meanwhile:BuildRequires:       meanwhile-devel}
 %{?with_xmms:BuildRequires:    xmms-devel >= 1.0.0}
+Requires:      %{name}-libkopete = %{epoch}:%{version}-%{release}
 Requires:      kdebase-core >= 3.5.
 Requires:      perl-modules
 Requires:      qt >= 3.1
-Requires:      %{name}-libkopete = %{epoch}:%{version}-%{release}
-Obsoletes:     kopete-plugin-tools-autoaway
 Obsoletes:     kdenetwork-kopete
+Obsoletes:     kdenetwork-kopete-protocol-testbed
+Obsoletes:     kopete-plugin-protocols-aim
+Obsoletes:     kopete-plugin-protocols-gg
+Obsoletes:     kopete-plugin-protocols-icq
+Obsoletes:     kopete-plugin-protocols-irc
+Obsoletes:     kopete-plugin-protocols-jabber
+Obsoletes:     kopete-plugin-protocols-msn
+Obsoletes:     kopete-plugin-protocols-oscar
+Obsoletes:     kopete-plugin-protocols-sms
+Obsoletes:     kopete-plugin-protocols-winpopup
+Obsoletes:     kopete-plugin-protocols-yahoo
 Obsoletes:     kopete-plugin-tools-autoaway
 Obsoletes:     kopete-plugin-tools-autoreplace
 Obsoletes:     kopete-plugin-tools-conectionstatus
@@ -55,17 +67,6 @@
 Obsoletes:     kopete-plugin-tools-texteffect
 Obsoletes:     kopete-plugin-tools-translator
 Obsoletes:     kopete-plugin-tools-webpresence
-Obsoletes:     kopete-plugin-protocols-aim
-Obsoletes:     kopete-plugin-protocols-gg
-Obsoletes:     kopete-plugin-protocols-icq
-Obsoletes:     kopete-plugin-protocols-irc
-Obsoletes:     kopete-plugin-protocols-jabber
-Obsoletes:     kopete-plugin-protocols-msn
-Obsoletes:     kopete-plugin-protocols-oscar
-Obsoletes:     kopete-plugin-protocols-sms
-Obsoletes:     kopete-plugin-protocols-winpopup
-Obsoletes:     kopete-plugin-protocols-yahoo
-Obsoletes:     kdenetwork-kopete-protocol-testbed
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -570,7 +571,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}-%{_snap}
-#patch -p1
 
 %build
 kde_appsdir="%{_desktopdir}"; export kde_appsdir
@@ -582,7 +582,7 @@
        --%{?debug:en}%{!?debug:dis}able-debug \
        --%{?with_smpppd:en}%{!?with_smpppd:dis}able-sametime-plugin \
        --with-distribution="PLD Linux Distribution" \
-       --with-qt-libraries=%{_libdir}\
+       --with-qt-libraries=%{_libdir} \
        --disable-testbed \
        %{!?debug:--disable-rpath} \
        --%{?with_smpppd:en}%{!?with_smpppd:dis}able-smpppd
@@ -598,11 +598,11 @@
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 %if %{with winpopup}
-%{__make} -C kopete/protocols/winpopup \
-       install DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C kopete/protocols/winpopup install \
+       DESTDIR=$RPM_BUILD_ROOT
 %endif
 
-echo "Categories=Qt;Network;X-Communication" >> 
$RPM_BUILD_ROOT%{_desktopdir}/kde/kopete.desktop
+echo "Categories=Qt;Network;X-Communication;" >> 
$RPM_BUILD_ROOT%{_desktopdir}/kde/kopete.desktop
 install -d $RPM_BUILD_ROOT%{_iconsdir}
 
 %find_lang %{name} --with-kde
@@ -909,7 +909,6 @@
 %{_datadir}/services/kopete_cryptography.desktop
 %{_datadir}/services/kconfiguredialog/kopete_cryptography_config.desktop
 
-
 %files tool-latex
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kopete_latexconvert.sh
@@ -924,7 +923,6 @@
 %{_datadir}/services/kconfiguredialog/kopete_latex_config.desktop
 %{_datadir}/services/kopete_latex.desktop
 
-
 %files tool-highlight
 %defattr(644,root,root,755)
 %{_libdir}/kde3/kcm_kopete_highlight.la
@@ -1039,6 +1037,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/02/25 16:47:35  qboosh
+- cleanups
+
 Revision 1.37  2006/02/21 00:05:52  djurban
 - updated to kopete 0.12, kopete will be released independently of
   kde until kde4 is stable
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kopete.spec?r1=1.37&r2=1.38&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to