rpms/system-switch-mail/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 system-switch-mail.spec, 1.23, 1.24

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/system-switch-mail/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3545

Modified Files:
	.cvsignore sources system-switch-mail.spec 
Log Message:
bz#226473, merge Review: system-switch-mail



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-switch-mail/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	11 Mar 2008 18:11:29 -0000	1.15
+++ .cvsignore	21 Jul 2010 15:57:55 -0000	1.16
@@ -10,3 +10,4 @@ system-switch-mail-0.5.25-10.tar.bz2
 system-switch-mail-0.5.25-13.tar.bz2
 system-switch-mail-0.5.26-1.tar.bz2
 system-switch-mail-0.5.26-2.tar.bz2
+system-switch-mail-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-mail/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Mar 2008 18:11:29 -0000	1.15
+++ sources	21 Jul 2010 15:57:55 -0000	1.16
@@ -1 +1 @@
-f0f03778a50a29ea679b6c53ea2fe257  system-switch-mail-0.5.26-2.tar.bz2
+b4bdbeb33b6d805a2a1faf13f045ebdf  system-switch-mail-1.0.1.tar.bz2


Index: system-switch-mail.spec
===================================================================
RCS file: /cvs/extras/rpms/system-switch-mail/devel/system-switch-mail.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- system-switch-mail.spec	27 Jul 2009 05:27:01 -0000	1.23
+++ system-switch-mail.spec	21 Jul 2010 15:57:55 -0000	1.24
@@ -1,8 +1,9 @@
 Summary: The Mail Transport Agent Switcher
 Name: system-switch-mail
-Version: 0.5.26
-Release: 6
-Source0: %{name}-%{version}-2.tar.bz2
+Version: 1.0.1
+Release: 1%{?dist}
+Url: http://than.fedorapeople.org/
+Source0: http://than.fedorapeople.org/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,16 +12,14 @@ BuildArch: noarch
 
 Requires: newt-python
 Requires: chkconfig
-Requires: python >= 2.3
+Requires: python
 Requires: usermode
 
-BuildRequires: python >= 2.3
+BuildRequires: python-devel
 BuildRequires: gettext
 BuildRequires: automake
 BuildRequires: intltool
-
-Obsoletes: redhat-switchmail, redhat-switch-mail
-Provides: redhat-switchmail, redhat-switch-mail
+BuildRequires: desktop-file-utils
 
 %description
 The system-switch-mail is the Mail Transport Agent Switcher.
@@ -28,24 +27,19 @@ It enables users to easily switch betwee
 that they have installed.
 
 %package gnome
-Summary: A GUI interface for Mail Transport Agent Switcher.
+Summary: A GUI interface for Mail Transport Agent Switcher
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 Requires: libglade2
 Requires: pygtk2-libglade
-Requires: pygtk2
 Requires: usermode-gtk
-Obsoletes: redhat-switchmail-gnome, redhat-switch-mail-gnome
-Provides: redhat-switchmail-gnome, redhat-switch-mail-gnome
 
 %description gnome
 The system-switch-mail-gnome package contains a GNOME interface for the
 Mail Transport Agent Switcher.
 
 %prep
-# This is why you should not embed the package release in
-# the source tarball. :P
-%setup -q -n %{name}-%{version}-2
+%setup -q
 
 %build
 make %{?_smp_mflags}
@@ -54,6 +48,7 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} mandir=%{_mandir} sysconfdir=%{_sysconfdir} install
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
@@ -62,14 +57,15 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc COPYING AUTHORS
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/functions.py*
 %{_datadir}/%{name}/switchmail_tui.py*
 %{_mandir}/man1/*
-%config(noreplace) /etc/pam.d/*
-%config(noreplace) /etc/security/console.apps/%{name}*
+%config(noreplace) %{_sysconfdir}/pam.d/*
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}*
 
 %files gnome
 %defattr(-,root,root,-)
@@ -80,6 +76,12 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/switchmail.glade
 
 %changelog
+* Wed Jul 21 2010 Than Ngo <than at redhat.com> - 1.0.1-1
+- bz#226473, merge Review: system-switch-mail
+
+* Tue Sep 29 2009 Than Ngo <than at redhat.com> - 1.0-1
+- update po files
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.26-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild