- dropped obsolete pl.po-update patch

- pass ac_cv_* variables instead of BC libmd5-devel (fetchmail checks for libmd5 with different API)

Changed files:
    fetchmail-pl.po-update.patch -> 1.20
    fetchmail.spec -> 1.256

diff --git a/fetchmail-pl.po-update.patch b/fetchmail-pl.po-update.patch
deleted file mode 100644 (file)
index b195b68..0000000
--- a/fetchmail-pl.po-update.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fetchmail-6.3.8/po/pl.po.orig      2007-03-30 09:56:19.000000000 +0200
-+++ fetchmail-6.3.8/po/pl.po   2007-05-14 19:19:23.502778757 +0200
-@@ -2669,14 +2669,13 @@
- msgstr "b³±d %cMTP: %s\n"
- 
- #: sink.c:712
--#, fuzzy, c-format
-+#, c-format
- msgid "BSMTP file open failed: %s\n"
--msgstr "BSMTP: otwarcie pliku lub zapis nag³ówka nie powiód³ siê\n"
-+msgstr "BSMTP: otwarcie pliku powiod³o siê: %s\n"
- 
- #: sink.c:758
--#, fuzzy
- msgid "BSMTP preamble write failed.\n"
--msgstr "BSMTP: otwarcie pliku lub zapis nag³ówka nie powiód³ siê\n"
-+msgstr "BSMTP: zapis nag³ówka nie powiód³ siê.\n"
- 
- #: sink.c:972
- #, c-format

diff --git a/fetchmail.spec b/fetchmail.spec
index ee3334054156ed6463bd5a3b808f234bcd6d8822..f42901c2819eb121d880f98c30469a1cac0739d5 100644 (file)
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -26,7 +26,6 @@ Source1:      %{name}conf.desktop
 Source2:       %{name}.sysconfig
 Source3:       %{name}.init
 Source4:       %{name}.logrotate
-Patch0:                %{name}-pl.po-update.patch
 URL:           http://fetchmail.berlios.de/
 BuildRequires: automake
 BuildRequires: flex
@@ -36,7 +35,6 @@ BuildRequires:        python
 BuildRequires: python-modules
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
-BuildConflicts:        libmd5-devel
 Requires:      setup >= 2.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -171,14 +169,12 @@ demona.
 
 %prep
 %setup -q
-#%patch0 -p1
-
-# to rebuild po/pl.gmo
-rm -f po/stamp-po
 
 %build
 cp -f /usr/share/automake/config.* .
 %configure \
+       ac_cv_header_md5_h=no \
+       ac_cv_search_MD5Init=no \
        --enable-nls \
        --enable-RPA \
        --enable-NTLM \