rpms/smart/devel .cvsignore, 1.5, 1.6 smart.spec, 1.15, 1.16 sources, 1.6, 1.7

[Axel Thimm (athimm)]

Author: athimm

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

Modified Files:
	.cvsignore smart.spec sources 
Log Message:
Update to 0.50.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Sep 2006 22:34:43 -0000	1.5
+++ .cvsignore	3 Feb 2007 01:23:44 -0000	1.6
@@ -1,3 +1,3 @@
-smart-0.42.tar.bz2
+smart-0.50.tar.bz2
+smart-0.50-ccache.patch
 smart-0.42-autofs5fix.patch
-ksmarttray.desktop


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smart.spec	11 Dec 2006 21:06:46 -0000	1.15
+++ smart.spec	3 Feb 2007 01:23:44 -0000	1.16
@@ -1,9 +1,11 @@
 %{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%bcond_with ksmarttray
+%bcond_without pygtk
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.42
-Release: 41%{?dist}
+Version: 0.50
+Release: 44%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -14,24 +16,22 @@
 Source4: distro.py
 Source5: ksmarttray.desktop
 Patch0: smart-0.42-autofs5fix.patch
+Patch1: smart-0.50-ccache.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 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: gettext
+%if %{with ksmarttray}
+BuildRequires: autoconf, automake, gcc-c++
+BuildRequires: libXt-devel, libXext-devel
+BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
+BuildRequires: zlib-devel
+%endif
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
-
+%{!?with_pygtk:Requires: usermode}
 Requires: smart-config
 
-Provides: ksmarttray = %{version}-%{release}
-Obsoletes: ksmarttray < %{version}-%{release}
-
 %description
 Smart Package Manager is a next generation package handling tool.
 
@@ -44,6 +44,7 @@
 Allows execution of 'smart update' by normal users through a
 special suid command.
 
+%if %{with pygtk}
 %package gui
 Summary: Graphical user interface for the smart package manager
 Group: Applications/System
@@ -54,23 +55,24 @@
 
 %description gui
 Graphical user interface for the smart package manager.
+%endif
 
-#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.
+%if %{with ksmarttray}
+%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.
+%endif
 
 %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
+%patch1 -p0 -b .ccache
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 
@@ -79,12 +81,14 @@
 export CFLAGS
 python setup.py build
 
-## ksmarttray
-#pushd contrib/ksmarttray
-#make -f admin/Makefile.common
-#configure --disable-rpath
-#make
-#popd
+%if %{with ksmarttray}
+# ksmarttray
+pushd contrib/ksmarttray
+make -f admin/Makefile.common
+%configure --disable-rpath
+make
+popd
+%endif
 
 # smart-update
 make -C contrib/smart-update
@@ -97,12 +101,14 @@
 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}
+%if %{with ksmarttray}
+# ksmarttray
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
+%endif
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -163,29 +169,43 @@
 %defattr(-,root,root,-)
 %{_bindir}/smart-update
 
+%if %{with pygtk}
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
 %{_datadir}/applications/smart.desktop
 %{_datadir}/icons/hicolor/48x48/apps/smart.png
+%else
+%exclude %{python_sitearch}/smart/interfaces/gtk
+%exclude %{_datadir}/applications/smart.desktop
+%exclude %{_datadir}/icons/hicolor/48x48/apps/smart.png
+%endif
 
 %{_bindir}/smart-root
 %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
+%if %{with ksmarttray}
+%files -n ksmarttray
+%defattr(-,root,root,-)
+%{_bindir}/ksmarttray
+%{_datadir}/apps/ksmarttray
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
+%endif
 
 %changelog
-* Mon Dec 11 2006 Axel Thimm <thimm at neu.nirvana> - 0.42-41
-- Deactivate ksmarttray for now.
+* Mon Jan 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-44
+- Add ccache fix from svn trunk.
+
+* Sun Jan 21 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-43
+- gettext is BR'd outside of ksmarttray.
+
+* Thu Jan 18 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-42
+- Update to 0.50.
 
-* Sun Dec  3 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Refresh kde admin dir.
+* Fri Dec  8 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-41_rc1
+- Update to 0.50rc1.
 
 * Sat Nov 25 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.42-40
 - Start preparing virtual provides for upcoming qt gui.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Sep 2006 09:29:31 -0000	1.6
+++ sources	3 Feb 2007 01:23:44 -0000	1.7
@@ -1,3 +1,3 @@
-e60b411ad41dbe2e6fc57a04d82f91cb  smart-0.42.tar.bz2
-3e758faa20a498f27deabb0f773a923d  ksmarttray.desktop
+7595df0259829fff64496f1c359a53cf  smart-0.50.tar.bz2
+044e7fb260f201b23f6b0554fd70243e  smart-0.50-ccache.patch
 371a72eff80e2e98e37d29275a1f5e9d  smart-0.42-autofs5fix.patch