[fetchmail] Remove obsolete fetchmailconf stuff

vcrhonek vcrhonek at fedoraproject.org
Tue Mar 13 12:05:36 UTC 2012


commit e611934ad568651ad6ef3200a0a99aa0dc2ce810
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Tue Mar 13 13:05:27 2012 +0100

    Remove obsolete fetchmailconf stuff

 fetchmail.spec |   34 +++++-----------------------------
 1 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/fetchmail.spec b/fetchmail.spec
index 7ccc2a1..abab91d 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,10 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%global fetchmailconf 0
 
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.xz
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.xz.asc
 URL: http://fetchmail.berlios.de/
@@ -13,14 +12,6 @@ License: GPL+ and Public Domain
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel hesiod-devel krb5-devel openssl-devel
-%if ! %{fetchmailconf}
-Obsoletes: fetchmailconf
-%endif
-
-%package -n fetchmailconf
-Summary: A GUI utility for configuring your fetchmail preferences.
-Group: Applications/Internet
-Requires: python, tk, tkinter, fetchmail = %{version}-%{release}
 
 %description
 Fetchmail is a remote mail retrieval and forwarding utility intended
@@ -33,15 +24,6 @@ SMTP so you can read it through your favorite mail client.
 Install fetchmail if you need to retrieve mail over SLIP or PPP
 connections.
 
-%description -n fetchmailconf
-Fetchmailconf is a Tcl/Tk GUI application that edits your .fetchmailrc
-file in order to configure the fetchmail mail retrieval
-program. Fetchmail's numerous options may be confusing to new users,
-so fetchmailconf may help to clear up the confusion.
-
-Install fetchmailconf if you need help configuring fetchmail. You'll
-need to have Python and Tk installed in order to use fetchmailconf.
-
 %prep
 %setup -q
 
@@ -56,11 +38,10 @@ make
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%if ! %{fetchmailconf}
+# remove fetchmailconf stuff
 rm -f $RPM_BUILD_ROOT%{_bindir}/fetchmailconf*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fetchmailconf.1*
 rm -f $RPM_BUILD_ROOT%{python_sitelib}/fetchmailconf.py*
-%endif
 
 %find_lang %name
 
@@ -73,15 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fetchmail
 %{_mandir}/man1/fetchmail.1*
 
-%if %{fetchmailconf}
-%files -n fetchmailconf
-%defattr(-,root,root)
-%{_bindir}/fetchmailconf
-%{python_sitelib}/fetchmailconf.py*
-%{_mandir}/man1/fetchmailconf.1*
-%endif
-
 %changelog
+* Tue Mar 13 2012 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.21-3
+- Remove obsolete fetchmailconf stuff
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list