rpms/smart/FC-5 smart.spec,1.10,1.11 sources,1.5,1.6
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Mon Feb 5 00:47:28 UTC 2007
Author: athimm
Update of /cvs/extras/rpms/smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31652/FC-5
Modified Files:
smart.spec sources
Log Message:
Adjust checks for autotools; Backbuilds for live distros.
Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec 25 Nov 2006 16:30:30 -0000 1.10
+++ smart.spec 5 Feb 2007 00:46:56 -0000 1.11
@@ -1,9 +1,10 @@
-%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%bcond_without ksmarttray
+%bcond_without pygtk
Summary: Next generation package handling tool
Name: smart
-Version: 0.42
-Release: 40%{?dist}
+Version: 0.50
+Release: 45%{?dist}
License: GPL
Group: Applications/System
URL: http://labix.org/smart/
@@ -14,18 +15,21 @@
Source4: distro.py
Source5: ksmarttray.desktop
Patch0: smart-0.42-autofs5fix.patch
+Patch1: smart-0.50-ccache.patch
+Patch2: smart-0.50-auto.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: python-devel >= 2.3
BuildRequires: desktop-file-utils
-
-BuildRequires: autoconf, automake, gettext, gcc-c++
+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
%description
@@ -40,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
@@ -50,7 +55,9 @@
%description gui
Graphical user interface for the smart package manager.
+%endif
+%if %{with ksmarttray}
%package -n ksmarttray
Summary: KDE tray program for watching updates with Smart Package Manager
Group: Applications/System
@@ -60,10 +67,13 @@
%description -n ksmarttray
KDE tray program for watching updates with Smart Package Manager.
+%endif
%prep
%setup -q
%patch0 -p1 -b .autofs5
+%patch1 -p0 -b .ccache
+%patch2 -p1
# /usr/lib is hardcoded
perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
@@ -72,12 +82,14 @@
export CFLAGS
python setup.py build
+%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
@@ -90,12 +102,14 @@
mkdir -p %{buildroot}%{_sysconfdir}/smart/channels
mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
+%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
@@ -156,24 +170,47 @@
%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
+%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 Feb 5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-45
+- Adjust checks for autotools.
+
+* 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.
+
+* 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/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Sep 2006 22:34:43 -0000 1.5
+++ sources 5 Feb 2007 00:46:56 -0000 1.6
@@ -1,3 +1,5 @@
-e60b411ad41dbe2e6fc57a04d82f91cb smart-0.42.tar.bz2
-df30892687c1768dd009f6a61b57a8fb smart-0.42-autofs5fix.patch
+7595df0259829fff64496f1c359a53cf smart-0.50.tar.bz2
+044e7fb260f201b23f6b0554fd70243e smart-0.50-ccache.patch
+371a72eff80e2e98e37d29275a1f5e9d smart-0.42-autofs5fix.patch
3e758faa20a498f27deabb0f773a923d ksmarttray.desktop
+258ec68f8762e787352f39a9e8414115 smart-0.50-auto.patch
More information about the scm-commits
mailing list