rpms/smart/devel smart.spec,1.14,1.15

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12765

Modified Files:
	smart.spec 
Log Message:
Waiting for kdebindings - postpone the wait till its rebuild.


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smart.spec	3 Dec 2006 14:36:40 -0000	1.14
+++ smart.spec	11 Dec 2006 21:06:46 -0000	1.15
@@ -18,17 +18,20 @@
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
 
-BuildRequires: autoconf, automake, gettext, gcc-c++
-BuildRequires: libXt-devel, libXext-devel
-BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
-BuildRequires: zlib-devel
-BuildRequires: kdesdk
+#BuildRequires: autoconf, automake, gettext, gcc-c++
+#BuildRequires: libXt-devel, libXext-devel
+#BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
+#BuildRequires: zlib-devel
+#BuildRequires: kdesdk
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
 
 Requires: smart-config
 
+Provides: ksmarttray = %{version}-%{release}
+Obsoletes: ksmarttray < %{version}-%{release}
+
 %description
 Smart Package Manager is a next generation package handling tool.
 
@@ -52,22 +55,22 @@
 %description gui
 Graphical user interface for the smart package manager.
 
-%package -n ksmarttray
-Summary: KDE tray program for watching updates with Smart Package Manager
-Group: Applications/System
-Requires: %{_bindir}/kdesu
-Requires: smart-update = %{version}-%{release}
-Requires: smart-gui = %{version}-%{release}
-
-%description -n ksmarttray
-KDE tray program for watching updates with Smart Package Manager.
+#package -n ksmarttray
+#Summary: KDE tray program for watching updates with Smart Package Manager
+#Group: Applications/System
+#Requires: %{_bindir}/kdesu
+#Requires: smart-update = %{version}-%{release}
+#Requires: smart-gui = %{version}-%{release}
+#
+#description -n ksmarttray
+#KDE tray program for watching updates with Smart Package Manager.
 
 %prep
 %setup -q
 %patch0 -p1 -b .autofs5
-rm -fr contrib/ksmarttray/admin
-cp -a %{_datadir}/apps/kapptemplate/admin contrib/ksmarttray/admin
-chmod +x contrib/ksmarttray/admin/*.pl
+#rm -fr contrib/ksmarttray/admin
+#cp -a %{_datadir}/apps/kapptemplate/admin contrib/ksmarttray/admin
+#chmod +x contrib/ksmarttray/admin/*.pl
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 
@@ -76,12 +79,12 @@
 export CFLAGS
 python setup.py build
 
-# ksmarttray
-pushd contrib/ksmarttray
-make -f admin/Makefile.common
-%configure --disable-rpath
-make
-popd
+## ksmarttray
+#pushd contrib/ksmarttray
+#make -f admin/Makefile.common
+#configure --disable-rpath
+#make
+#popd
 
 # smart-update
 make -C contrib/smart-update
@@ -94,12 +97,12 @@
 mkdir -p %{buildroot}%{_sysconfdir}/smart/channels
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
-# ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
-  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
-desktop-file-install --vendor=""             \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE5}
+## ksmarttray
+#make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+#  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+#desktop-file-install --vendor=""             \
+#  --dir %{buildroot}%{_datadir}/applications \
+#  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -170,15 +173,18 @@
 %config %{_sysconfdir}/security/console.apps/smart-root
 %config %{_sysconfdir}/pam.d/smart-root
 
-%files -n ksmarttray
-%defattr(-,root,root,-)
-%{_bindir}/ksmarttray
-%{_datadir}/apps/ksmarttray
-%{_datadir}/applications/ksmarttray.desktop
-%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
+#files -n ksmarttray
+#defattr(-,root,root,-)
+#{_bindir}/ksmarttray
+#{_datadir}/apps/ksmarttray
+#{_datadir}/applications/ksmarttray.desktop
+#{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
-* Sun Dec  3 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.42-41
+* Mon Dec 11 2006 Axel Thimm <thimm at neu.nirvana> - 0.42-41
+- Deactivate ksmarttray for now.
+
+* Sun Dec  3 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
 - Refresh kde admin dir.
 
 * Sat Nov 25 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.42-40