rpms/smart/devel .cvsignore, 1.14, 1.15 smart.spec, 1.45, 1.46 sources, 1.17, 1.18 smart-mdclean.patch, 1.1, NONE smart-sha256.diff, 1.2, NONE smart-unicode-provides.diff, 1.1, NONE

[athimm]

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19705/devel

Modified Files:
	.cvsignore smart.spec sources 
Removed Files:
	smart-mdclean.patch smart-sha256.diff 
	smart-unicode-provides.diff 
Log Message:
Update to 1.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	15 Apr 2009 15:41:20 -0000	1.14
+++ .cvsignore	14 Feb 2010 21:45:21 -0000	1.15
@@ -1 +1 @@
-smart-1.2.tar.bz2
+smart-1.3.tar.bz2


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- smart.spec	5 Sep 2009 01:00:31 -0000	1.45
+++ smart.spec	14 Feb 2010 21:45:21 -0000	1.46
@@ -3,11 +3,12 @@
 
 %bcond_without ksmarttray
 %bcond_without pygtk
+%bcond_without qt
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 1.2
-Release: 66%{?dist}
+Version: 1.3
+Release: 65%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,9 +18,7 @@ Source2: smart.pam
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: http://launchpadlibrarian.net/25524187/smart-sha256.diff
-Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
-Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
+Source6: smart-qt.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -55,6 +54,7 @@ Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
 Provides: smart-gtk = %{version}-%{release}
+Requires: PyQt
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -74,9 +74,6 @@ KDE tray program for watching updates wi
 
 %prep
 %setup -q
-%patch0 -p0 -b .sha256
-%patch1 -p0 -b .mdclean
-%patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 install -p -m 644 %{SOURCE2} .
@@ -87,8 +84,6 @@ if test -f /%{_lib}/security/pam_stack.s
   perl -pi -e's,include(\s*)(.*),required\1pam_stack.so service=\2,' smart.pam
   touch -r %{SOURCE2} smart.pam
 fi
-# Reported as https://bugs.launchpad.net/smart/+bug/424642
-sed -i 's#automake\*1\.10\*#automake*1.10* | automake*1.11*#' contrib/ksmarttray/admin/cvs.sh
 
 %build
 CFLAGS="%{optflags}"
@@ -150,17 +145,19 @@ mkdir -p %{buildroot}%{_sysconfdir}/smar
 
 %find_lang %{name}
 
-# Create a list w/o smart/interfaces/gtk to avoid warning of duplicate
+# Create a list w/o smart/interfaces/{gtk,qt} to avoid warning of duplicate
 # in the %files section (otherwise including all and %excluding works,
 # too
 
 echo "%%defattr(-,root,root,-)" > %{name}.fileslist
 find %{buildroot}%{python_sitearch}/smart* -type d \
   | grep -v %{python_sitearch}/smart/interfaces/gtk \
+  | grep -v %{python_sitearch}/smart/interfaces/qt \
   | sed -e's,%{buildroot},%%dir ,' \
   >> %{name}.fileslist
 find %{buildroot}%{python_sitearch}/smart* \! -type d \
   | grep -v %{python_sitearch}/smart/interfaces/gtk \
+  | grep -v %{python_sitearch}/smart/interfaces/qt \
   | sed -e's,%{buildroot},,' \
   >> %{name}.fileslist
 
@@ -187,10 +184,12 @@ rm -rf %{buildroot}
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
+%{python_sitearch}/smart/interfaces/qt
 %{_datadir}/applications/smart.desktop
 %{_datadir}/icons/hicolor/48x48/apps/smart.png
 %else
 %exclude %{python_sitearch}/smart/interfaces/gtk
+%exclude %{python_sitearch}/smart/interfaces/qt
 %exclude %{_datadir}/applications/smart.desktop
 %exclude %{_datadir}/icons/hicolor/48x48/apps/smart.png
 %endif
@@ -209,11 +208,8 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.2-66
-- Fix FTBFS: accept automake 1.11
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-65
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Feb 14 2010 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.3-65
+- Update to 1.3.
 
 * Thu Apr 16 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-64
 - Fix premature returns in sha256 patch.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	15 Apr 2009 15:41:20 -0000	1.17
+++ sources	14 Feb 2010 21:45:21 -0000	1.18
@@ -1 +1 @@
-233ccbd1e666a9a7c5e1cc7900075d93  smart-1.2.tar.bz2
+170e5e0f101ac73a888be32038da1d35  smart-1.3.tar.bz2


--- smart-mdclean.patch DELETED ---


--- smart-sha256.diff DELETED ---


--- smart-unicode-provides.diff DELETED ---